@form-create/element-ui 2.5.28 → 2.5.29

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@form-create/element-ui",
-    "version": "2.5.28",
+    "version": "2.5.29",
     "description": "element-ui动态表单|form-create is a form generation component that can generate dynamic rendering, data collection, verification and submission functions through JSON. Supports 3 UI frameworks, and supports the generation of any Vue components. Built-in 20 kinds of commonly used form components and custom components, no matter how complex forms can be easily handled.",
     "main": "./dist/form-create.min.js",
     "module": "./dist/form-create.min.js",
@@ -43,15 +43,15 @@
     },
     "homepage": "http://www.form-create.com",
     "dependencies": {
-        "@form-create/component-elm-checkbox": "^2.5.27",
+        "@form-create/component-elm-checkbox": "^2.5.29",
         "@form-create/component-elm-frame": "^2.5.27",
         "@form-create/component-elm-group": "^2.5.28",
         "@form-create/component-elm-radio": "^2.5.27",
         "@form-create/component-elm-select": "^2.5.27",
         "@form-create/component-elm-tree": "^2.5.27",
-        "@form-create/component-elm-upload": "^2.5.27",
+        "@form-create/component-elm-upload": "^2.5.29",
         "@form-create/component-subform": "^2.5.25",
-        "@form-create/core": "^2.5.28",
+        "@form-create/core": "^2.5.29",
         "@form-create/utils": "^2.5.27"
     },
     "publishConfig": {
@@ -64,5 +64,5 @@
         "element-ui": "^2.15.9",
         "v-jsoneditor": "^1.4.2"
     },
-    "gitHead": "441d2d1b3ce8b293a0557c869c8f72f4de9ffac5"
+    "gitHead": "c213294e1e30ab883ab3d34687decbd6da3fbd78"
 }

package/src/core/api.js

@@ -13,75 +13,42 @@ function tidyBtnProp(btn, def) {
 export default function extendApi(api, h) {
     extend(api, {
         validate(callback) {
-            let flag;
-            const forms = api.children;
-            let len = forms.length;
-            const validate = () => {
-                h.$manager.validate((...args) => {
-                    if (!args[0] || !flag) {
-                        flag = args;
-                    }
-                    callback && callback(...flag);
-                });
-            };
-
-            const validFn = (args) => {
-                setTimeout(() => {
-                    if (!args[0]) {
-                        if (!flag) {
-                            flag = args;
-                        }
-                    }
-                    if (!--len) {
-                        validate();
-                    }
-                });
-            };
-
-            forms.forEach(form => {
-                form.validate((...args) => validFn(args))
-            })
-
-            if (!len) {
-                validate();
-            }
+            return new Promise((resolve, reject) => {
+                const forms = api.children;
+                const all = [h.$manager.validate()];
+                forms.forEach(v => {
+                    all.push(v.validate());
+                })
+                Promise.all(all).then(() => {
+                    resolve(true);
+                    callback && callback(true);
+                }).catch((e) => {
+                    reject(e);
+                    callback && callback(e);
+                    h.vm.$emit('validate-fail', e, {api});
+                })
+            });
         },
         validateField: (field, callback) => {
-            const ctx = h.getFieldCtx(field);
-            if (!ctx) return;
-            const sub = h.subForm[ctx.id];
-            let len = 0;
-            let flag;
-            const validate = () => {
-                h.$manager.validateField(ctx.id, (...args) => {
-                    if (args[0]) {
-                        flag = args;
-                    } else if (flag) {
-                        return callback && callback('子表单验证未通过', flag[1]);
-                    }
-                    callback && callback(...flag || args);
-                });
-            };
-            const validFn = (args) => {
-                setTimeout(() => {
-                    if (!args[0]) {
-                        if (!flag) {
-                            flag = args;
-                        }
-                    }
-                    if (!--len) {
-                        validate();
-                    }
-                });
-            };
-            sub && toArray(sub).forEach(form => {
-                len++;
-                form.validate((...args) => validFn(args))
+            return new Promise((resolve, reject) => {
+                const ctx = h.getFieldCtx(field);
+                if (!ctx) return;
+                const sub = h.subForm[ctx.id];
+                const all = [h.$manager.validateField(ctx.id)];
+                toArray(sub).forEach(v => {
+                    all.push(v.validate().catch(() => {
+                        return Promise.reject('子表单验证未通过');
+                    }));
+                })
+                Promise.all(all).then(() => {
+                    resolve(null);
+                    callback && callback(null);
+                }).catch((e) => {
+                    reject(e);
+                    callback && callback(e);
+                    h.vm.$emit('validate-field-fail', e, {field, api});
+                })
             });
-
-            if (!len) {
-                validate();
-            }
         },
         clearValidateState(fields, clearSub = true) {
             api.helper.tidyFields(fields).forEach(field => {

package/src/core/manager.js

@@ -32,11 +32,23 @@ function tidyBool(opt, name) {
 }
 
 export default {
-    validate(call) {
-        this.form().validate(call);
+    validate() {
+        const form = this.form();
+        if (form) {
+            return form.validate();
+        }
+        return new Promise(v => v());
     },
-    validateField(field, call) {
-        this.form().validateField(field, call);
+    validateField(field) {
+        const form = this.form();
+        if (form) {
+            return new Promise((resolve, reject) => {
+                form.validateField(field, e => {
+                    e ? reject(e) : resolve(null);
+                });
+            })
+        }
+        return new Promise(v => v());
     },
     clearValidateState(ctx) {
         const fItem = this.vm.$refs[ctx.wrapRef];

package/types/config.d.ts

@@ -104,9 +104,9 @@ export interface ApiAttrs {
 
     clearSubValidateState(fields?: string | string[]): void;
 
-    validate(callback?: ValidateCallback): void;
+    validate(callback?: ValidateCallback): Promise<any>;
 
-    validateField(field: string, callback?: ValidateFieldCallback): void;
+    validateField(field: string, callback?: ValidateFieldCallback): Promise<any>;
 
     submitBtnProps(props: Button): void;