@form-create/element-ui 3.2.10 → 3.2.12

package/dist/form-create.js

@@ -1,5 +1,5 @@
 /*!
- * @form-create/element-ui v3.2.10
+ * @form-create/element-ui v3.2.12
  * (c) 2018-2024 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
@@ -2145,7 +2145,7 @@
         },
         inFor: Boolean
       },
-      emits: ['update:api', 'update:modelValue', 'mounted', 'submit', 'change', 'emit-event', 'control', 'remove-rule', 'remove-field', 'sync', 'reload', 'repeat-field', 'update', 'validate-field-fail', 'validate-fail', 'created'],
+      emits: ['update:api', 'update:modelValue', 'mounted', 'submit', 'reset', 'change', 'emit-event', 'control', 'remove-rule', 'remove-field', 'sync', 'reload', 'repeat-field', 'update', 'validate-field-fail', 'validate-fail', 'created'],
       render: function render() {
         return this.fc.render();
       },
@@ -2448,7 +2448,7 @@
     };
   };
 
-  var keyAttrs = ['type', 'slot', 'emitPrefix', 'value', 'name', 'native', 'hidden', 'display', 'inject', 'options', 'emit', 'link', 'prefix', 'suffix', 'update', 'sync', 'optionsTo', 'key', 'slotUpdate', 'computed', 'preview', 'component', 'cache', 'modelEmit'];
+  var keyAttrs = ['type', 'slot', 'ignore', 'emitPrefix', 'value', 'name', 'native', 'hidden', 'display', 'inject', 'options', 'emit', 'link', 'prefix', 'suffix', 'update', 'sync', 'optionsTo', 'key', 'slotUpdate', 'computed', 'preview', 'component', 'cache', 'modelEmit'];
   var arrayAttrs = ['validate', 'children', 'control'];
   var normalAttrs = ['effect', 'deep'];
   function attrs() {
@@ -3076,16 +3076,32 @@
       },
 
       formData: function formData(fields) {
-        return tidyFields(fields).reduce(function (initial, id) {
-          var ctx = h.getFieldCtx(id);
-          if (!ctx) return initial;
-          initial[ctx.field] = copy(ctx.rule.value);
-          return initial;
-        }, h.options.appendValue !== false ? copy(h.appendData) : {});
+        if (fields == null) {
+          var data = {};
+          Object.keys(h.form).forEach(function (k) {
+            if (h.ignoreFields.indexOf(k) === -1) {
+              data[k] = copy(h.form[k]);
+            }
+          });
+          return data;
+        } else {
+          return tidyFields(fields).reduce(function (initial, id) {
+            initial[id] = api.getValue(id);
+            return initial;
+          }, {});
+        }
       },
       getValue: function getValue(field) {
         var ctx = h.getFieldCtx(field);
-        if (!ctx) return;
+
+        if (!ctx) {
+          if (h.options.appendValue !== false && hasProperty(h.appendData, field)) {
+            return copy(h.appendData[field]);
+          }
+
+          return undefined;
+        }
+
         return copy(ctx.rule.value);
       },
       coverValue: function coverValue(formData) {
@@ -3393,6 +3409,13 @@
         vue.nextTick(function () {
           api.clearValidateState();
         });
+
+        if (fields == null) {
+          is.Function(h.options.onReset) && invoke(function () {
+            return h.options.onReset(api);
+          });
+          h.vm.emit('reset', api);
+        }
       },
       method: function method(id, name) {
         var el = api.el(id);
@@ -3969,6 +3992,9 @@
             getSubForm: function getSubForm() {
               return _this6.$handle.subForm[ctx.id];
             },
+            slots: function slots() {
+              return _this6.vm.setupState.top.slots;
+            },
             options: [],
             children: [],
             preview: false,
@@ -5063,9 +5089,9 @@
                 __ctrl: true,
                 children: rule,
                 valid: valid
-              }) : ctx.ctrlRule.splice(ctx.ctrlRule.indexOf(ctrl), 1);
+              }) : ctrl && ctx.ctrlRule.splice(ctx.ctrlRule.indexOf(ctrl) >>> 0, 1);
               hideLst[valid ? 'push' : 'unshift'](function () {
-                if (method === 'disabled') {
+                if (method === 'disabled' || method === 'enabled') {
                   _this7.api.disabled(!valid, rule);
                 } else if (method === 'display') {
                   _this7.api.display(valid, rule);
@@ -5285,6 +5311,7 @@
 
         var data = vue.reactive({});
         var fields = this.fields();
+        var ignoreFields = [];
 
         if (this.options.appendValue !== false) {
           Object.keys(this.appendData).reduce(function (initial, field) {
@@ -5297,14 +5324,24 @@
         }
 
         fields.reduce(function (initial, field) {
-          var ctx = _this2.getCtx(field);
+          var ctx = (_this2.fieldCtx[field] || []).filter(function (ctx) {
+            return !_this2.isIgnore(ctx.rule);
+          })[0] || _this2.fieldCtx[field][0];
+
+          if (_this2.isIgnore(ctx.rule)) {
+            ignoreFields.push(field);
+          }
 
           initial[field] = vue.toRef(ctx.rule, 'value');
           return initial;
         }, data);
         this.form = data;
+        this.ignoreFields = ignoreFields;
         this.syncValue();
       },
+      isIgnore: function isIgnore(rule) {
+        return rule.ignore || this.options.ignoreHiddenFields && rule.hidden;
+      },
       appendValue: function appendValue(rule) {
         if ((!rule.field || !hasProperty(this.appendData, rule.field)) && !this.options.forceCoverValue) {
           return;
@@ -5336,11 +5373,19 @@
         }
       },
       syncValue: function syncValue() {
+        var _this3 = this;
+
         if (this.deferSyncFn) {
           return this.deferSyncFn.sync = true;
         }
 
-        this.vm.setupState.updateValue(_objectSpread2({}, this.form));
+        var data = {};
+        Object.keys(this.form).forEach(function (k) {
+          if (_this3.ignoreFields.indexOf(k) === -1) {
+            data[k] = _this3.form[k];
+          }
+        });
+        this.vm.setupState.updateValue(data);
       },
       isChange: function isChange(ctx, value) {
         return JSON.stringify(this.getFormData(ctx), strFn) !== JSON.stringify(value, strFn);
@@ -5349,11 +5394,11 @@
         return (is.Object(value) || Array.isArray(value)) && value === ctx.rule.value;
       },
       refreshUpdate: function refreshUpdate(ctx, val, origin, field) {
-        var _this3 = this;
+        var _this4 = this;
 
         if (is.Function(ctx.rule.update)) {
           var state = invoke(function () {
-            return ctx.rule.update(val, ctx.origin, _this3.api, {
+            return ctx.rule.update(val, ctx.origin, _this4.api, {
               origin: origin || 'change',
               linkField: field
             });
@@ -5377,18 +5422,18 @@
         this.refreshUpdate(ctx, val, origin, field);
       },
       appendLink: function appendLink(ctx) {
-        var _this4 = this;
+        var _this5 = this;
 
         var link = ctx.rule.link;
         is.trueArray(link) && link.forEach(function (field) {
           var fn = function fn() {
-            return _this4.refreshRule(ctx, ctx.rule.value, 'link', field);
+            return _this5.refreshRule(ctx, ctx.rule.value, 'link', field);
           };
 
-          _this4.bus.$on('change-' + field, fn);
+          _this5.bus.$on('change-' + field, fn);
 
           ctx.linkOn.push(function () {
-            return _this4.bus.$off('change-' + field, fn);
+            return _this5.bus.$off('change-' + field, fn);
           });
         });
       },
@@ -5542,7 +5587,13 @@
 
             _this.watching = true;
 
-            if (key === 'link') {
+            if (key === 'hidden' && Boolean(n) !== Boolean(o)) {
+              _this.$render.clearCacheAll();
+            }
+
+            if (key === 'ignore' && ctx.input || key === 'hidden' && ctx.input && _this.options.ignoreHiddenFields) {
+              _this.syncForm();
+            } else if (key === 'link') {
               ctx.link();
               return;
             } else if (['props', 'on', 'deep'].indexOf(key) > -1) {
@@ -5553,8 +5604,6 @@
               }
             } else if (key === 'emit') {
               _this.parseEmit(ctx);
-            } else if (key === 'hidden' && Boolean(n) !== Boolean(o)) {
-              _this.$render.clearCacheAll();
             } else if (['prefix', 'suffix'].indexOf(key) > -1) n && _this.loadFn(n, ctx.rule);else if (key === 'type') {
               ctx.updateType();
 
@@ -5609,10 +5658,18 @@
           }
 
           Object.keys(computedRule).forEach(function (k) {
+            var oldValue = undefined;
             var computedValue = vue.computed(function () {
               var item = computedRule[k];
               if (!item) return undefined;
-              return _this.compute(ctx, item);
+
+              var value = _this.compute(ctx, item);
+
+              if (item.linkage && value === undefined) {
+                return oldValue;
+              }
+
+              return value;
             });
 
             var callback = function callback(n) {
@@ -5630,6 +5687,7 @@
             }
 
             ctx.watch.push(vue.watch(computedValue, function (n) {
+              oldValue = n;
               setTimeout(function () {
                 callback(n);
               });
@@ -5684,41 +5742,51 @@
           };
 
           var val = checkCondition(item);
-          return item.invert === true ? !val : val;
+          val = item.invert === true ? !val : val;
+
+          if (item.linkage) {
+            return val ? invoke(function () {
+              return _this2.computeValue(item.linkage, ctx, group);
+            }, undefined) : undefined;
+          }
+
+          return val;
         } else if (is.Function(item)) {
           fn = function fn() {
             return item(_this2.api.form, _this2.api);
           };
         } else {
-          var that = this;
-          var formulas = Object.keys(this.fc.formulas).reduce(function (obj, k) {
-            obj[k] = function () {
-              var _that$fc$formulas$k;
-
-              for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-                args[_key] = arguments[_key];
-              }
-
-              return (_that$fc$formulas$k = that.fc.formulas[k]).call.apply(_that$fc$formulas$k, [{
-                that: this,
-                rule: ctx.rule,
-                api: that.api,
-                fc: that.fc
-              }].concat(args));
-            };
-
-            return obj;
-          }, {});
-
           var _group = ctx.getParentGroup();
 
           fn = function fn() {
-            return new Function('$formulas', '$form', '$group', '$rule', '$api', "with($form){with(this){with($group){with($formulas){ return ".concat(item, " }}}}")).call(_this2.api.form, formulas, _this2.api.top.form, _group ? _this2.subRuleData[_group.id] || {} : {}, ctx.rule, _this2.api);
+            return _this2.computeValue(item, ctx, _group);
           };
         }
 
         return invoke(fn, undefined);
       },
+      computeValue: function computeValue(str, ctx, group) {
+        var that = this;
+        var formulas = Object.keys(this.fc.formulas).reduce(function (obj, k) {
+          obj[k] = function () {
+            var _that$fc$formulas$k;
+
+            for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+              args[_key] = arguments[_key];
+            }
+
+            return (_that$fc$formulas$k = that.fc.formulas[k]).call.apply(_that$fc$formulas$k, [{
+              that: this,
+              rule: ctx.rule,
+              api: that.api,
+              fc: that.fc
+            }].concat(args));
+          };
+
+          return obj;
+        }, {});
+        return new Function('$formulas', '$form', '$group', '$rule', '$api', "with($form){with(this){with($group){with($formulas){ return ".concat(str, " }}}}")).call(this.api.form, formulas, this.api.top.form, group ? this.subRuleData[group.id] || {} : {}, ctx.rule, this.api);
+      },
       updateChildren: function updateChildren(ctx, n, o) {
         var _this3 = this;
 
@@ -6041,6 +6109,7 @@
       subForm: {},
       form: vue.reactive({}),
       appendData: {},
+      ignoreFields: [],
       providers: {},
       cycleLoad: null,
       loadedId: 1,
@@ -6700,6 +6769,7 @@
     var CreateNode = CreateNodeFactory();
     var formulas = {};
     var isMobile = config.isMobile === true;
+    var prototype = {};
     exportAttrs(config.attrs || {});
 
     function getApi(name) {
@@ -6814,6 +6884,8 @@
       return vm.$refs.fc.fapi;
     }
 
+    setPrototypeOf(create, prototype);
+
     function factory(inherit) {
       var _config = _objectSpread2({}, config);
 
@@ -7161,9 +7233,9 @@
           var split = id.split('.');
           var key = split.shift();
 
-          if (key === '$form') {
+          if (key === '$topForm') {
             val = this.$handle.api.top.formData();
-          } else if (key === '$subForm') {
+          } else if (key === '$form') {
             val = this.$handle.api.formData();
           } else if (key === '$options') {
             val = this.options.value;
@@ -7175,7 +7247,7 @@
             split = [];
           } else {
             var tmpData = this.vm.setupState.top.setupState.fc.tmpData;
-            val = hasProperty(tmpData, key) ? deepGet(tmpData, id) : getData(key);
+            val = hasProperty(tmpData, key) ? deepGet(tmpData, id) : getData(id);
             split = [];
           }
 
@@ -7210,7 +7282,9 @@
           var callback = debounce(function () {
             var temp = _this6.getLoadData(id, def);
 
-            if (JSON.stringify(temp) !== JSON.stringify(unwatch[id].val)) {
+            if (!unwatch[id]) {
+              return;
+            } else if (JSON.stringify(temp) !== JSON.stringify(unwatch[id].val)) {
               unwatch[id].val = temp;
               run(true);
             }
@@ -7331,6 +7405,7 @@
       extend(formCreate, {
         version: config.version,
         ui: config.ui,
+        isMobile: isMobile,
         extendApi: extendApi,
         getData: getData,
         setDataDriver: setDataDriver,
@@ -7351,6 +7426,7 @@
         componentAlias: componentAlias,
         copyRule: copyRule,
         copyRules: copyRules,
+        mergeRule: mergeRule,
         fetch: fetch$1,
         $form: $form,
         parseFn: parseFn,
@@ -7365,7 +7441,6 @@
     function useStatic(formCreate) {
       extend(formCreate, {
         create: create,
-        isMobile: isMobile,
         install: function install(app, options) {
           globalConfig = _objectSpread2(_objectSpread2({}, globalConfig), options || {});
           var key = '_installedFormCreate_' + config.ui;
@@ -7390,8 +7465,8 @@
       });
     }
 
-    useAttr(create);
-    useStatic(create);
+    useAttr(prototype);
+    useStatic(prototype);
     setDataDriver('$cookie', cookieDriver);
     setDataDriver('$localStorage', localStorageDriver);
     CreateNode.use({
@@ -7419,18 +7494,18 @@
     }
 
     var FcComponent = $form();
-    setPrototypeOf(FcComponent, create);
+    setPrototypeOf(FcComponent, prototype);
     Object.defineProperties(FcComponent, {
       fetch: {
         get: function get() {
-          return create.fetch;
+          return prototype.fetch;
         },
         set: function set(val) {
-          create.fetch = val;
+          prototype.fetch = val;
         }
       }
     });
-    FcComponent.util = create;
+    FcComponent.util = prototype;
     return FcComponent;
   }
 
@@ -8315,7 +8390,7 @@
   function elmFormCreate() {
     return FormCreateFactory({
       ui: 'element-ui',
-      version: '3.2.10',
+      version: '3.2.12',
       manager: manager,
       extendApi: extendApi,
       install: install,