fix(core): fix observable componentProps

alibaba · Feb 15, 2021 · dfe2e21 · dfe2e21
1 parent 192b882
commit dfe2e21
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/packages/antd/src/form-item/index.tsx b/packages/antd/src/form-item/index.tsx
@@ -199,7 +199,7 @@ export const FormItem: ComposeFormItem = connect(
     { extract: 'required' },
     (props, field) => {
       if (isVoidField(field)) return props
-
+      if(!field) return props
       const takeMessage = () => {
         if (props.feedbackText) return props.feedbackText
         if (field.errors.length) return field.errors
@@ -214,6 +214,7 @@ export const FormItem: ComposeFormItem = connect(
     },
     (props, field) => {
       if (isVoidField(field)) return props
+      if(!field) return props
       return {
         feedbackStatus:
           field.validateStatus === 'validating'
@@ -223,6 +224,7 @@ export const FormItem: ComposeFormItem = connect(
     },
     (props, field) => {
       if (isVoidField(field)) return props
+      if(!field) return props
       let asterisk = false
       if (field.required) {
         asterisk = true

diff --git a/packages/core/src/models/Field.ts b/packages/core/src/models/Field.ts
@@ -166,8 +166,8 @@ export class Field<
       inputValues: observable.ref,
       decoratorType: observable.ref,
       componentType: observable.ref,
-      decoratorProps: observable,
-      componentProps: observable,
+      decoratorProps: observable.shallow,
+      componentProps: observable.shallow,
       validator: observable,
       feedbacks: observable,
       errors: computed,

diff --git a/packages/core/src/models/VoidField.ts b/packages/core/src/models/VoidField.ts
@@ -109,9 +109,9 @@ export class VoidField<Decorator = any, Component = any, TextType = any> {
       mounted: observable.ref,
       unmounted: observable.ref,
       decoratorType: observable.ref,
-      decoratorProps: observable,
+      decoratorProps: observable.shallow,
       componentType: observable.ref,
-      componentProps: observable,
+      componentProps: observable.shallow,
       display: computed,
       pattern: computed,
       editable: computed,

diff --git a/packages/react/src/components/ReactiveField.tsx b/packages/react/src/components/ReactiveField.tsx
@@ -1,6 +1,6 @@
 import React, { Fragment } from 'react'
 import { observer } from 'mobx-react-lite'
-import { isFn, clone } from '@formily/shared'
+import { isFn } from '@formily/shared'
 import { isVoidField } from '@formily/core'
 interface IReactiveFieldProps {
   field: Formily.Core.Types.GeneralField
@@ -32,7 +32,7 @@ const ReactiveInternal: React.FC<IReactiveFieldProps> = (props) => {
     }
     return React.createElement(
       field.decorator[0],
-      { ...clone(field.decorator[1]) },
+      { ...field.decorator[1] },
       children
     )
   }
@@ -54,7 +54,7 @@ const ReactiveInternal: React.FC<IReactiveFieldProps> = (props) => {
       : undefined
     return React.createElement(
       field.component[0],
-      { disabled, readOnly, ...clone(field.component[1]), value, onChange },
+      { disabled, readOnly, ...field.component[1], value, onChange },
       children
     )
   }

diff --git a/packages/vue/package.json b/packages/vue/package.json
@@ -19,6 +19,7 @@
     "build:umd": "rollup --config"
   },
   "dependencies": {
+    "@formily/json-schema": "^2.0.0-beta.3",
     "@formily/core": "^2.0.0-beta.3",
     "@formily/shared": "^2.0.0-beta.3",
     "@formily/validator": "^2.0.0-beta.3",