Преглед изворни кода

chore(publish): v1.2.0-beta.1

janrywang пре 6 година
родитељ
комит
4923ff6aae

+ 5 - 5
packages/antd-components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formily/antd-components",
-  "version": "1.2.0-beta.0",
+  "version": "1.2.0-beta.1",
   "license": "MIT",
   "main": "lib",
   "module": "esm",
@@ -31,10 +31,10 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.0.0-rc.0",
-    "@formily/antd": "^1.2.0-beta.0",
-    "@formily/react-schema-renderer": "^1.2.0-beta.0",
-    "@formily/react-shared-components": "^1.2.0-beta.0",
-    "@formily/shared": "^1.2.0-beta.0",
+    "@formily/antd": "^1.2.0-beta.1",
+    "@formily/react-schema-renderer": "^1.2.0-beta.1",
+    "@formily/react-shared-components": "^1.2.0-beta.1",
+    "@formily/shared": "^1.2.0-beta.1",
     "classnames": "^2.2.6",
     "styled-components": "^4.1.1"
   },

+ 4 - 4
packages/antd/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formily/antd",
-  "version": "1.2.0-beta.0",
+  "version": "1.2.0-beta.1",
   "license": "MIT",
   "main": "lib",
   "module": "esm",
@@ -31,9 +31,9 @@
     "react-dom": ">=16.8.0"
   },
   "dependencies": {
-    "@formily/react-schema-renderer": "^1.2.0-beta.0",
-    "@formily/react-shared-components": "^1.2.0-beta.0",
-    "@formily/shared": "^1.2.0-beta.0",
+    "@formily/react-schema-renderer": "^1.2.0-beta.1",
+    "@formily/react-shared-components": "^1.2.0-beta.1",
+    "@formily/shared": "^1.2.0-beta.1",
     "classnames": "^2.2.6",
     "react-eva": "^1.0.0-alpha.0",
     "react-stikky": "^0.1.15",

+ 3 - 3
packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formily/core",
-  "version": "1.2.0-beta.0",
+  "version": "1.2.0-beta.1",
   "license": "MIT",
   "main": "lib",
   "repository": {
@@ -25,8 +25,8 @@
     "scheduler": ">=0.11.2"
   },
   "dependencies": {
-    "@formily/shared": "^1.2.0-beta.0",
-    "@formily/validator": "^1.2.0-beta.0",
+    "@formily/shared": "^1.2.0-beta.1",
+    "@formily/validator": "^1.2.0-beta.1",
     "immer": "^6.0.3"
   },
   "publishConfig": {

+ 11 - 9
packages/core/src/shared/model.ts

@@ -80,11 +80,14 @@ export const createModel = <
       }
     }
 
