@form-create/iview 2.5.27 → 2.5.29

package/dist/form-create.js

@@ -1,6 +1,6 @@
 /*!
- * @form-create/iview v2.5.27
- * (c) 2018-2022 xaboy
+ * @form-create/iview v2.5.29
+ * (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);
           }
@@ -1615,7 +1615,7 @@
           if (index === 0) {
             return [this.max !== 0 && total >= this.max ? null : this.addIcon(key), this.min === 0 || total > this.min ? this.delIcon(index, key) : null];
           }
-          if (index >= this.min) {
+          if (total > this.min) {
             return this.delIcon(index, key);
           }
         },
@@ -2194,6 +2194,7 @@
       on: {},
       options: [],
       children: [],
+      effect: {},
       hidden: false,
       display: true,
       value: undefined
@@ -2552,7 +2553,7 @@
             $set(ctx.rule, '$' + attr, value);
           }
           if (!hasProperty(ctx.rule, 'effect')) {
-            ctx.rule.effect = {};
+            $set(ctx.rule, 'effect', {});
           }
           $set(ctx.rule.effect, attr, value);
         }
@@ -2669,6 +2670,9 @@
         this.clearCacheAll();
       },
       clearCache: function clearCache(ctx) {
+        if (ctx.rule.cache) {
+          return;
+        }
         if (!this.cache[ctx.id]) {
           ctx.parent && this.clearCache(ctx.parent);
           return;
@@ -2762,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;
             }
@@ -2887,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;
@@ -2945,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,
@@ -3421,7 +3434,7 @@
       var _this = this;
       var rule = _objectSpread2({}, this.rule);
       delete rule.children;
-      this.prop = mergeProps([rule].concat(_toConsumableArray(Object.keys(this.payload).map(function (k) {
+      this.prop = mergeRule({}, [rule].concat(_toConsumableArray(Object.keys(this.payload).map(function (k) {
         return _this.payload[k];
       })), [this.computed]));
     },
@@ -3513,6 +3526,73 @@
     }
   });
 
+  var condition = {
+    '==': function _(b) {
+      return function (a) {
+        return a === b;
+      };
+    },
+    '!=': function _(b) {
+      return function (a) {
+        return a !== b;
+      };
+    },
+    '<>': function _(b) {
+      return function (a) {
+        return a !== b;
+      };
+    },
+    '>': function _(b) {
+      return function (a) {
+        return a > b;
+      };
+    },
+    '>=': function _(b) {
+      return function (a) {
+        return a >= b;
+      };
+    },
+    '<': function _(b) {
+      return function (a) {
+        return a < b;
+      };
+    },
+    '<=': function _(b) {
+      return function (a) {
+        return a <= b;
+      };
+    },
+    'in': function _in(b) {
+      return function (a) {
+        return b && b.indexOf && b.indexOf(a) > -1;
+      };
+    },
+    'on': function on(b) {
+      return function (a) {
+        return a && a.indexOf && a.indexOf(b) > -1;
+      };
+    },
+    'notIn': function notIn(b) {
+      return function (a) {
+        return !condition["in"](b)(a);
+      };
+    },
+    'notOn': function notOn(b) {
+      return function (a) {
+        return !condition.on(b)(a);
+      };
+    },
+    'between': function between(b) {
+      return function (a) {
+        return a > b[0] && a < b[1];
+      };
+    },
+    'notBetween': function notBetween(b) {
+      return function (a) {
+        return a < b[0] || a > b[1];
+      };
+    }
+  };
   function useLoader(Handler) {
     extend(Handler.prototype, {
       nextRefresh: function nextRefresh(fn) {
@@ -3620,7 +3700,7 @@
           }
         };
         rules.map(function (_rule, index) {
-          if (parent && (is.String(_rule) || is.Undef(_rule))) return;
+          if (parent && !is.Object(_rule)) return;
           if (!_this6.pageEnd && !parent && index >= _this6.first) return;
           if (_rule.__fc__ && _rule.__fc__.root === rules && _this6.ctxs[_rule.__fc__.id]) {
             loadChildren(_rule.__fc__.rule.children, _rule.__fc__);
@@ -3695,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');
@@ -3716,9 +3796,7 @@
         if (!controls.length) return false;
         var _loop = function _loop(i) {
           var control = controls[i],
-              handleFn = control.handle || function (val) {
-            return val === control.value;
-          };
+              handleFn = control.handle || (condition[control.condition || '=='] || condition['=='])(control.value);
           if (!is.trueArray(control.rule)) return "continue";
           var data = _objectSpread2(_objectSpread2({}, control), {}, {
             valid: invoke(function () {
@@ -3745,7 +3823,8 @@
                 prepend = _ref.prepend,
                 append = _ref.append,
                 child = _ref.child,
-                ctrl = _ref.ctrl;
+                ctrl = _ref.ctrl,
+                method = _ref.method;
             if (isHidden) {
               valid ? ctx.ctrlRule.push({
                 __ctrl: true,
@@ -3753,7 +3832,20 @@
                 valid: valid
               }) : ctx.ctrlRule.splice(ctx.ctrlRule.indexOf(ctrl), 1);
               hideLst[valid ? 'push' : 'unshift'](function () {
-                _this7.api.hidden(!valid, rule);
+                if (method === 'disabled') {
+                  _this7.api.disabled(!valid, rule);
+                } else if (method === 'display') {
+                  _this7.api.display(valid, rule);
+                } else if (method === 'required') {
+                  rule.forEach(function (item) {
+                    _this7.api.setEffect(item, 'required', valid);
+                  });
+                  if (!valid) {
+                    _this7.api.clearValidateState(rule);
+                  }
+                } else {
+                  _this7.api.hidden(!valid, rule);
+                }
               });
               return;
             }
@@ -3962,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;
@@ -3976,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 () {
@@ -4262,7 +4356,12 @@
       watchEffect: function watchEffect(ctx) {
         var _this3 = this;
         var vm = this.vm;
-        var effect = {};
+        var effect = {
+          required: function required() {
+            var _ctx$rule, _ctx$rule$effect;
+            return (hasProperty(ctx.rule, '$required') ? ctx.rule['$required'] : (_ctx$rule = ctx.rule) === null || _ctx$rule === void 0 ? void 0 : (_ctx$rule$effect = _ctx$rule.effect) === null || _ctx$rule$effect === void 0 ? void 0 : _ctx$rule$effect.required) || false;
+          }
+        };
         Object.keys(ctx.rule.effect || {}).forEach(function (k) {
           effect[k] = function () {
             return ctx.rule.effect[k];
@@ -4345,7 +4444,7 @@
               return ctx.clearEffectData(attr);
             };
             data.mergeProp = function (prop) {
-              return mergeProps([prop], data.getProp());
+              return mergeRule(data.getProp(), [prop]);
             };
           }
           _this4.bus.$emit("p:".concat(attr, ":").concat(_type, ":").concat(p.input ? 1 : 0), event, [data, rule, _this4.api]);
@@ -4615,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)) {
@@ -4728,6 +4856,10 @@
       return {
         message: val
       };
+    } else if (is.Undef(val)) {
+      return {
+        required: false
+      };
     } else if (is.Function(val)) {
       return {
         validator: val
@@ -4740,7 +4872,8 @@
   }
   var $provider = {
     fetch: fetch$1,
-    required: $required
+    required: $required,
+    componentValidate: componentValidate
   };
 
   var name = 'html';
@@ -5354,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];
@@ -5686,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;
@@ -5887,7 +6000,7 @@
   function ivuFormCreate() {
     return FormCreateFactory({
       ui: "".concat("iview"),
-      version: "".concat("2.5.27"),
+      version: "".concat("2.5.29"),
       manager: manager,
       install: install,
       extendApi: extendApi,