@form-create/element-ui 3.1.18 → 3.1.20

package/dist/form-create.esm.js

@@ -1,5 +1,5 @@
 /*!
- * @form-create/element-ui v3.1.18
+ * @form-create/element-ui v3.1.20
  * (c) 2018-2023 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
@@ -1737,7 +1737,7 @@ var Group = defineComponent({
         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);
       }
     },
@@ -1779,6 +1779,7 @@ var Group = defineComponent({
         return [createVNode(script$2, null, null)];
       }
     }) : createVNode("div", {
+      "style": "width: 100%;",
       "key": 2
     }, [keys.map(function (key, index) {
       var _slot;
@@ -1788,7 +1789,6 @@ var Group = defineComponent({
           options = _this9$cacheRule$key.options;
       return createVNode(resolveComponent("ElRow"), {
         "align": "middle",
-        "type": "flex",
         "key": key,
         "style": "border-bottom:1px dashed #DCDFE6;margin-bottom:10px;"
       }, {
@@ -2952,6 +2952,10 @@ function useCache(Render) {
       this.clearCacheAll();
     },
     clearCache: function clearCache(ctx) {
+      if (ctx.rule.cache) {
+        return;
+      }
+
       if (!this.cache[ctx.id]) {
         ctx.parent && this.clearCache(ctx.parent);
         return;
@@ -3219,7 +3223,15 @@ function useRender$1(Render) {
         return function () {
           var cache = _this4.getCache(ctx);
 
-          return cache && cache.apply(void 0, arguments);
+          if (cache) {
+            return cache.apply(void 0, arguments);
+          }
+
+          var _vn = _this4.renderCtx(ctx, ctx.parent);
+
+          if (_vn) {
+            return _vn();
+          }
         };
       } catch (e) {
         console.error(e);
@@ -3816,7 +3828,7 @@ extend(RuleContext.prototype, {
     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 _this3.payload[k];
     })), [this.computed]));
   },
@@ -3922,6 +3934,73 @@ extend(RuleContext.prototype, {
   }
 });
 
+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) {
@@ -4055,7 +4134,7 @@ function useLoader(Handler) {
       };
 
       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]) {
@@ -4182,10 +4261,7 @@ function useLoader(Handler) {
 
       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), {}, {
@@ -4217,7 +4293,8 @@ function useLoader(Handler) {
               prepend = _ref.prepend,
               append = _ref.append,
               child = _ref.child,
-              ctrl = _ref.ctrl;
+              ctrl = _ref.ctrl,
+              method = _ref.method;
 
           if (isHidden) {
             valid ? ctx.ctrlRule.push({
@@ -4226,7 +4303,21 @@ function useLoader(Handler) {
               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;
           }
@@ -4840,7 +4931,13 @@ function useEffect(Handler) {
     watchEffect: function watchEffect(ctx) {
       var _this3 = this;
 
-      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];
@@ -4932,7 +5029,7 @@ function useEffect(Handler) {
           };
 
           data.mergeProp = function (prop) {
-            return mergeProps([prop], data.getProp());
+            return mergeRule(data.getProp(), [prop]);
           };
         }
 
@@ -5471,18 +5568,19 @@ function FormCreateFactory(config) {
     var name;
 
     if (is.String(id)) {
-      name = toCase(id);
+      name = id;
 
       if (component === undefined) {
         return components[name];
       }
     } else {
-      name = toCase(id.displayName || id.name);
+      name = id.displayName || id.name;
       component = id;
     }
 
     if (!name || !component) return;
     components[name] = component;
+    components[toCase(name)] = component;
     if (component.formCreateParser) parser(name, component.formCreateParser);
   }
 
@@ -6587,6 +6685,10 @@ function parseVal(val) {
     return {
       message: val
     };
+  } else if (is.Undef(val)) {
+    return {
+      required: false
+    };
   } else if (is.Function(val)) {
     return {
       validator: val
@@ -6621,7 +6723,7 @@ function install(FormCreate) {
 function elmFormCreate() {
   return FormCreateFactory({
     ui: 'element-ui',
-    version: '3.1.18',
+    version: '3.1.20',
     manager: manager,
     extendApi: extendApi,
     install: install,