From dcffdebb9557441fb4aaf2edcb3985c9902d1942 Mon Sep 17 00:00:00 2001 From: "zhili.wzl" Date: Wed, 29 Sep 2021 17:51:45 +0800 Subject: [PATCH] fix: fix controlled props can not update --- formily/antd/package.json | 18 ++- formily/antd/src/components/Field/preview.tsx | 5 +- formily/next/package.json | 18 ++- formily/next/src/components/Field/preview.tsx | 5 +- formily/setters/package.json | 16 +- formily/transformer/package.json | 8 +- packages/core/package.json | 12 +- packages/core/src/models/TreeNode.ts | 5 +- packages/playground/package.json | 4 +- packages/react-settings-form/package.json | 24 +-- .../react-settings-form/src/SettingsForm.tsx | 3 +- packages/react/package.json | 8 +- yarn.lock | 138 +++++++++--------- 13 files changed, 134 insertions(+), 130 deletions(-) diff --git a/formily/antd/package.json b/formily/antd/package.json index 35a24acf5..c02bf208e 100644 --- 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 index a73a5b1da..47a450cd1 100644 --- 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 index 04ff9d299..037e2cf93 100644 --- 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 index 8febe417b..bfbfebd56 100644 --- 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 index 0e5991ef9..341968b7f 100644 --- 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 index 890873144..39196520c 100644 --- 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 index 30c18a17e..641ef5ec1 100644 --- 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 index 0fc6452c7..14db352a9 100644 --- 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 index dfbb346b9..f23bd1e6f 100644 --- 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 index 5ec896b9c..5296bdeb6 100644 --- 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 index 23697b99f..3c3d16889 100644 --- 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 = 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 index 284fb4164..ca1a5c576 100644 --- 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" }, diff --git a/yarn.lock b/yarn.lock index 51472d075..26b0711fb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1116,95 +1116,95 @@ minimatch "^3.0.4" strip-json-comments "^3.1.1" -"@formily/antd@^2.0.0-rc.10": - version "2.0.0-rc.10" - resolved "https://registry.yarnpkg.com/@formily/antd/-/antd-2.0.0-rc.10.tgz#5883b3facbddfaf7402441d4e4c173a92935c16f" - integrity sha512-O0XXMZaBAwymIRoMEcXyKNbtXA0oZGQpE0neFT3D749eMSM9S3utmy0HYUG7L80WjODWQoPewWPpMAasou4Zew== +"@formily/antd@^2.0.0-rc.12": + version "2.0.0-rc.12" + resolved "https://registry.yarnpkg.com/@formily/antd/-/antd-2.0.0-rc.12.tgz#a639387b8acdb00a2da8377e6a1e601b0ae0990b" + integrity sha512-p6xuUwaNt0+HlQ0jh9CZhf5G+Quv8FgtX8XlIQKspksWC+F1rKUbQ8jwV9+1OO6ScbkcfVxUgWT2xOjy1R3aTg== dependencies: "@ant-design/icons" "^4.0.0" - "@formily/core" "2.0.0-rc.10" - "@formily/json-schema" "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/core" "2.0.0-rc.12" + "@formily/json-schema" "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" "@juggle/resize-observer" "^3.3.1" classnames "^2.2.6" react-sortable-hoc "^1.11.0" react-sticky-box "^0.9.3" -"@formily/core@2.0.0-rc.10", "@formily/core@^2.0.0-rc.10": - version "2.0.0-rc.10" - resolved "https://registry.yarnpkg.com/@formily/core/-/core-2.0.0-rc.10.tgz#dd3ce1e7573bcb2b12a5444d8feed78602848a54" - integrity sha512-LOx1uo3FyGsrVFe4n4A/xdbKIsMjqcq+976C+W0MPge+z39yQBaizHMkBEOmHgWCq4R4WbdOEMNK2HsSPivw4g== +"@formily/core@2.0.0-rc.12", "@formily/core@^2.0.0-rc.12": + version "2.0.0-rc.12" + resolved "https://registry.yarnpkg.com/@formily/core/-/core-2.0.0-rc.12.tgz#4447f0956ecb5c205bcf0849149419c741095299" + integrity sha512-bRZ6IJs77LxPvBtby4ZrZ1kdtzVfcQbVHIDiuWH2ETrGCb7oV5271OowgpKJQMDzUuqGjn/8jWkBTxEYQWQjNQ== dependencies: - "@formily/reactive" "2.0.0-rc.10" - "@formily/shared" "2.0.0-rc.10" - "@formily/validator" "2.0.0-rc.10" + "@formily/reactive" "2.0.0-rc.12" + "@formily/shared" "2.0.0-rc.12" + "@formily/validator" "2.0.0-rc.12" -"@formily/json-schema@2.0.0-rc.10", "@formily/json-schema@^2.0.0-rc.10": - version "2.0.0-rc.10" - resolved "https://registry.yarnpkg.com/@formily/json-schema/-/json-schema-2.0.0-rc.10.tgz#ba47687658e167b61b8a616c625738cb91396132" - integrity sha512-LDPXjMWAdzTN7K4gESaTyKn2gOp4k9jRcAOHImiPUyxjE7zlQUkwD0Ad2HxLjHgiTGSzbA5cuxpnEAvlftobaA== +"@formily/json-schema@2.0.0-rc.12", "@formily/json-schema@^2.0.0-rc.12": + version "2.0.0-rc.12" + resolved "https://registry.yarnpkg.com/@formily/json-schema/-/json-schema-2.0.0-rc.12.tgz#0a2eda24a8bd778993b06248da57373a212cc749" + integrity sha512-9+ddErmsSBZZD9vLlLUy2g/a1UJJNfEPl0JPc3NBPtXwLA8mzOY8mcqY+QoyRfoHhqalq38a23RKjGAEq6M8Tg== dependencies: - "@formily/core" "2.0.0-rc.10" - "@formily/reactive" "2.0.0-rc.10" - "@formily/shared" "2.0.0-rc.10" + "@formily/core" "2.0.0-rc.12" + "@formily/reactive" "2.0.0-rc.12" + "@formily/shared" "2.0.0-rc.12" -"@formily/next@^2.0.0-rc.10": - version "2.0.0-rc.10" - resolved "https://registry.yarnpkg.com/@formily/next/-/next-2.0.0-rc.10.tgz#2e8912aca9c2931b5efb8fdc86dfbaa246ed06ed" - integrity sha512-157vo1SiMUjbSUyD2Dq2RCiAcIgHVlv00S+Jl3fZfZ6fnfPlWhnG+89wKE3e5yQydNao7dWpcScrQJNRIANUbg== +"@formily/next@^2.0.0-rc.12": + version "2.0.0-rc.12" + resolved "https://registry.yarnpkg.com/@formily/next/-/next-2.0.0-rc.12.tgz#3872b26152234bdc1c8e879fab7887ef7b4b1be0" + integrity sha512-bGUcPqzz/1tc0RYt5R/gpDLkILfy6eNo5FWzx0QX6E6I49g0LgeaQWnbZ7s8p0dFXKuhj8PGzOpDQ1Tij+Q++Q== dependencies: "@ant-design/icons" "^4.0.0" - "@formily/core" "2.0.0-rc.10" - "@formily/json-schema" "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/core" "2.0.0-rc.12" + "@formily/json-schema" "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" "@juggle/resize-observer" "^3.3.1" classnames "^2.2.6" react-sortable-hoc "^1.11.0" react-sticky-box "^0.9.3" -"@formily/path@2.0.0-rc.10", "@formily/path@^2.0.0-rc.10": - version "2.0.0-rc.10" - resolved "https://registry.yarnpkg.com/@formily/path/-/path-2.0.0-rc.10.tgz#d0540c9dc7bbf0c1d0cffd73a7bc6b1fd68672e2" - integrity sha512-wWHoSnlyBOFBHy2F0WsNIkrB8IDg7a8Qpot/eGdhYeVsLXkRGnWXhUTGUX5QAMCRo5qXB1U3ugfOA8C2uvNfoA== - -"@formily/react@2.0.0-rc.10", "@formily/react@^2.0.0-rc.10": - version "2.0.0-rc.10" - resolved "https://registry.yarnpkg.com/@formily/react/-/react-2.0.0-rc.10.tgz#c68bc1ddae1f07afb312f328876c9730d50c1a5c" - integrity sha512-Tl3rLmxqSOzyp/JRZ9GAGh06Chn+vqlmzRf4JD+tcMSSGG/vwgFVbZdwY57+CeZCcQnJ5WHcxLMImZVPchb1/Q== - dependencies: - "@formily/core" "2.0.0-rc.10" - "@formily/json-schema" "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/validator" "2.0.0-rc.10" +"@formily/path@2.0.0-rc.12", "@formily/path@^2.0.0-rc.12": + version "2.0.0-rc.12" + resolved "https://registry.yarnpkg.com/@formily/path/-/path-2.0.0-rc.12.tgz#b5c8d60735f24c99dfd7622a7888ae1f3078fd97" + integrity sha512-c9aIerS/80aChh+x9R34jnclfTYKH3ASlIW1cKyL5tSthRnkQpXYqJIpCcfD5GVleh5yTDlhph6RycLxU3L9+g== + +"@formily/react@2.0.0-rc.12", "@formily/react@^2.0.0-rc.12": + version "2.0.0-rc.12" + resolved "https://registry.yarnpkg.com/@formily/react/-/react-2.0.0-rc.12.tgz#44b5150b9e4033610106dbd4b0bf23f86a1f5841" + integrity sha512-jtppiWR0NHPsC5ZMJ7BcWMjr4tvwZk1jKycw4PwnjMV9ti0t5ZaUXSIBUSSH36rgBu4s133lqU/a18S1Mt3LDg== + dependencies: + "@formily/core" "2.0.0-rc.12" + "@formily/json-schema" "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" + "@formily/validator" "2.0.0-rc.12" hoist-non-react-statics "^3.3.2" -"@formily/reactive-react@2.0.0-rc.10", "@formily/reactive-react@^2.0.0-rc.10": - version "2.0.0-rc.10" - resolved "https://registry.yarnpkg.com/@formily/reactive-react/-/reactive-react-2.0.0-rc.10.tgz#6c4e25b0dc40f4fdbc2642455336b8fa5cfca842" - integrity sha512-bVbptFcpHNMciB0xxHPYj5m0QYkn6Sa+w4qSSPNFPtNyaVkbsw9suH4hAUKMqhH1FOdFztdgGUjcGxiEsO1tnA== +"@formily/reactive-react@2.0.0-rc.12", "@formily/reactive-react@^2.0.0-rc.12": + version "2.0.0-rc.12" + resolved "https://registry.yarnpkg.com/@formily/reactive-react/-/reactive-react-2.0.0-rc.12.tgz#e5abf0918d8558ffd091dc49a1ff4410b51a000f" + integrity sha512-OtSjRyU2rJZcemxSDBfCU+N5BY8JFWFAimC6ti/FVkPNSJ7dXSq4kxSjMe4+Ck7s13g+8Jdm6mnYCxxDRUf3bw== dependencies: - "@formily/reactive" "2.0.0-rc.10" + "@formily/reactive" "2.0.0-rc.12" hoist-non-react-statics "^3.3.2" -"@formily/reactive@2.0.0-rc.10", "@formily/reactive@^2.0.0-rc.10": - version "2.0.0-rc.10" - resolved "https://registry.yarnpkg.com/@formily/reactive/-/reactive-2.0.0-rc.10.tgz#7ef865f87707a65149c4a9ec44dcf6e34e1c9173" - integrity sha512-ptHWXnZnibXIJ1+MkR0qtSeYNxl0cpRJj7xv/h3g6why6vpYuty0DUZ8YOl/4/yJMCcATbfhNfGkH/EqT+8vhg== +"@formily/reactive@2.0.0-rc.12", "@formily/reactive@^2.0.0-rc.12": + version "2.0.0-rc.12" + resolved "https://registry.yarnpkg.com/@formily/reactive/-/reactive-2.0.0-rc.12.tgz#cf99fac49fa60d77465a936c28667fc6a4ce9b6d" + integrity sha512-9KBc/si8wxRTUSy8ihcpVxCLS64mpenm1b/xqdkNsxMAZwrAimUoWIaxCpz41i4hVuysGLodtkFufPWnV6GqFg== -"@formily/shared@2.0.0-rc.10", "@formily/shared@^2.0.0-rc.10": - version "2.0.0-rc.10" - resolved "https://registry.yarnpkg.com/@formily/shared/-/shared-2.0.0-rc.10.tgz#d2977515b949820c0ab4f224d720523c5fd0244e" - integrity sha512-b/mj10N0B4NiTRBw9FcLfrufyCk4hF6RZl34e2hezLE/OI/DMTsW54l3cwjDdrko3wY8m7yhKDvdv8AkiTX79g== +"@formily/shared@2.0.0-rc.12", "@formily/shared@^2.0.0-rc.12": + version "2.0.0-rc.12" + resolved "https://registry.yarnpkg.com/@formily/shared/-/shared-2.0.0-rc.12.tgz#1dd37ded029c8559a4ecb6ce57eb014f7ab6a8dc" + integrity sha512-Q0/SUy9f8OSKRcBFyWo8jjuwwbz3PUDAKsUtyUJHfAbhXXzmZMqa/O4rGlDqDBpYpmq7JfSQsg/JAoC6AICxOQ== dependencies: - "@formily/path" "2.0.0-rc.10" + "@formily/path" "2.0.0-rc.12" camel-case "^4.1.1" lower-case "^2.0.1" no-case "^3.0.4" @@ -1212,12 +1212,12 @@ pascal-case "^3.1.1" upper-case "^2.0.1" -"@formily/validator@2.0.0-rc.10": - version "2.0.0-rc.10" - resolved "https://registry.yarnpkg.com/@formily/validator/-/validator-2.0.0-rc.10.tgz#bc8da47e1343118b75ff471c20ba552e7fbabb61" - integrity sha512-k2iKA/zo3tDKyFc5wlHDDhrCqp4RHbUZbsa+0Xc+vUuXhq66x9RS6LECDk8sIlwhg9q7CtMUPPBr9KRe7cw/kQ== +"@formily/validator@2.0.0-rc.12": + version "2.0.0-rc.12" + resolved "https://registry.yarnpkg.com/@formily/validator/-/validator-2.0.0-rc.12.tgz#01767c3de2f90e693047beb57d7b6a22adebb3ca" + integrity sha512-TGQ+RVrv8aM4KkZ1bFSnADT0HA02TIeHHRq4lt9bCpjOZoQFAjrolFcNXq+Lf25XRBiSAKMnb7qQQaDIK3Z9wg== dependencies: - "@formily/shared" "2.0.0-rc.10" + "@formily/shared" "2.0.0-rc.12" "@gar/promisify@^1.0.1": version "1.1.2"