@form-create/iview 2.5.26 → 2.5.28

package/dist/form-create.js

@@ -1,6 +1,6 @@
 /*!
- * @form-create/iview v2.5.26
- * (c) 2018-2022 xaboy
+ * @form-create/iview v2.5.28
+ * (c) 2018-2023 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
  */
@@ -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;
@@ -2724,7 +2728,7 @@
 
   var id = 0;
   function uniqueId() {
-    return Math.random().toString(36).substr(3, 3) + Number("".concat(Date.now()).concat(++id)).toString(36);
+    return 'F' + Math.random().toString(36).substr(3, 3) + Number("".concat(Date.now()).concat(++id)).toString(36);
   }
 
   function deepSet(data, idx, val) {
@@ -3421,7 +3425,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 +3517,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 +3691,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__);
@@ -3716,9 +3787,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 +3814,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 +3823,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;
             }
@@ -4130,7 +4213,7 @@
               var _flag = is.trueArray(n);
               _this.deferSyncValue(function () {
                 if (n !== o) {
-                  _this.rmSub(o);
+                  _this.rmSub(o, ctx);
                   _this.$render.initOrgChildren();
                 }
                 _flag && _this.loadChildren(n, ctx);
@@ -4138,6 +4221,7 @@
               });
             }
             _this.$render.clearCache(ctx);
+            _this.refresh();
             _this.watching = false;
           }, {
             deep: !flag,
@@ -4146,10 +4230,10 @@
         });
         this.watchEffect(ctx);
       },
-      rmSub: function rmSub(sub) {
+      rmSub: function rmSub(sub, ctx) {
         var _this2 = this;
         is.trueArray(sub) && sub.forEach(function (r) {
-          r && r.__fc__ && _this2.rmCtx(r.__fc__);
+          r && r.__fc__ && r.__fc__.parent === ctx && _this2.rmCtx(r.__fc__);
         });
       },
       rmCtx: function rmCtx(ctx) {
@@ -4261,7 +4345,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];
@@ -4344,7 +4433,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]);
@@ -4727,6 +4816,10 @@
       return {
         message: val
       };
+    } else if (is.Undef(val)) {
+      return {
+        required: false
+      };
     } else if (is.Function(val)) {
       return {
         validator: val
@@ -5886,7 +5979,7 @@
   function ivuFormCreate() {
     return FormCreateFactory({
       ui: "".concat("iview"),
-      version: "".concat("2.5.26"),
+      version: "".concat("2.5.28"),
       manager: manager,
       install: install,
       extendApi: extendApi,