@form-create/element-ui 3.1.32 → 3.1.34

package/dist/form-create.esm.js

@@ -1,5 +1,5 @@
 /*!
- * @form-create/element-ui v3.1.32
+ * @form-create/element-ui v3.1.34
  * (c) 2018-2024 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
@@ -1612,14 +1612,6 @@ var Group = defineComponent({
       },
       deep: true
     },
-    disabled: function disabled(n) {
-      if (this.syncDisabled) {
-        var lst = this.cacheRule;
-        Object.keys(lst).forEach(function (k) {
-          lst[k].$f.disabled(n);
-        });
-      }
-    },
     expand: function expand(n) {
       var d = n - this.modelValue.length;
 
@@ -1741,10 +1733,6 @@ var Group = defineComponent({
 
       this.cacheRule[key].$f = $f;
       nextTick(function () {
-        if (_this5.syncDisabled) {
-          $f.disabled(_this5.disabled);
-        }
-
         _this5.$emit('itemMounted', $f, Object.keys(_this5.cacheRule).indexOf(key));
       });
     },
@@ -1915,6 +1903,7 @@ var Group = defineComponent({
       }, [createVNode(Type, mergeProps$1({
         "key": key
       }, {
+        disabled: disabled,
         'onUpdate:modelValue': function onUpdateModelValue(formData) {
           return _this12.formData(key, formData);
         },
@@ -1985,9 +1974,6 @@ var Sub = defineComponent({
   },
   emits: ['fc:subform', 'update:modelValue', 'change', 'itemMounted'],
   watch: {
-    disabled: function disabled(n) {
-      this.syncDisabled && this.subApi.disabled(n);
-    },
     modelValue: function modelValue(n) {
       this.setValue(n);
     }
@@ -2013,8 +1999,6 @@ var Sub = defineComponent({
 
       this.subApi = api;
       nextTick(function () {
-        _this.syncDisabled && api.disabled(_this.disabled);
-
         _this.$emit('itemMounted', api);
       });
     }
@@ -2022,6 +2006,7 @@ var Sub = defineComponent({
   render: function render() {
     var Type = this.form;
     return createVNode(Type, {
+      "disabled": this.disabled,
       "onUpdate:modelValue": this.formData,
       "modelValue": this.modelValue,
       "onEmit-event": this.$emit,
@@ -2234,6 +2219,10 @@ function $FormCreate(FormCreate, components, directives) {
         type: Boolean,
         "default": undefined
       },
+      preview: {
+        type: Boolean,
+        "default": undefined
+      },
       api: Object,
       name: String,
       subForm: {
@@ -2370,7 +2359,7 @@ function $FormCreate(FormCreate, components, directives) {
         deep: true
       });
       watch(function () {
-        return props.disabled;
+        return [props.disabled, props.preview];
       }, function () {
         fapi.refresh();
       });
@@ -2649,6 +2638,64 @@ function setPrototypeOf(o, proto) {
   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: {},
@@ -2901,7 +2948,7 @@ function Api(h) {
         if (!ctx) return initial;
         initial[ctx.field] = copy(ctx.rule.value);
         return initial;
-      }, {});
+      }, h.options.appendValue !== false ? copy(h.appendData) : {});
     },
     getValue: function getValue(field) {
       var ctx = h.getFieldCtx(field);
@@ -3317,10 +3364,7 @@ function Api(h) {
 
         if (config.type === 'fetch') {
           api.fetch(config).then(function (res) {
-            resolve({
-              res: res,
-              config: config
-            });
+            resolve(res);
           })["catch"](inject);
         } else {
           resolve(config.data);
@@ -3349,12 +3393,17 @@ function Api(h) {
     },
     bus: h.bus,
     fetch: function fetch(opt) {
-      h.options.beforeFetch && invoke(function () {
-        return h.options.beforeFetch(opt, {
-          api: api
+      return new Promise(function (resolve, reject) {
+        h.beforeFetch(opt).then(function () {
+          return asyncFetch(opt).then(resolve)["catch"](reject);
         });
       });
-      return asyncFetch(opt);
+    },
+    getData: function getData(id, def) {
+      return h.fc.getData(id, def);
+    },
+    setData: function setData(id, data) {
+      return h.fc.setData(id, data);
     },
     helper: {
       tidyFields: tidyFields,
@@ -3564,7 +3613,7 @@ function useRender$1(Render) {
           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;
@@ -3756,8 +3805,8 @@ function useRender$1(Render) {
       }];
 
       if (ctx.input) {
-        if (this.vm.props.disabled !== undefined) {
-          ctx.prop.props.disabled = !!this.vm.props.disabled;
+        if (this.vm.props.disabled === true) {
+          ctx.prop.props.disabled = true;
         }
 
         var field = this.getModelField(ctx);
@@ -4292,14 +4341,31 @@ extend(RuleContext.prototype, {
     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) {
@@ -4408,73 +4474,6 @@ 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) {
@@ -4664,7 +4663,7 @@ function useLoader(Handler) {
         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 {
@@ -4747,7 +4746,10 @@ function useLoader(Handler) {
 
       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), {}, {
@@ -5015,7 +5017,7 @@ function useInput(Handler) {
         return this.deferSyncFn.sync = true;
       }
 
-      this.vm.setupState.updateValue(_objectSpread2({}, this.form));
+      this.vm.setupState.updateValue(_objectSpread2(_objectSpread2({}, this.options.appendValue !== false ? this.appendData : {}), this.form));
     },
     isChange: function isChange(ctx, value) {
       return JSON.stringify(this.getFormData(ctx), strFn) !== JSON.stringify(value, strFn);
@@ -5269,15 +5271,56 @@ function useContext(Handler) {
             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);
               };
             }
 
@@ -5630,7 +5673,11 @@ function Handler(fc) {
   this.initData(fc.rules);
   this.$manager = new fc.manager(this);
   this.$render = new Render(this);
-  this.api = fc.extendApi(Api(this), this);
+  this.api = fc.extendApiFn.reduce(function (api, fn) {
+    return _objectSpread2(_objectSpread2({}, api), invoke(function () {
+      return fn(_objectSpread2({}, api), _this);
+    }, {}));
+  }, Api(this));
 }
 extend(Handler.prototype, {
   initData: function initData(rules) {
@@ -5654,6 +5701,23 @@ extend(Handler.prototype, {
   },
   isBreakWatch: function isBreakWatch() {
     return this.loading || this.noWatchFn || this.reloading;
+  },
+  beforeFetch: function beforeFetch(opt) {
+    var _this2 = this;
+
+    return new Promise(function (resolve) {
+      var source = _this2.options.beforeFetch && invoke(function () {
+        return _this2.options.beforeFetch(opt, {
+          api: _this2.api
+        });
+      });
+
+      if (source && is.Function(source.then)) {
+        source.then(resolve);
+      } else {
+        resolve();
+      }
+    });
   }
 });
 useInject(Handler);
@@ -5868,7 +5932,7 @@ var loadData = function loadData(fc) {
             if (attr.attr) {
               value = fc.loadData[attr.attr] || attr["default"];
 
-              if (attr.copy) {
+              if (attr.copy !== false) {
                 value = deepCopy(value);
               }
             }
@@ -5968,6 +6032,8 @@ var fetch = function fetch(fc) {
       return;
     }
 
+    option = deepCopy(option);
+
     if (!option.to) {
       option.to = 'options';
     }
@@ -6005,7 +6071,7 @@ var fetch = function fetch(fc) {
         if (check()) return;
 
         var fn = function fn(v) {
-          return flag ? v : v.data;
+          return flag ? v : hasProperty(v, 'data') ? v.data : v;
         };
 
         var parse = parseFn(option.parse);
@@ -6036,27 +6102,25 @@ var fetch = function fetch(fc) {
       }
     });
 
-    fc.$handle.options.beforeFetch && invoke(function () {
-      return fc.$handle.options.beforeFetch(config, {
-        rule: rule,
-        api: api
-      });
-    });
-
-    if (is.Function(option.action)) {
-      option.action(rule, api).then(function (val) {
-        config.onSuccess(val, true);
-      })["catch"](function (e) {
-        config.onError(e);
-      });
-      return;
-    }
+    fc.$handle.beforeFetch(config, {
+      rule: rule,
+      api: api
+    }).then(function () {
+      if (is.Function(option.action)) {
+        option.action(rule, api).then(function (val) {
+          config.onSuccess(val, true);
+        })["catch"](function (e) {
+          config.onError(e);
+        });
+        return;
+      }
 
-    invoke(function () {
-      return fc.create.fetch(config, {
-        inject: inject,
-        rule: rule,
-        api: api
+      invoke(function () {
+        return fc.create.fetch(config, {
+          inject: inject,
+          rule: rule,
+          api: api
+        });
       });
     });
   }
@@ -6137,6 +6201,7 @@ function FormCreateFactory(config) {
   var directives = {};
   var modelFields = {};
   var useApps = [];
+  var extendApiFn = [config.extendApi];
 
   var providers = _objectSpread2({}, $provider);
 
@@ -6144,7 +6209,7 @@ function FormCreateFactory(config) {
   var globalConfig = {
     global: {}
   };
-  var loadData = {};
+  var loadData = reactive({});
   var CreateNode = CreateNodeFactory();
   var formulas = {};
   exportAttrs(config.attrs || {});
@@ -6306,6 +6371,14 @@ function FormCreateFactory(config) {
     _emitData(id);
   }
 
+  function getData(id, def) {
+    return hasProperty(loadData, id) ? loadData[id] : def;
+  }
+
+  function extendApi(fn) {
+    extendApiFn.push(fn);
+  }
+
   function removeData(id) {
     delete loadData[id];
 
@@ -6331,14 +6404,14 @@ function FormCreateFactory(config) {
         components: components,
         directives: directives
       },
+      setData: setData,
+      getData: getData,
       loadData: loadData,
       CreateNode: CreateNode,
       bus: new Mitt(),
       unwatch: null,
       options: ref({}),
-      extendApi: config.extendApi || function (api) {
-        return api;
-      }
+      extendApiFn: extendApiFn
     });
     nextTick(function () {
       watch(_this.options, function () {
@@ -6456,6 +6529,8 @@ function FormCreateFactory(config) {
     extend(formCreate, {
       version: config.version,
       ui: config.ui,
+      extendApi: extendApi,
+      getData: getData,
       setData: setData,
       removeData: removeData,
       maker: maker,
@@ -7173,7 +7248,7 @@ function tidyBtnProp(btn, def) {
 }
 
 function extendApi(api, h) {
-  extend(api, {
+  return {
     formEl: function formEl() {
       return h.$manager.form();
     },
@@ -7332,8 +7407,7 @@ function extendApi(api, h) {
         });
       });
     }
-  });
-  return api;
+  };
 }
 
 var required = {
@@ -7414,7 +7488,7 @@ function install(FormCreate) {
 function elmFormCreate() {
   return FormCreateFactory({
     ui: 'element-ui',
-    version: '3.1.32',
+    version: '3.1.34',
     manager: manager,
     extendApi: extendApi,
     install: install,