fix: fix $onFormChange before Form mount

qiqiboy · Nov 26, 2020 · 69976c5 · 69976c5
1 parent 8e0ac92
commit 69976c5
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 12 deletions.
diff --git a/dist/react-formutil.cjs.development.js b/dist/react-formutil.cjs.development.js
@@ -901,6 +901,7 @@ var Form = /*#__PURE__*/function (_Component) {
         var pathData = pathExist($parsedTree, name);
 
         if (force || pathData) {
+          var $curState = handler.$getState();
           var $newState = handler && processer(pathData && pathData.data, handler);
 
           if ($newState) {
@@ -916,11 +917,11 @@ var Form = /*#__PURE__*/function (_Component) {
 
               if (findItem) {
                 findItem.$newValue = $newValue;
-              } else if (name in _this.$formutil.$weakParams) {
+              } else {
                 _this.$$fieldChangedQueue.push({
                   name: name,
                   $newValue: $newValue,
-                  $prevValue: _this.$formutil.$weakParams[name]
+                  $prevValue: $curState.$value
                 });
               }
             }

diff --git a/dist/react-formutil.cjs.production.js b/dist/react-formutil.cjs.production.js
diff --git a/dist/react-formutil.esm.development.js b/dist/react-formutil.esm.development.js
@@ -834,6 +834,7 @@ var Form = /*#__PURE__*/function (_Component) {
         var pathData = pathExist($parsedTree, name);
 
         if (force || pathData) {
+          var $curState = handler.$getState();
           var $newState = handler && processer(pathData && pathData.data, handler);
 
           if ($newState) {
@@ -849,11 +850,11 @@ var Form = /*#__PURE__*/function (_Component) {
 
               if (findItem) {
                 findItem.$newValue = $newValue;
-              } else if (name in _this.$formutil.$weakParams) {
+              } else {
                 _this.$$fieldChangedQueue.push({
                   name: name,
                   $newValue: $newValue,
-                  $prevValue: _this.$formutil.$weakParams[name]
+                  $prevValue: $curState.$value
                 });
               }
             }

diff --git a/dist/react-formutil.esm.production.js b/dist/react-formutil.esm.production.js
diff --git a/dist/react-formutil.umd.development.js b/dist/react-formutil.umd.development.js
@@ -1194,6 +1194,7 @@
           var pathData = pathExist($parsedTree, name);
 
           if (force || pathData) {
+            var $curState = handler.$getState();
             var $newState = handler && processer(pathData && pathData.data, handler);
 
             if ($newState) {
@@ -1209,11 +1210,11 @@
 
                 if (findItem) {
                   findItem.$newValue = $newValue;
-                } else if (name in _this.$formutil.$weakParams) {
+                } else {
                   _this.$$fieldChangedQueue.push({
                     name: name,
                     $newValue: $newValue,
-                    $prevValue: _this.$formutil.$weakParams[name]
+                    $prevValue: $curState.$value
                   });
                 }
               }

diff --git a/dist/react-formutil.umd.production.js b/dist/react-formutil.umd.production.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-formutil",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Happy to build the forms in React ^_^",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",

diff --git a/src/Form.js b/src/Form.js
@@ -366,6 +366,7 @@ class Form extends Component {
             const pathData = utils.pathExist($parsedTree, name);
 
             if (force || pathData) {
+                const $curState = handler.$getState();
                 const $newState = handler && processer(pathData && pathData.data, handler);
 
                 if ($newState) {
@@ -378,11 +379,11 @@ class Form extends Component {
 
                         if (findItem) {
                             findItem.$newValue = $newValue;
-                        } else if (name in this.$formutil.$weakParams) {
+                        } else {
                             this.$$fieldChangedQueue.push({
                                 name,
                                 $newValue,
-                                $prevValue: this.$formutil.$weakParams[name]
+                                $prevValue: $curState.$value
                             });
                         }
                     }