@form-create/element-ui 3.1.17 → 3.1.19

package/dist/form-create.js

@@ -1,6 +1,6 @@
 /*!
- * @form-create/element-ui v3.1.17
- * (c) 2018-2022 xaboy
+ * @form-create/element-ui v3.1.19
+ * (c) 2018-2023 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
  */
@@ -1161,6 +1161,14 @@
   var Upload = vue.defineComponent({
     name: NAME$4,
     inheritAttrs: false,
+    formCreateParser: {
+      toFormValue: function toFormValue(value) {
+        return toArray(value);
+      },
+      toValue: function toValue(formValue, ctx) {
+        return ctx.prop.props.limit === 1 ? formValue[0] || '' : formValue;
+      }
+    },
     props: {
       previewMask: undefined,
       onPreview: Function,
@@ -1181,11 +1189,6 @@
     watch: {
       modelValue: function modelValue(n) {
         this.fileList = toArray(n).map(parseFile);
-      },
-      limit: function limit(n, o) {
-        if (o === 1 || n === 1) {
-          this.update();
-        }
       }
     },
     methods: {
@@ -1203,7 +1206,7 @@
         }).filter(function (url) {
           return url !== undefined;
         });
-        this.$emit('update:modelValue', this.limit === 1 ? files[0] || '' : files);
+        this.$emit('update:modelValue', files);
       },
       handleCancel: function handleCancel() {
         this.previewVisible = false;
@@ -1738,7 +1741,7 @@
           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);
         }
       },
@@ -1780,6 +1783,7 @@
           return [vue.createVNode(script$2, null, null)];
         }
       }) : vue.createVNode("div", {
+        "style": "width: 100%;",
         "key": 2
       }, [keys.map(function (key, index) {
         var _slot;
@@ -1789,7 +1793,6 @@
             options = _this9$cacheRule$key.options;
         return vue.createVNode(vue.resolveComponent("ElRow"), {
           "align": "middle",
-          "type": "flex",
           "key": key,
           "style": "border-bottom:1px dashed #DCDFE6;margin-bottom:10px;"
         }, {
@@ -1953,8 +1956,8 @@
       return;
     }
 
-    if (vm.ctx.formCreateInject) {
-      return vm.ctx.formCreateInject;
+    if (vm.props.formCreateInject) {
+      return vm.props.formCreateInject;
     }
 
     if (vm.parent) {
@@ -2953,6 +2956,10 @@
         this.clearCacheAll();
       },
       clearCache: function clearCache(ctx) {
+        if (ctx.rule.cache) {
+          return;
+        }
+
         if (!this.cache[ctx.id]) {
           ctx.parent && this.clearCache(ctx.parent);
           return;
@@ -3817,7 +3824,7 @@
       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]));
     },
@@ -3923,6 +3930,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) {
@@ -4056,7 +4130,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]) {
@@ -4183,10 +4257,7 @@
 
         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), {}, {
@@ -4218,7 +4289,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({
@@ -4227,7 +4299,21 @@
                 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;
             }
@@ -4841,7 +4927,13 @@
       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];
@@ -4933,7 +5025,7 @@
             };
 
             data.mergeProp = function (prop) {
-              return mergeProps([prop], data.getProp());
+              return mergeRule(data.getProp(), [prop]);
             };
           }
 
@@ -5472,18 +5564,19 @@
       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);
     }
 
@@ -6588,6 +6681,10 @@
       return {
         message: val
       };
+    } else if (is.Undef(val)) {
+      return {
+        required: false
+      };
     } else if (is.Function(val)) {
       return {
         validator: val
@@ -6622,7 +6719,7 @@
   function elmFormCreate() {
     return FormCreateFactory({
       ui: 'element-ui',
-      version: '3.1.17',
+      version: '3.1.19',
       manager: manager,
       extendApi: extendApi,
       install: install,