fix(Form): fix update form state

qiqiboy · Mar 16, 2020 · cf5ac0a · cf5ac0a
1 parent a96b07a
commit cf5ac0a
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 33 deletions.
diff --git a/dist/react-formutil.cjs.development.js b/dist/react-formutil.cjs.development.js
@@ -497,17 +497,17 @@ var Form = /*#__PURE__*/function (_Component) {
       }
     };
 
-    _this.$$formValidate = function (callback) {
+    _this.$$formValidate = function () {
       return _this.$$formValidatePromise = new Promise(function (resolve) {
         var $validator = _this.props.$validator;
         var $breakAsyncHandler;
         var $shouldCancelPrevAsyncValidate;
         var prevCallback;
         var validation;
-        var result = $validator(_this.$formutil.$params, _this.formtutil);
+        var result = $validator(_this.$formutil.$params, _this.$formutil);
 
         var execCallback = function execCallback($formutil) {
-          return resolve(runCallback(callback, runCallback(prevCallback, $formutil)));
+          return resolve(runCallback(prevCallback, $formutil));
         };
 
         if (isPromise(result)) {
@@ -576,8 +576,6 @@ var Form = /*#__PURE__*/function (_Component) {
             $error: $error
           };
         }
-
-        return;
       }, callback, true);
     };
 
@@ -605,9 +603,9 @@ var Form = /*#__PURE__*/function (_Component) {
       var $parsedTree = _this.$$deepParseObject($stateTree);
 
       objectEach(_this.$$registers, function (handler, name) {
-        var pathData;
+        var pathData = pathExist($parsedTree, name);
 
-        if (force || (pathData = pathExist($parsedTree, name))) {
+        if (force || pathData) {
           var $newState = processer(pathData && pathData.data, handler);
 
           if ($newState) {

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
@@ -490,17 +490,17 @@ var Form = /*#__PURE__*/function (_Component) {
       }
     };
 
-    _this.$$formValidate = function (callback) {
+    _this.$$formValidate = function () {
       return _this.$$formValidatePromise = new Promise(function (resolve) {
         var $validator = _this.props.$validator;
         var $breakAsyncHandler;
         var $shouldCancelPrevAsyncValidate;
         var prevCallback;
         var validation;
-        var result = $validator(_this.$formutil.$params, _this.formtutil);
+        var result = $validator(_this.$formutil.$params, _this.$formutil);
 
         var execCallback = function execCallback($formutil) {
-          return resolve(runCallback(callback, runCallback(prevCallback, $formutil)));
+          return resolve(runCallback(prevCallback, $formutil));
         };
 
         if (isPromise(result)) {
@@ -569,8 +569,6 @@ var Form = /*#__PURE__*/function (_Component) {
             $error: $error
           };
         }
-
-        return;
       }, callback, true);
     };
 
@@ -598,9 +596,9 @@ var Form = /*#__PURE__*/function (_Component) {
       var $parsedTree = _this.$$deepParseObject($stateTree);
 
       objectEach(_this.$$registers, function (handler, name) {
-        var pathData;
+        var pathData = pathExist($parsedTree, name);
 
-        if (force || (pathData = pathExist($parsedTree, name))) {
+        if (force || pathData) {
           var $newState = processer(pathData && pathData.data, handler);
 
           if ($newState) {

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
@@ -944,17 +944,17 @@
         }
       };
 
-      _this.$$formValidate = function (callback) {
+      _this.$$formValidate = function () {
         return _this.$$formValidatePromise = new Promise(function (resolve) {
           var $validator = _this.props.$validator;
           var $breakAsyncHandler;
           var $shouldCancelPrevAsyncValidate;
           var prevCallback;
           var validation;
-          var result = $validator(_this.$formutil.$params, _this.formtutil);
+          var result = $validator(_this.$formutil.$params, _this.$formutil);
 
           var execCallback = function execCallback($formutil) {
-            return resolve(runCallback(callback, runCallback(prevCallback, $formutil)));
+            return resolve(runCallback(prevCallback, $formutil));
           };
 
           if (isPromise(result)) {
@@ -1023,8 +1023,6 @@
               $error: $error
             };
           }
-
-          return;
         }, callback, true);
       };
 
@@ -1052,9 +1050,9 @@
         var $parsedTree = _this.$$deepParseObject($stateTree);
 
         objectEach(_this.$$registers, function (handler, name) {
-          var pathData;
+          var pathData = pathExist($parsedTree, name);
 
-          if (force || (pathData = pathExist($parsedTree, name))) {
+          if (force || pathData) {
             var $newState = processer(pathData && pathData.data, handler);
 
             if ($newState) {

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.0.6",
+  "version": "1.0.7",
   "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
@@ -245,7 +245,7 @@ class Form extends Component {
         }
     };
 
-    $$formValidate = callback =>
+    $$formValidate = () =>
         (this.$$formValidatePromise = new Promise(resolve => {
             const { $validator } = this.props;
 
@@ -254,9 +254,8 @@ class Form extends Component {
             let prevCallback;
             let validation;
 
-            const result = $validator(this.$formutil.$params, this.formtutil);
-            const execCallback = $formutil =>
-                resolve(utils.runCallback(callback, utils.runCallback(prevCallback, $formutil)));
+            const result = $validator(this.$formutil.$params, this.$formutil);
+            const execCallback = $formutil => resolve(utils.runCallback(prevCallback, $formutil));
 
             if (utils.isPromise(result)) {
                 if (!this.$$formPending) {
@@ -333,8 +332,6 @@ class Form extends Component {
                         $error
                     };
                 }
-
-                return;
             },
             callback,
             true
@@ -364,9 +361,9 @@ class Form extends Component {
         const $parsedTree = this.$$deepParseObject($stateTree);
 
         utils.objectEach(this.$$registers, (handler, name) => {
-            let pathData;
+            const pathData = utils.pathExist($parsedTree, name);
 
-            if (force || (pathData = utils.pathExist($parsedTree, name))) {
+            if (force || pathData) {
                 const $newState = processer(pathData && pathData.data, handler);
 
                 if ($newState) {