fix(core): fix immer autoFreeze and reset Native Object (#816)

* fix(core): fix immer autoFreeze and reset Native Object * fix(core): fix ci
alibaba · Apr 24, 2020 · aff2318 · aff2318
1 parent 3704873
commit aff2318
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 7 deletions.
diff --git a/packages/core/src/__tests__/index.spec.ts b/packages/core/src/__tests__/index.spec.ts
@@ -413,6 +413,31 @@ describe('reset', () => {
     expect(form.getFormState(state => state.values)).toEqual({ aa: { bb: [] } })
     expect(form.getFormState(state => state.initialValues)).toEqual({})
   })
+
+  test('date reset', () => {
+    const form = createForm({
+      values: {},
+      initialValues: {},
+      onChange: values => {
+        console.log(values)
+      }
+    })
+
+    const aa = form.registerField({
+      path: 'aa',
+      initialValue: ''
+    })
+
+    aa.setState(state => {
+      state.value = new Date()
+    })
+
+    form.reset()
+    expect(
+      form.getFormState(state => state.values.aa)
+    ).toBe('')
+  })
+
 })
 
 describe('clearErrors', () => {

diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -12,7 +12,8 @@ import {
   FormPathPattern,
   BigData,
   each,
-  isObj
+  isObj,
+  isPlainObj
 } from '@formily/shared'
 import {
   FormValidator,
@@ -1034,8 +1035,8 @@ export function createForm(options: IFormCreatorOptions = {}) {
               } else {
                 state.value = []
               }
-            } else if (isObj(state.value)) {
-              if (isObj(value)) {
+            } else if (isPlainObj(state.value)) {
+              if (isPlainObj(value)) {
                 state.value = value
               } else {
                 state.value = {}

diff --git a/packages/core/src/shared/model.ts b/packages/core/src/shared/model.ts
@@ -11,7 +11,7 @@ import {
   defaults,
   shallowClone
 } from '@formily/shared'
-import { Draft, Immer, enablePatches } from 'immer'
+import { Draft, Immer, enablePatches, setAutoFreeze } from 'immer'
 import {
   IStateModelProvider,
   IStateModelFactory,
@@ -23,6 +23,8 @@ const hasProxy = !!globalThisPolyfill.Proxy
 
 enablePatches()
 
+setAutoFreeze(false)
+
 const { produce } = new Immer({
   autoFreeze: false
 })
@@ -184,7 +186,7 @@ export const createStateModel = <State = {}, Props = {}>(
             patches => {
               patches.forEach(({ path, op, value }) => {
                 if (op === 'replace') {
-                  if (path.length > 1 ||!isEqual(this.state[path[0]], value)) {
+                  if (path.length > 1 || !isEqual(this.state[path[0]], value)) {
                     this.dirtys[path[0]] = true
                     this.dirtyNum++
                   }

diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
@@ -238,8 +238,8 @@ export interface IFormState<FormProps = any> {
   editable: boolean | ((name: string) => boolean)
   errors: string[]
   warnings: string[]
-  values: {}
-  initialValues: {}
+  values: any
+  initialValues: any
   mounted: boolean
   unmounted: boolean
   props: FormProps