Merge pull request #2018 from Baoyx007/patch-1

feat(form) : support promise for validate method #1857

Merge pull request #2018 from Baoyx007/patch-1
feat(form) : support promise for validate method #1857
Aresn · GitHub
2 parents 5a83c4ae 0c0683e4
Showing 1 changed file with 17 additions and 11 deletions Show diff stats
src/components/form/form.vue
@@ -57,18 +57,24 @@
                 });
             },
             validate(callback) {
-                let valid = true;
-                let count = 0;
-                this.fields.forEach(field => {
-                    field.validate('', errors => {
-                        if (errors) {
-                            valid = false;
-                        }
-                        if (typeof callback === 'function' && ++count === this.fields.length) {
-                            callback(valid);
-                        }
+                return new Promise(resolve => {
+                    let valid = true;
+                    let count = 0;
+                    this.fields.forEach(field => {
+                        field.validate('', errors => {
+                            if (errors) {
+                                valid = false;
+                            }
+                            if (++count === this.fields.length) {
+                                // all finish
+                                resolve(valid)
+                                if (typeof callback === 'function') {
+                                    callback(valid);
+                                }
+                            }
+                        });
                     });
-                });
+                })
             },
             validateField(prop, cb) {
                 const field = this.fields.filter(field => field.prop === prop)[0];