fix: fix controlled props can not update

alibaba · Sep 29, 2021 · dcffdeb · dcffdeb
1 parent 729410a
commit dcffdeb
Show file tree

Hide file tree

Showing 13 changed files with 134 additions and 130 deletions.
diff --git a/formily/antd/package.json b/formily/antd/package.json
@@ -25,10 +25,11 @@
   },
   "devDependencies": {
     "@designable/react-settings-form": "1.0.0-beta.10",
-    "@formily/antd": "^2.0.0-rc.10",
-    "@formily/core": "^2.0.0-rc.10",
-    "@formily/react": "^2.0.0-rc.10",
-    "@formily/shared": "^2.0.0-rc.10",
+    "@formily/antd": "^2.0.0-rc.12",
+    "@formily/core": "^2.0.0-rc.12",
+    "@formily/react": "^2.0.0-rc.12",
+    "@formily/shared": "^2.0.0-rc.12",
+    "@formily/reactive": "^2.0.0-rc.12",
     "autoprefixer": "^9.0",
     "file-loader": "^5.0.2",
     "fs-extra": "^8.1.0",
@@ -46,10 +47,11 @@
     "webpack-dev-server": "^3.10.1"
   },
   "peerDependencies": {
-    "@formily/antd": "^2.0.0-rc.10",
-    "@formily/core": "^2.0.0-rc.10",
-    "@formily/react": "^2.0.0-rc.10",
-    "@formily/shared": "^2.0.0-rc.10",
+    "@formily/antd": "^2.0.0-rc.12",
+    "@formily/core": "^2.0.0-rc.12",
+    "@formily/react": "^2.0.0-rc.12",
+    "@formily/shared": "^2.0.0-rc.12",
+    "@formily/reactive": "^2.0.0-rc.12",
     "@types/react": ">=16.8.0 || >=17.0.0",
     "@types/react-dom": ">=16.8.0 || >=17.0.0",
     "antd": "^4.0.0",

diff --git a/formily/antd/src/components/Field/preview.tsx b/formily/antd/src/components/Field/preview.tsx
@@ -1,5 +1,6 @@
 import React from 'react'
 import { FormPath } from '@formily/core'
+import { toJS } from '@formily/reactive'
 import {
   ArrayField,
   Field as InternalField,
@@ -112,10 +113,10 @@ const toDesignableFieldProps = (
   const componentProps = schema['x-component-props'] || {}
 
   if (decorator) {
-    results.decorator = [decorator, { ...decoratorProps }]
+    results.decorator = [decorator, toJS(decoratorProps)]
   }
   if (component) {
-    results.component = [component, { ...componentProps }]
+    results.component = [component, toJS(componentProps)]
   }
   if (decorator) {
     FormPath.setIn(results['decorator'][1], nodeIdAttrName, id)

diff --git a/formily/next/package.json b/formily/next/package.json
@@ -25,10 +25,11 @@
   },
   "devDependencies": {
     "@designable/react-settings-form": "1.0.0-beta.10",
-    "@formily/core": "^2.0.0-rc.10",
-    "@formily/next": "^2.0.0-rc.10",
-    "@formily/react": "^2.0.0-rc.10",
-    "@formily/shared": "^2.0.0-rc.10",
+    "@formily/core": "^2.0.0-rc.12",
+    "@formily/next": "^2.0.0-rc.12",
+    "@formily/react": "^2.0.0-rc.12",
+    "@formily/shared": "^2.0.0-rc.12",
+    "@formily/reactive": "^2.0.0-rc.12",
     "autoprefixer": "^9.0",
     "file-loader": "^5.0.2",
     "fs-extra": "^8.1.0",
@@ -47,10 +48,11 @@
   },
   "peerDependencies": {
     "@alifd/next": "^1.23.0",
-    "@formily/core": "^2.0.0-rc.10",
-    "@formily/next": "^2.0.0-rc.10",
-    "@formily/react": "^2.0.0-rc.10",
-    "@formily/shared": "^2.0.0-rc.10",
+    "@formily/core": "^2.0.0-rc.12",
+    "@formily/next": "^2.0.0-rc.12",
+    "@formily/reactive": "^2.0.0-rc.12",
+    "@formily/react": "^2.0.0-rc.12",
+    "@formily/shared": "^2.0.0-rc.12",
     "@types/react": ">=16.8.0 || >=17.0.0",
     "@types/react-dom": ">=16.8.0 || >=17.0.0",
     "antd": "^4.0.0",

diff --git a/formily/next/src/components/Field/preview.tsx b/formily/next/src/components/Field/preview.tsx
@@ -1,5 +1,6 @@
 import React from 'react'
 import { FormPath } from '@formily/core'
+import { toJS } from '@formily/reactive'
 import {
   ArrayField,
   Field as InternalField,
@@ -112,10 +113,10 @@ const toDesignableFieldProps = (
   const componentProps = schema['x-component-props'] || {}
 
   if (decorator) {
-    results.decorator = [decorator, { ...decoratorProps }]
+    results.decorator = [decorator, toJS(decoratorProps)]
   }
   if (component) {
-    results.component = [component, { ...componentProps }]
+    results.component = [component, toJS(componentProps)]
   }
   if (decorator) {
     FormPath.setIn(results['decorator'][1], nodeIdAttrName, id)

diff --git a/formily/setters/package.json b/formily/setters/package.json
@@ -23,17 +23,17 @@
     "start": "webpack-dev-server --config playground/webpack.dev.ts"
   },
   "devDependencies": {
-    "@formily/antd": "^2.0.0-rc.10",
-    "@formily/core": "^2.0.0-rc.10",
-    "@formily/react": "^2.0.0-rc.10",
-    "@formily/shared": "^2.0.0-rc.10",
+    "@formily/antd": "^2.0.0-rc.12",
+    "@formily/core": "^2.0.0-rc.12",
+    "@formily/react": "^2.0.0-rc.12",
+    "@formily/shared": "^2.0.0-rc.12",
     "antd": "^4.0.0"
   },
   "peerDependencies": {
-    "@formily/antd": "^2.0.0-rc.10",
-    "@formily/core": "^2.0.0-rc.10",
-    "@formily/react": "^2.0.0-rc.10",
-    "@formily/shared": "^2.0.0-rc.10",
+    "@formily/antd": "^2.0.0-rc.12",
+    "@formily/core": "^2.0.0-rc.12",
+    "@formily/react": "^2.0.0-rc.12",
+    "@formily/shared": "^2.0.0-rc.12",
     "@types/react": ">=16.8.0 || >=17.0.0",
     "@types/react-dom": ">=16.8.0 || >=17.0.0",
     "antd": "^4.0.0",

diff --git a/formily/transformer/package.json b/formily/transformer/package.json
@@ -25,12 +25,12 @@
     "access": "public"
   },
   "devDependencies": {
-    "@formily/core": "^2.0.0-rc.10",
-    "@formily/json-schema": "^2.0.0-rc.10"
+    "@formily/core": "^2.0.0-rc.12",
+    "@formily/json-schema": "^2.0.0-rc.12"
   },
   "peerDependencies": {
-    "@formily/core": "^2.0.0-rc.10",
-    "@formily/json-schema": "^2.0.0-rc.10"
+    "@formily/core": "^2.0.0-rc.12",
+    "@formily/json-schema": "^2.0.0-rc.12"
   },
   "dependencies": {
     "@designable/core": "1.0.0-beta.10",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -23,14 +23,14 @@
     "build:umd": "rollup --config"
   },
   "devDependencies": {
-    "@formily/json-schema": "^2.0.0-rc.10",
-    "@formily/path": "^2.0.0-rc.10",
-    "@formily/reactive": "^2.0.0-rc.10"
+    "@formily/json-schema": "^2.0.0-rc.12",
+    "@formily/path": "^2.0.0-rc.12",
+    "@formily/reactive": "^2.0.0-rc.12"
   },
   "peerDependencies": {
-    "@formily/json-schema": "^2.0.0-rc.10",
-    "@formily/path": "^2.0.0-rc.10",
-    "@formily/reactive": "^2.0.0-rc.10"
+    "@formily/json-schema": "^2.0.0-rc.12",
+    "@formily/path": "^2.0.0-rc.12",
+    "@formily/reactive": "^2.0.0-rc.12"
   },
   "dependencies": {
     "@designable/shared": "1.0.0-beta.10",

diff --git a/packages/core/src/models/TreeNode.ts b/packages/core/src/models/TreeNode.ts
@@ -664,10 +664,7 @@ export class TreeNode {
         if (node.componentName) {
           this.componentName = node.componentName
         }
-        this.props = {
-          ...this.designerProps?.defaultProps,
-          ...node.props,
-        }
+        this.props = node.props ?? {}
         if (node.hidden) {
           this.hidden = node.hidden
         }

diff --git a/packages/playground/package.json b/packages/playground/package.json
@@ -30,8 +30,8 @@
     "@designable/react-sandbox": "1.0.0-beta.10",
     "@designable/react-settings-form": "1.0.0-beta.10",
     "@designable/shared": "1.0.0-beta.10",
-    "@formily/reactive": "^2.0.0-rc.10",
-    "@formily/reactive-react": "^2.0.0-rc.10",
+    "@formily/reactive": "^2.0.0-rc.12",
+    "@formily/reactive-react": "^2.0.0-rc.12",
     "antd": "^4.15.2",
     "react": "^16.8.x",
     "react-dom": "^16.8.x",

diff --git a/packages/react-settings-form/package.json b/packages/react-settings-form/package.json
@@ -23,21 +23,21 @@
     "build:umd": "rollup --config"
   },
   "peerDependencies": {
-    "@formily/antd": "^2.0.0-rc.10",
-    "@formily/core": "^2.0.0-rc.10",
-    "@formily/react": "^2.0.0-rc.10",
-    "@formily/reactive": "^2.0.0-rc.10",
-    "@formily/reactive-react": "^2.0.0-rc.10",
-    "@formily/shared": "^2.0.0-rc.10",
+    "@formily/antd": "^2.0.0-rc.12",
+    "@formily/core": "^2.0.0-rc.12",
+    "@formily/react": "^2.0.0-rc.12",
+    "@formily/reactive": "^2.0.0-rc.12",
+    "@formily/reactive-react": "^2.0.0-rc.12",
+    "@formily/shared": "^2.0.0-rc.12",
     "antd": "^4.0.0"
   },
   "devDependencies": {
-    "@formily/antd": "^2.0.0-rc.10",
-    "@formily/core": "^2.0.0-rc.10",
-    "@formily/react": "^2.0.0-rc.10",
-    "@formily/reactive": "^2.0.0-rc.10",
-    "@formily/reactive-react": "^2.0.0-rc.10",
-    "@formily/shared": "^2.0.0-rc.10",
+    "@formily/antd": "^2.0.0-rc.12",
+    "@formily/core": "^2.0.0-rc.12",
+    "@formily/react": "^2.0.0-rc.12",
+    "@formily/reactive": "^2.0.0-rc.12",
+    "@formily/reactive-react": "^2.0.0-rc.12",
+    "@formily/shared": "^2.0.0-rc.12",
     "antd": "^4.15.5"
   },
   "dependencies": {

diff --git a/packages/react-settings-form/src/SettingsForm.tsx b/packages/react-settings-form/src/SettingsForm.tsx
@@ -42,7 +42,8 @@ export const SettingsForm: React.FC<ISettingFormProps> = observer(
     )
     const form = useMemo(() => {
       return createForm({
-        values: node?.props,
+        initialValues: node?.designerProps?.defaultProps,
+        values: node.props,
         effects(form) {
           useLocales(node)
           useSnapshot(operation)

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -23,12 +23,12 @@
     "build:umd": "rollup --config"
   },
   "devDependencies": {
-    "@formily/reactive": "^2.0.0-rc.10",
-    "@formily/reactive-react": "^2.0.0-rc.10"
+    "@formily/reactive": "^2.0.0-rc.12",
+    "@formily/reactive-react": "^2.0.0-rc.12"
   },
   "peerDependencies": {
-    "@formily/reactive": "^2.0.0-rc.10",
-    "@formily/reactive-react": "^2.0.0-rc.10",
+    "@formily/reactive": "^2.0.0-rc.12",
+    "@formily/reactive-react": "^2.0.0-rc.12",
     "antd": "^4.15.4",
     "react": "16.x || 17.x"
   },