fix(shared): fix defaults merge with null will get unexpect results #…

…1644
alibaba · Jun 26, 2021 · d39c426 · d39c426
1 parent d14c4eb
commit d39c426
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 2 deletions.
diff --git a/packages/core/src/__tests__/form.spec.ts b/packages/core/src/__tests__/form.spec.ts
@@ -122,6 +122,34 @@ test('setValues/setInitialValues', () => {
   expect(form.values.aa).toBeUndefined()
 })
 
+test('setValues with null', () => {
+  const form = attach(createForm())
+  form.setInitialValues({
+    'object-1': {
+      'array-1': null,
+    },
+    'object-2': {
+      'array-2': null,
+    },
+  })
+  form.setValues({
+    'object-1': {
+      'array-1': null,
+    },
+    'object-2': {
+      'array-2': null,
+    },
+  })
+  expect(form.values).toEqual({
+    'object-1': {
+      'array-1': null,
+    },
+    'object-2': {
+      'array-2': null,
+    },
+  })
+})
+
 test('observable values/initialValues', () => {
   const values: any = observable({
     aa: 123,

diff --git a/packages/shared/src/defaults.ts b/packages/shared/src/defaults.ts
@@ -1,6 +1,6 @@
 import { each } from './array'
 import { isEmpty, isValid } from './isEmpty'
-import { getType, isArr } from './checkers'
+import { getType, isArr, isPlainObj } from './checkers'
 
 const isUnNormalObject = (value: any) => {
   if (value?._owner && value?.$$typeof) {
@@ -34,7 +34,11 @@ export const defaults = (defaults_: any, targets: any) => {
   ) {
     return !isEmpty(targets) ? targets : defaults_
   } else {
-    const results = isArr(defaults_) ? [] : {}
+    const results = isArr(defaults_)
+      ? []
+      : isPlainObj(defaults_)
+      ? {}
+      : defaults_
     each(targets, (value, key) => {
       results[key] = defaults(defaults_[key], value)
     })