-    getDirtys(patches: Patch[]): StateDirtyMap<State> {
-      return patches.reduce((buf, { path }) => {
-        buf[path[0]] = true
-        return buf
-      }, {})
+    getDirtys(patches: Patch[], refresh?: boolean): StateDirtyMap<State> {
+      return patches.reduce(
+        (buf, { path }) => {
+          buf[path[0]] = true
+          return buf
+        },
+        refresh ? {} : this.batching ? this.dirtys : {}
+      )
     }
 
     dirtyCheck(path: FormPathPattern, nextValue: any) {
@@ -110,7 +113,7 @@ export const createModel = <
     setState(recipe?: Recipe<State>, silent: boolean = false) {
       if (!isFn(recipe)) return
       const base = this.getBaseState()
-      this.dirtyCount = 0
+      this.dirtyCount = this.batching ? this.dirtyCount : 0
       this.patches = []
       this.prevState = base
       this.factory.prevState = base
@@ -131,7 +134,7 @@ export const createModel = <
         base,
         draft => {
           applyPatches(draft, this.patches)
-          const dirtys = this.getDirtys(this.patches)
+          const dirtys = this.getDirtys(this.patches, true)
           if (isFn(this.factory.produce)) {
             this.factory.produce(draft, dirtys)
           }
@@ -154,6 +157,7 @@ export const createModel = <
       this.factory.state = produced
       this.state = produced
       this.dirtys = this.getDirtys(this.patches)
+      this.patches = []
       if (this.dirtyCount > 0 && !silent) {
         if (this.batching) {
           return
@@ -162,7 +166,6 @@ export const createModel = <
       }
       this.dirtyCount = 0
       this.dirtys = {}
-      this.patches = []
     }
 
     setSourceState(recipe?: Recipe<State>) {
@@ -197,7 +200,6 @@ export const createModel = <
       this.batching = false
       this.dirtys = {}
       this.dirtyCount = 0
-      this.patches = []
     }
 
     setCache(key: CacheKey, value: any) {

+ 3 - 3
packages/devtools/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formily/devtools",
-  "version": "1.2.0-beta.0",
+  "version": "1.2.0-beta.1",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -32,8 +32,8 @@
     "webpack-dev-server": "^3.10.1"
   },
   "dependencies": {
-    "@formily/core": "^1.2.0-beta.0",
-    "@formily/shared": "^1.2.0-beta.0",
+    "@formily/core": "^1.2.0-beta.1",
+    "@formily/shared": "^1.2.0-beta.1",
     "react": "^16.12.0",
     "react-dom": "^16.12.0",
     "react-json-view": "^1.19.1",

+ 5 - 5
packages/meet-components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formily/meet-components",
-  "version": "1.2.0-beta.0",
+  "version": "1.2.0-beta.1",
   "license": "MIT",
   "main": "lib",
   "module": "esm",
@@ -25,10 +25,10 @@
   },
   "dependencies": {
     "@alifd/meet": "^1.0.0-beta.25",
-    "@formily/react": "^1.2.0-beta.0",
-    "@formily/react-schema-renderer": "^1.2.0-beta.0",
-    "@formily/react-shared-components": "^1.2.0-beta.0",
-    "@formily/shared": "^1.2.0-beta.0",
+    "@formily/react": "^1.2.0-beta.1",
+    "@formily/react-schema-renderer": "^1.2.0-beta.1",
+    "@formily/react-shared-components": "^1.2.0-beta.1",
+    "@formily/shared": "^1.2.0-beta.1",
     "@rax-ui/locale": "^1.0.0-beta.10",
     "classnames": "^2.2.6",
     "rax": "^1.1.1",

+ 5 - 5
packages/meet/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formily/meet",
-  "version": "1.2.0-beta.0",
+  "version": "1.2.0-beta.1",
   "license": "MIT",
   "main": "lib",
   "module": "esm",
@@ -25,10 +25,10 @@
   },
   "dependencies": {
     "@alifd/meet": "^1.0.0-beta.25",
-    "@formily/react": "^1.2.0-beta.0",
-    "@formily/react-schema-renderer": "^1.2.0-beta.0",
-    "@formily/react-shared-components": "^1.2.0-beta.0",
-    "@formily/shared": "^1.2.0-beta.0",
+    "@formily/react": "^1.2.0-beta.1",
+    "@formily/react-schema-renderer": "^1.2.0-beta.1",
+    "@formily/react-shared-components": "^1.2.0-beta.1",
+    "@formily/shared": "^1.2.0-beta.1",
     "@rax-ui/locale": "^1.0.0-beta.10",
     "classnames": "^2.2.6",
     "rax": "^1.1.1",

+ 5 - 5
packages/next-components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formily/next-components",
-  "version": "1.2.0-beta.0",
+  "version": "1.2.0-beta.1",
   "license": "MIT",
   "main": "lib",
   "module": "esm",
@@ -27,10 +27,10 @@
     "react-dom": ">=16.8.0"
   },
   "dependencies": {
-    "@formily/next": "^1.2.0-beta.0",
-    "@formily/react-schema-renderer": "^1.2.0-beta.0",
-    "@formily/react-shared-components": "^1.2.0-beta.0",
-    "@formily/shared": "^1.2.0-beta.0",
+    "@formily/next": "^1.2.0-beta.1",
+    "@formily/react-schema-renderer": "^1.2.0-beta.1",
+    "@formily/react-shared-components": "^1.2.0-beta.1",
+    "@formily/shared": "^1.2.0-beta.1",
     "classnames": "^2.2.6",
     "styled-components": "^4.1.1"
   },

+ 4 - 4
packages/next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formily/next",
-  "version": "1.2.0-beta.0",
+  "version": "1.2.0-beta.1",
   "license": "MIT",
   "main": "lib",
   "module": "esm",
@@ -27,9 +27,9 @@
     "react-dom": ">=16.8.0"
   },
   "dependencies": {
-    "@formily/react-schema-renderer": "^1.2.0-beta.0",
-    "@formily/react-shared-components": "^1.2.0-beta.0",
-    "@formily/shared": "^1.2.0-beta.0",
+    "@formily/react-schema-renderer": "^1.2.0-beta.1",
+    "@formily/react-shared-components": "^1.2.0-beta.1",
+    "@formily/shared": "^1.2.0-beta.1",
     "classnames": "^2.2.6",
     "react-eva": "^1.0.0-alpha.0",
     "react-stikky": "^0.1.15",

+ 2 - 2
packages/printer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formily/printer",
-  "version": "1.2.0-beta.0",
+  "version": "1.2.0-beta.1",
   "license": "MIT",
   "main": "lib",
   "repository": {
@@ -25,7 +25,7 @@
     "typescript": "~3.8.0"
   },
   "dependencies": {
-    "@formily/react-schema-renderer": "^1.2.0-beta.0",
+    "@formily/react-schema-renderer": "^1.2.0-beta.1",
     "react-modal": "^3.8.1",
     "styled-components": "^4.1.1"
   },

+ 2 - 2
packages/react-schema-editor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formily/react-schema-editor",
-  "version": "1.2.0-beta.0",
+  "version": "1.2.0-beta.1",
   "license": "MIT",
   "main": "lib",
   "repository": {
@@ -22,7 +22,7 @@
   "dependencies": {
     "@ant-design/compatible": "^0.0.1-rc.1",
     "@ant-design/icons": "^4.0.3",
-    "@formily/antd": "^1.2.0-beta.0",
+    "@formily/antd": "^1.2.0-beta.1",
     "antd": "^4.0",
     "lodash": "^4.17.15",
     "react-monaco-editor": "^0.36.0"

+ 5 - 5
packages/react-schema-renderer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formily/react-schema-renderer",
-  "version": "1.2.0-beta.0",
+  "version": "1.2.0-beta.1",
   "license": "MIT",
   "main": "lib",
   "repository": {
@@ -29,10 +29,10 @@
     "rxjs": "^6.5.1"
   },
   "dependencies": {
-    "@formily/core": "^1.2.0-beta.0",
-    "@formily/react": "^1.2.0-beta.0",
-    "@formily/shared": "^1.2.0-beta.0",
-    "@formily/validator": "^1.2.0-beta.0",
+    "@formily/core": "^1.2.0-beta.1",
+    "@formily/react": "^1.2.0-beta.1",
+    "@formily/shared": "^1.2.0-beta.1",
+    "@formily/validator": "^1.2.0-beta.1",
     "pascal-case": "^2.0.1"
   },
   "publishConfig": {

+ 2 - 2
packages/react-shared-components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formily/react-shared-components",
-  "version": "1.2.0-beta.0",
+  "version": "1.2.0-beta.1",
   "license": "MIT",
   "main": "lib",
   "types": "lib/index.d.ts",
@@ -26,7 +26,7 @@
     "typescript": "~3.8.0"
   },
   "dependencies": {
-    "@formily/shared": "^1.2.0-beta.0",
+    "@formily/shared": "^1.2.0-beta.1",
     "react-drag-listview": "^0.1.6"
   }
 }

+ 3 - 3
packages/react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formily/react",
-  "version": "1.2.0-beta.0",
+  "version": "1.2.0-beta.1",
   "license": "MIT",
   "main": "lib",
   "repository": {
@@ -29,8 +29,8 @@
     "rxjs": "^6.5.1"
   },
   "dependencies": {
-    "@formily/core": "^1.2.0-beta.0",
-    "@formily/shared": "^1.2.0-beta.0"
+    "@formily/core": "^1.2.0-beta.1",
+    "@formily/shared": "^1.2.0-beta.1"
   },
   "publishConfig": {
     "access": "public"

+ 1 - 1
packages/shared/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formily/shared",
-  "version": "1.2.0-beta.0",
+  "version": "1.2.0-beta.1",
   "license": "MIT",
   "main": "lib",
   "types": "lib/index.d.ts",

+ 2 - 2
packages/validator/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formily/validator",
-  "version": "1.2.0-beta.0",
+  "version": "1.2.0-beta.1",
   "license": "MIT",
   "main": "lib",
   "repository": {
@@ -22,7 +22,7 @@
     "typescript": "~3.8.0"
   },
   "dependencies": {
-    "@formily/shared": "^1.2.0-beta.0"
+    "@formily/shared": "^1.2.0-beta.1"
   },
   "publishConfig": {
     "access": "public"