@form-create/element-ui 3.1.32 → 3.1.33

package/dist/form-create.js

@@ -1,5 +1,5 @@
 /*!
- * @form-create/element-ui v3.1.32
+ * @form-create/element-ui v3.1.33
  * (c) 2018-2024 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
@@ -2238,6 +2238,10 @@
           type: Boolean,
           "default": undefined
         },
+        preview: {
+          type: Boolean,
+          "default": undefined
+        },
         api: Object,
         name: String,
         subForm: {
@@ -2374,7 +2378,7 @@
           deep: true
         });
         vue.watch(function () {
-          return props.disabled;
+          return [props.disabled, props.preview];
         }, function () {
           fapi.refresh();
         });
@@ -2653,6 +2657,64 @@
     return o;
   }
 
+  var changeType = function changeType(a, b) {
+    if (typeof a === 'string') {
+      return String(b);
+    } else if (typeof a === 'number') {
+      return Number(b);
+    }
+
+    return b;
+  };
+
+  var condition = {
+    '==': function _(a, b) {
+      return JSON.stringify(a) === JSON.stringify(changeType(a, b));
+    },
+    '!=': function _(a, b) {
+      return !condition['=='](a, b);
+    },
+    '>': function _(a, b) {
+      return a > b;
+    },
+    '>=': function _(a, b) {
+      return a >= b;
+    },
+    '<': function _(a, b) {
+      return a < b;
+    },
+    '<=': function _(a, b) {
+      return a <= b;
+    },
+    on: function on(a, b) {
+      return a && a.indexOf && a.indexOf(changeType(a[0], b)) > -1;
+    },
+    notOn: function notOn(a, b) {
+      return !condition.on(a, b);
+    },
+    "in": function _in(a, b) {
+      return b && b.indexOf && b.indexOf(a) > -1;
+    },
+    notIn: function notIn(a, b) {
+      return !condition["in"](a, b);
+    },
+    between: function between(a, b) {
+      return a > b[0] && a < b[1];
+    },
+    notBetween: function notBetween(a, b) {
+      return a < b[0] || a > b[1];
+    },
+    empty: function empty(a) {
+      return is.empty(a);
+    },
+    notEmpty: function notEmpty(a) {
+      return !is.empty(a);
+    },
+    pattern: function pattern(a, b) {
+      return new RegExp(b, 'g').test(a);
+    }
+  };
+
   function baseRule() {
     return {
       props: {},
@@ -2905,7 +2967,7 @@
           if (!ctx) return initial;
           initial[ctx.field] = copy(ctx.rule.value);
           return initial;
-        }, {});
+        }, h.options.appendValue ? copy(h.appendData) : {});
       },
       getValue: function getValue(field) {
         var ctx = h.getFieldCtx(field);
@@ -3321,10 +3383,7 @@
 
           if (config.type === 'fetch') {
             api.fetch(config).then(function (res) {
-              resolve({
-                res: res,
-                config: config
-              });
+              resolve(res);
             })["catch"](inject);
           } else {
             resolve(config.data);
@@ -3568,7 +3627,7 @@
             this.setOptions(ctx);
             this.ctxProp(ctx);
             var prop = ctx.prop;
-            prop.preview = !!(hasProperty(prop, 'preview') ? prop.preview : this.options.preview || false);
+            prop.preview = !!(prop.preview != null ? prop.preview : this.vm.props.preview !== undefined ? this.vm.props.preview : this.options.preview || false);
             prop.props.formCreateInject = this.injectProp(ctx);
             var cacheFlag = prop.cache !== false;
             var preview = prop.preview;
@@ -4296,14 +4355,31 @@
       var _this4 = this;
 
       return toArray(this.prop.validate).map(function (item) {
-        return _objectSpread2(_objectSpread2({}, item), {}, {
-          inject: {
-            id: _this4.id,
-            field: _this4.field,
-            rule: _this4.rule,
-            api: _this4.$handle.api
-          }
-        });
+        if (is.Function(item.validator)) {
+          var temp = _objectSpread2({}, item);
+
+          var that = _this4;
+
+          temp.validator = function () {
+            var _item$validator;
+
+            for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+              args[_key] = arguments[_key];
+            }
+
+            return (_item$validator = item.validator).call.apply(_item$validator, [{
+              that: this,
+              id: that.id,
+              field: that.field,
+              rule: that.rule,
+              api: that.$handle.api
+            }].concat(args));
+          };
+
+          return temp;
+        }
+
+        return item;
       });
     },
     check: function check(handle) {
@@ -4412,73 +4488,6 @@
     }
   });
 
-  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) {
@@ -4668,7 +4677,7 @@
           if (!ctx) {
             var _rule2 = _this6.parseRule(_rule);
 
-            ctx = new RuleContext(_this6, _rule2, isInit ? defaultValue : _rule2.value);
+            ctx = new RuleContext(_this6, _rule2, defaultValue);
 
             _this6.bindParser(ctx);
           } else {
@@ -4751,7 +4760,10 @@
 
         var _loop = function _loop(i) {
           var control = controls[i],
-              handleFn = control.handle || (condition[control.condition || '=='] || condition['=='])(control.value);
+              handleFn = control.handle || function (val) {
+            return (condition[control.condition || '=='] || condition['=='])(val, control.value);
+          };
+
           if (!is.trueArray(control.rule)) return "continue";
 
           var data = _objectSpread2(_objectSpread2({}, control), {}, {
@@ -5019,7 +5031,7 @@
           return this.deferSyncFn.sync = true;
         }
 
-        this.vm.setupState.updateValue(_objectSpread2({}, this.form));
+        this.vm.setupState.updateValue(_objectSpread2(_objectSpread2({}, this.options.appendValue ? this.appendData : {}), this.form));
       },
       isChange: function isChange(ctx, value) {
         return JSON.stringify(this.getFormData(ctx), strFn) !== JSON.stringify(value, strFn);
@@ -5273,15 +5285,56 @@
               if (!item) return undefined;
               var fn;
 
-              if (is.Function(item)) {
+              if (_typeof(item) === 'object') {
+                var group = ctx.getParentGroup();
+
+                var checkCondition = function checkCondition(item) {
+                  item = Array.isArray(item) ? {
+                    mode: 'AND',
+                    group: item
+                  } : item;
+
+                  if (!is.trueArray(item.group)) {
+                    return true;
+                  }
+
+                  var or = item.mode === 'OR';
+                  var valid = true;
+
+                  for (var i = 0; i < item.group.length; i++) {
+                    var one = item.group[i];
+                    var flag = void 0;
+
+                    if (one.mode) {
+                      flag = checkCondition(one);
+                    } else if (!condition[one.condition]) {
+                      flag = false;
+                    } else {
+                      flag = new Function('_$', '_$val', 'top', 'group', "with(top){with(this){with(group){ return _$['".concat(one.condition, "'](").concat(one.field, ", ").concat(one.compare ? one.compare : '_$val', "); }}}")).call(_this.api.form, condition, one.value, _this.api.top.form, group ? _this.subRuleData[group.id] || {} : {});
+                    }
+
+                    if (or && flag) {
+                      return true;
+                    }
+
+                    if (!or) {
+                      valid = valid && flag;
+                    }
+                  }
+
+                  return or ? false : valid;
+                };
+
+                return checkCondition(item);
+              } else if (is.Function(item)) {
                 fn = function fn() {
                   return item(_this.api.form, _this.api);
                 };
               } else {
-                var group = ctx.getParentGroup();
+                var _group = ctx.getParentGroup();
 
                 fn = function fn() {
-                  return new Function('formulas', 'top', 'group', '$rule', '$api', "with(top){with(this){with(group){with(formulas){ return ".concat(item, " }}}}")).call(_this.api.form, _this.fc.formulas, _this.api.top.form, group ? _this.subRuleData[group.id] || {} : {}, ctx.rule, _this.api);
+                  return new Function('formulas', 'top', 'group', '$rule', '$api', "with(top){with(this){with(group){with(formulas){ return ".concat(item, " }}}}")).call(_this.api.form, _this.fc.formulas, _this.api.top.form, _group ? _this.subRuleData[_group.id] || {} : {}, ctx.rule, _this.api);
                 };
               }
 
@@ -5972,6 +6025,8 @@
         return;
       }
 
+      option = deepCopy(option);
+
       if (!option.to) {
         option.to = 'options';
       }
@@ -7418,7 +7473,7 @@
   function elmFormCreate() {
     return FormCreateFactory({
       ui: 'element-ui',
-      version: '3.1.32',
+      version: '3.1.33',
       manager: manager,
       extendApi: extendApi,
       install: install,