ci(core): fix tests

alibaba · Feb 23, 2021 · faaceba · faaceba
1 parent 92e9522
commit faaceba
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 57 deletions.
diff --git a/packages/core/src/__tests__/form.spec.ts b/packages/core/src/__tests__/form.spec.ts
@@ -277,12 +277,12 @@ test('notify/subscribe/unsubscribe', () => {
   const id = form.subscribe(subscribe)
   expect(subscribe).toBeCalledTimes(0)
   form.setInitialValues({ aa: 123 })
-  expect(subscribe).toBeCalledTimes(1)
-  form.notify(LifeCycleTypes.ON_FORM_SUBMIT)
   expect(subscribe).toBeCalledTimes(2)
+  form.notify(LifeCycleTypes.ON_FORM_SUBMIT)
+  expect(subscribe).toBeCalledTimes(3)
   form.unsubscribe(id)
   form.notify(LifeCycleTypes.ON_FORM_SUBMIT)
-  expect(subscribe).toBeCalledTimes(2)
+  expect(subscribe).toBeCalledTimes(3)
 })
 
 test('setState/getState/setFormState/getFormState/setFieldState/getFieldState', () => {

diff --git a/packages/core/src/shared/constants.ts b/packages/core/src/shared/constants.ts
@@ -16,28 +16,4 @@ export const ReservedProperties = [
   'decoratorType',
   'decoratorProps',
   'originInitialValues',
-]
-
-export const GetterSetterProperties = [
-  'errors',
-  'warnings',
-  'successes',
-  'valid',
-  'invalid',
-  'value',
-  'initialValue',
-  'values',
-  'initialValues',
-  'display',
-  'pattern',
-  'required',
-  'hidden',
-  'visible',
-  'disabled',
-  'readOnly',
-  'readPretty',
-  'validateStatus',
-  'editable',
-  'component',
-  'decorator',
-]
+]
diff --git a/packages/core/src/shared/internals.ts b/packages/core/src/shared/internals.ts
@@ -2,7 +2,6 @@ import {
   FormPath,
   FormPathPattern,
   each,
-  reduce,
   pascalCase,
   isFn,
   isValid,
@@ -25,7 +24,7 @@ import {
   FieldMatchPattern,
 } from '../types'
 import { isArrayField, isGeneralField, isQuery, isVoidField } from './externals'
-import { ReservedProperties, GetterSetterProperties } from './constants'
+import { ReservedProperties } from './constants'
 
 export const getValuesFromEvent = (args: any[]) => {
   return args.map((event) => {
@@ -414,13 +413,8 @@ export const setModelState = (model: any, setter: any) => {
   if (isFn(setter)) {
     setter(model)
   } else {
-    each(GetterSetterProperties, (key) => {
-      if (isSkipProperty(key)) return
-      if (key in setter) {
-        model[key] = setter[key]
-      }
-    })
-    each(setter, (value, key) => {
+    Reflect.ownKeys(setter || {}).forEach((key: string) => {
+      const value = setter[key]
       if (isFn(value)) return
       if (ReservedProperties.includes(key)) return
       if (isSkipProperty(key)) return
@@ -434,28 +428,19 @@ export const getModelState = (model: any, getter?: any) => {
   if (isFn(getter)) {
     return getter(model)
   } else {
-    const results = {}
-    each(GetterSetterProperties, (key) => {
-      if (key in model) {
-        results[key] = toJS(model[key])
+    return Reflect.ownKeys(model || {}).reduce((buf, key: string) => {
+      const value = model[key]
+      if (isFn(value)) {
+        return buf
       }
-    })
-    return reduce(
-      model,
-      (buf, value, key) => {
-        if (isFn(value)) {
-          return buf
-        }
-        if (ReservedProperties.includes(key)) return buf
-        if (key === 'address' || key === 'path') {
-          buf[key] = value.toString()
-          return buf
-        }
-        buf[key] = toJS(value)
+      if (ReservedProperties.includes(key)) return buf
+      if (key === 'address' || key === 'path') {
+        buf[key] = value.toString()
         return buf
-      },
-      results
-    )
+      }
+      buf[key] = toJS(value)
+      return buf
+    }, {})
   }
 }