@form-create/iview 2.5.28 → 2.5.31

package/dist/form-create.js

@@ -1,5 +1,5 @@
 /*!
- * @form-create/iview v2.5.28
+ * @form-create/iview v2.5.31
  * (c) 2018-2023 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
@@ -292,12 +292,12 @@
         }));
       },
       update: function update() {
-        var _this = this;
-        this.trueValue = this.value ? this.options().filter(function (opt) {
-          return _this.value.indexOf(opt.value) !== -1;
+        var checked = Array.isArray(this.value) ? this.value : [this.value];
+        this.trueValue = this.options().filter(function (opt) {
+          return checked.indexOf(opt.value) !== -1;
         }).map(function (option) {
           return option.label;
-        }) : [];
+        });
       }
     },
     created: function created() {
@@ -1207,7 +1207,7 @@
           }).filter(function (url) {
             return url !== undefined;
           });
-          if (this.cacheFiles.length !== files.length) {
+          if (this.cacheFiles.length !== files.length || !files.length) {
             this.cacheFiles = _toConsumableArray(files);
             this.$emit('input', this.maxLength === 1 ? files[0] || '' : files);
           }
@@ -2090,7 +2090,7 @@
     }, space);
   }
   function makeFn(fn) {
-    return eval('(' + FUNCTION + '(){return ' + fn + ' })()');
+    return new Function('return ' + fn)();
   }
   function parseFn(fn, mode) {
     if (fn && is.String(fn) && fn.length > 4) {
@@ -2766,11 +2766,16 @@
       clearOrgChildren: function clearOrgChildren() {
         this.orgChildren = {};
       },
-      getTypeSlot: function getTypeSlot(type) {
-        var name = 'type-' + toLine(type);
+      getTypeSlot: function getTypeSlot(ctx) {
         var _fn = function _fn(vm) {
           if (vm) {
-            var slot = vm.$scopedSlots[name] || vm.$scopedSlots['type-' + type];
+            var slot = undefined;
+            if (ctx.rule.field) {
+              slot = vm.$scopedSlots['field-' + toLine(ctx.rule.field)] || vm.$scopedSlots['field-' + ctx.rule.field];
+            }
+            if (!slot) {
+              slot = vm.$scopedSlots['type-' + toLine(ctx.type)] || vm.$scopedSlots['type-' + ctx.type];
+            }
             if (slot) {
               return slot;
             }
@@ -2891,12 +2896,16 @@
         vn.data.key = key;
         return vn;
       },
-      parseSide: function parseSide(side) {
-        return is.Object(side) ? mergeRule({}, side) : side;
+      parseSide: function parseSide(side, ctx) {
+        return is.Object(side) ? mergeRule({
+          props: {
+            formCreateInject: ctx.prop.props.formCreateInject
+          }
+        }, side) : side;
       },
       renderSides: function renderSides(vn, ctx, temp) {
         var prop = ctx[temp ? 'rule' : 'prop'];
-        return [this.renderRule(this.parseSide(prop.prefix)), vn, this.renderRule(this.parseSide(prop.suffix))];
+        return [this.renderRule(this.parseSide(prop.prefix, ctx)), vn, this.renderRule(this.parseSide(prop.suffix, ctx))];
       },
       renderSlot: function renderSlot(ctx, slot) {
         return ctx.rule.slot === slot ? this.renderCtx(ctx) : undefined;
@@ -2949,7 +2958,7 @@
               } else if (ctx.parser.loadChildren !== false) {
                 children = this.renderChildren(ctx);
               }
-              var slot = this.getTypeSlot(ctx.type);
+              var slot = this.getTypeSlot(ctx);
               if (slot) {
                 vn = slot({
                   rule: rule,
@@ -3766,7 +3775,7 @@
             ctx.updated = true;
             if (is.Function(r.update)) {
               _this6.bus.$once('load-end', function () {
-                _this6.refreshUpdate(ctx, r.value);
+                _this6.refreshUpdate(ctx, r.value, 'init');
               });
             }
             _this6.effect(ctx, 'loaded');
@@ -4045,11 +4054,13 @@
       isQuote: function isQuote(ctx, value) {
         return (is.Object(value) || Array.isArray(value)) && value === ctx.rule.value;
       },
-      refreshUpdate: function refreshUpdate(ctx, val) {
+      refreshUpdate: function refreshUpdate(ctx, val, origin) {
         var _this4 = this;
         if (is.Function(ctx.rule.update)) {
           var state = invoke(function () {
-            return ctx.rule.update(val, ctx.origin, _this4.api);
+            return ctx.rule.update(val, ctx.origin, _this4.api, {
+              origin: origin || 'change'
+            });
           });
           if (state === undefined) return;
           ctx.rule.hidden = state === true;
@@ -4059,21 +4070,21 @@
         this.refreshRule(ctx, val);
         this.bus.$emit('change-' + ctx.field, val);
       },
-      refreshRule: function refreshRule(ctx, val) {
+      refreshRule: function refreshRule(ctx, val, origin) {
         if (this.refreshControl(ctx)) {
           this.$render.clearCacheAll();
           this.loadRule();
           this.vm.$emit('update', this.api);
           this.refresh();
         }
-        this.refreshUpdate(ctx, val);
+        this.refreshUpdate(ctx, val, origin);
       },
       appendLink: function appendLink(ctx) {
         var _this5 = this;
         var link = ctx.rule.link;
         is.trueArray(link) && link.forEach(function (field) {
           var fn = function fn() {
-            return _this5.refreshRule(ctx, ctx.rule.value);
+            return _this5.refreshRule(ctx, ctx.rule.value, 'link');
           };
           _this5.bus.$on('change-' + field, fn);
           ctx.linkOn.push(function () {
@@ -4703,6 +4714,35 @@
     render: function render(children) {}
   });
 
+  var componentValidate = {
+    name: 'componentValidate',
+    load: function load(attr, rule, api) {
+      var method = attr.getValue();
+      if (!method) {
+        attr.clearProp();
+        api.clearValidateState([rule.field]);
+      } else {
+        attr.getProp().validate = [{
+          validator: function validator() {
+            var ctx = byCtx(rule);
+            if (ctx) {
+              for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+                args[_key] = arguments[_key];
+              }
+              return api.exec.apply(api, [ctx.id, method === true ? 'formCreateValidate' : method].concat(args, [{
+                attr: attr,
+                rule: rule,
+                api: api
+              }]));
+            }
+          }
+        }];
+      }
+    },
+    watch: function watch() {
+      componentValidate.load.apply(componentValidate, arguments);
+    }
+  };
   var fetch$1 = function fetch(fc) {
     function parseOpt(option) {
       if (is.String(option)) {
@@ -4832,7 +4872,8 @@
   }
   var $provider = {
     fetch: fetch$1,
-    required: $required
+    required: $required,
+    componentValidate: componentValidate
   };
 
   var name = 'html';
@@ -5446,11 +5487,31 @@
     }
   }
   var manager = {
-    validate: function validate(call) {
-      this.form().validate(call);
+    validate: function validate() {
+      var form = this.form();
+      if (form) {
+        return new Promise(function (resolve, reject) {
+          form.validate().then(function (flag) {
+            flag ? resolve(true) : reject(false);
+          });
+        });
+      }
+      return new Promise(function (v) {
+        return v();
+      });
     },
-    validateField: function validateField(field, call) {
-      this.form().validateField(field, call);
+    validateField: function validateField(field) {
+      var form = this.form();
+      if (form) {
+        return new Promise(function (resolve, reject) {
+          form.validateField(field, function (e) {
+            e ? reject(e) : resolve(null);
+          });
+        });
+      }
+      return new Promise(function (v) {
+        return v();
+      });
     },
     clearValidateState: function clearValidateState(ctx) {
       var fItem = this.vm.$refs[ctx.wrapRef];
@@ -5778,87 +5839,47 @@
   function extendApi(api, h) {
     extend(api, {
       validate: function validate(callback) {
-        var flag;
-        var forms = api.children;
-        var len = forms.length;
-        var validate = function validate() {
-          h.$manager.validate(function () {
-            for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-              args[_key] = arguments[_key];
-            }
-            if (!args[0] || !flag) {
-              flag = args;
-            }
-            callback && callback.apply(void 0, _toConsumableArray(flag));
+        return new Promise(function (resolve, reject) {
+          var forms = api.children;
+          var all = [h.$manager.validate()];
+          forms.forEach(function (v) {
+            all.push(v.validate());
           });
-        };
-        var validFn = function validFn(args) {
-          setTimeout(function () {
-            if (!args[0]) {
-              if (!flag) {
-                flag = args;
-              }
-            }
-            if (! --len) {
-              validate();
-            }
-          });
-        };
-        forms.forEach(function (form) {
-          form.validate(function () {
-            for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-              args[_key2] = arguments[_key2];
-            }
-            return validFn(args);
+          Promise.all(all).then(function () {
+            resolve(true);
+            callback && callback(true);
+          })["catch"](function (e) {
+            reject(e);
+            callback && callback(e);
+            h.vm.$emit('validate-fail', e, {
+              api: api
+            });
           });
         });
-        if (!len) {
-          validate();
-        }
       },
       validateField: function validateField(field, callback) {
-        var ctx = h.getFieldCtx(field);
-        if (!ctx) return;
-        var sub = h.subForm[ctx.id];
-        var len = 0;
-        var flag;
-        var validate = function validate() {
-          h.$manager.validateField(ctx.id, function () {
-            for (var _len3 = arguments.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
-              args[_key3] = arguments[_key3];
-            }
-            if (args[0]) {
-              flag = args;
-            } else if (flag) {
-              return callback && callback('子表单验证未通过');
-            }
-            callback && callback.apply(void 0, _toConsumableArray(flag || args));
-          });
-        };
-        var validFn = function validFn(args) {
-          setTimeout(function () {
-            if (!args[0]) {
-              if (!flag) {
-                flag = args;
-              }
-            }
-            if (! --len) {
-              validate();
-            }
+        return new Promise(function (resolve, reject) {
+          var ctx = h.getFieldCtx(field);
+          if (!ctx) return;
+          var sub = h.subForm[ctx.id];
+          var all = [h.$manager.validateField(ctx.id)];
+          toArray(sub).forEach(function (v) {
+            all.push(v.validate()["catch"](function () {
+              return Promise.reject('子表单验证未通过');
+            }));
           });
-        };
-        sub && toArray(sub).forEach(function (form) {
-          len++;
-          form.validate(function () {
-            for (var _len4 = arguments.length, args = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
-              args[_key4] = arguments[_key4];
-            }
-            return validFn(args);
+          Promise.all(all).then(function () {
+            resolve(null);
+            callback && callback(null);
+          })["catch"](function (e) {
+            reject(e);
+            callback && callback(e);
+            h.vm.$emit('validate-field-fail', e, {
+              field: field,
+              api: api
+            });
           });
         });
-        if (!len) {
-          validate();
-        }
       },
       clearValidateState: function clearValidateState(fields) {
         var _this = this;
@@ -5979,7 +6000,7 @@
   function ivuFormCreate() {
     return FormCreateFactory({
       ui: "".concat("iview"),
-      version: "".concat("2.5.28"),
+      version: "".concat("2.5.31"),
       manager: manager,
       install: install,
       extendApi: extendApi,