fix(core): fix initialValues merge with no fields (#2339)

alibaba · Oct 22, 2021 · 9c2ebc3 · 9c2ebc3
1 parent bbb1a5a
commit 9c2ebc3
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/packages/core/src/__tests__/form.spec.ts b/packages/core/src/__tests__/form.spec.ts
@@ -144,6 +144,25 @@ test('setValues/setInitialValues', () => {
   })
 })
 
+test('no field initialValues merge', () => {
+  const form = attach(
+    createForm<any>({
+      values: {
+        aa: '123',
+      },
+      initialValues: {
+        aa: '333',
+        bb: '321',
+      },
+    })
+  )
+
+  expect(form.values).toEqual({
+    aa: '123',
+    bb: '321',
+  })
+})
+
 test('setLoading', async () => {
   const form = attach(createForm())
   expect(form.loading).toBeFalsy()

diff --git a/packages/core/src/shared/internals.ts b/packages/core/src/shared/internals.ts
@@ -172,7 +172,7 @@ export const patchFormValues = (
           if (!isVoidField(targetField) && !targetField.modified) {
             update(path, source)
           }
-        } else {
+        } else if (form.initialized) {
           update(path, source)
         }
       }