fix: add unit test && submit bug

jdf2e · May 17, 2024 · 9903def · 9903def
1 parent 29f543e
commit 9903def
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 3 deletions.
diff --git a/src/packages/form/__tests__/form.spec.tsx b/src/packages/form/__tests__/form.spec.tsx
@@ -47,7 +47,37 @@ test('Both form and formItem set initialValue(s)', () => {
     'NutUI-React-Form'
   )
 })
-
+test('Both form and formItem set initialValue(s) to submit', async () => {
+  const handleSubmit = vi.fn()
+  const { container } = render(
+    <Form
+      initialValues={{ username: 'NutUI-React-Form', age: 18 }}
+      onFinish={handleSubmit}
+    >
+      <Form.Item name="username" label="UserName" initialValue="NutUI-React">
+        <Input />
+      </Form.Item>
+      <Form.Item name="age" label="Age" initialValue="30">
+        <Input />
+      </Form.Item>
+      <Form.Item name="phone" label="Phone" initialValue="123456">
+        <Input />
+      </Form.Item>
+    </Form>
+  )
+  const form = container.querySelector('form') as Element
+  fireEvent.submit(form)
+  await waitFor(() => {
+    expect(handleSubmit).toBeCalled()
+    expect(handleSubmit).toBeCalledWith(
+      expect.objectContaining({
+        username: 'NutUI-React-Form',
+        age: 18,
+        phone: '123456',
+      })
+    )
+  })
+})
 test('form validateTrigger', async () => {
   const { container, rerender } = render(
     <Form>

diff --git a/src/packages/formitem/formitem.taro.tsx b/src/packages/formitem/formitem.taro.tsx
@@ -80,7 +80,10 @@ export class FormItem extends React.Component<
       this.props.name &&
       !Object.keys(store).includes(this.props.name)
     ) {
-      setInitialValues({ [this.props.name]: this.props.initialValue })
+      setInitialValues(
+        { ...store, [this.props.name]: this.props.initialValue },
+        true
+      )
     }
     // 注册组件实例到FormStore
     const { registerField, registerUpdate } = this.context.getInternal(SECRET)

diff --git a/src/packages/formitem/formitem.tsx b/src/packages/formitem/formitem.tsx
@@ -80,7 +80,10 @@ export class FormItem extends React.Component<
       this.props.name &&
       !Object.keys(store).includes(this.props.name)
     ) {
-      setInitialValues({ [this.props.name]: this.props.initialValue })
+      setInitialValues(
+        { ...store, [this.props.name]: this.props.initialValue },
+        true
+      )
     }
     // 注册组件实例到FormStore
     const { registerField, registerUpdate } = this.context.getInternal(SECRET)