@form-create/element-ui 3.2.6 → 3.2.8

package/dist/form-create.js

@@ -1,5 +1,5 @@
 /*!
- * @form-create/element-ui v3.2.6
+ * @form-create/element-ui v3.2.8
  * (c) 2018-2024 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
@@ -281,11 +281,12 @@
           }
 
           return vue.createVNode(Type, {
-            "value": customValue.value,
-            "label": customValue.value
+            "value": customValue.value || undefined,
+            "label": customValue.value || undefined
           }, {
             "default": function _default() {
               return [vue.createVNode(vue.resolveComponent("ElInput"), {
+                "size": "small",
                 "modelValue": customValue.value,
                 "onUpdate:modelValue": updateCustomValue
               }, null)];
@@ -1068,11 +1069,13 @@
           }
 
           return vue.createVNode(Type, {
-            "value": customValue.value,
-            "label": customValue.value
+            "checked": false,
+            "value": customValue.value || undefined,
+            "label": customValue.value || undefined
           }, {
             "default": function _default() {
               return [vue.createVNode(vue.resolveComponent("ElInput"), {
+                "size": "small",
                 "modelValue": customValue.value,
                 "onUpdate:modelValue": updateCustomValue
               }, null)];
@@ -1349,6 +1352,7 @@
       previewMask: undefined,
       onPreview: Function,
       modalTitle: String,
+      listType: String,
       modelValue: [Array, String]
     },
     emits: ['update:modelValue', 'change', 'remove', 'fc.el'],
@@ -1372,7 +1376,7 @@
         if (this.onPreview) {
           this.onPreview.apply(this, arguments);
         } else {
-          if ('text' === this.$attrs.listType) {
+          if ('text' === this.listType) {
             window.open(file.url);
           } else {
             this.previewImage = file.url;
@@ -1412,9 +1416,9 @@
       return vue.createVNode("div", {
         "class": "_fc-upload"
       }, [vue.createVNode(vue.resolveComponent("ElUpload"), vue.mergeProps({
-        "key": len,
-        "list-type": "picture-card"
+        "key": len
       }, this.$attrs, {
+        "list-type": this.listType || 'picture-card',
         "class": {
           '_fc-exceed': this.$attrs.limit ? this.$attrs.limit <= len : false
         },
@@ -1425,7 +1429,7 @@
         "ref": "upload"
       }), _objectSpread2({
         "default": function _default() {
-          return [(_this$$slots$default = (_this$$slots = _this.$slots)["default"]) !== null && _this$$slots$default !== void 0 && _this$$slots$default.call(_this$$slots) || ['text', 'picture'].indexOf(_this.$attrs.listType) === -1 ? vue.createVNode(vue.resolveComponent("ElIcon"), null, {
+          return [(_this$$slots$default = (_this$$slots = _this.$slots)["default"]) !== null && _this$$slots$default !== void 0 && _this$$slots$default.call(_this$$slots) || ['text', 'picture'].indexOf(_this.listType) === -1 ? vue.createVNode(vue.resolveComponent("ElIcon"), null, {
             "default": function _default() {
               return [vue.createVNode(script$1, null, null)];
             }
@@ -1824,13 +1828,18 @@
         }, null);
       },
       changeSort: function changeSort(index, sort) {
+        var _this10 = this;
+
         var a = this.sort[index];
         this.sort[index] = this.sort[index + sort];
         this.sort[index + sort] = a;
+        this.formCreateInject.subForm(this.sort.map(function (k) {
+          return _this10.cacheRule[k].$f;
+        }));
         this.formData(0);
       },
       makeIcon: function makeIcon(total, index, key) {
-        var _this10 = this;
+        var _this11 = this;
 
         if (this.$slots.button) {
           return this.$slots.button({
@@ -1839,7 +1848,7 @@
             vm: this,
             key: key,
             del: function del() {
-              return _this10.del(index, key);
+              return _this11.del(index, key);
             },
             add: this.add
           });
@@ -1875,12 +1884,12 @@
       }
     },
     created: function created() {
-      var _this11 = this;
+      var _this12 = this;
 
       vue.watch(function () {
-        return _objectSpread2({}, _this11.cacheRule);
+        return _objectSpread2({}, _this12.cacheRule);
       }, function (n) {
-        _this11.sort = Object.keys(n);
+        _this12.sort = Object.keys(n);
       }, {
         immediate: true
       });
@@ -1895,7 +1904,7 @@
       }
     },
     render: function render() {
-      var _this12 = this;
+      var _this13 = this;
 
       var keys = this.sort;
       var button = this.button;
@@ -1909,10 +1918,10 @@
         "class": "_fc-group-plus-minus _fc-group-add fc-clock",
         "onClick": this.add
       }, null) : keys.map(function (key, index) {
-        var _this12$cacheRule$key = _this12.cacheRule[key],
-            rule = _this12$cacheRule$key.rule,
-            options = _this12$cacheRule$key.options;
-        var btn = button && !disabled ? _this12.makeIcon(keys.length, index, key) : [];
+        var _this13$cacheRule$key = _this13.cacheRule[key],
+            rule = _this13$cacheRule$key.rule,
+            options = _this13$cacheRule$key.options;
+        var btn = button && !disabled ? _this13.makeIcon(keys.length, index, key) : [];
         return vue.createVNode("div", {
           "class": "_fc-group-container",
           "key": key
@@ -1921,20 +1930,20 @@
         }, {
           disabled: disabled,
           'onUpdate:modelValue': function onUpdateModelValue(formData) {
-            return _this12.formData(key, formData);
+            return _this13.formData(key, formData);
           },
           'onEmit-event': function onEmitEvent(name) {
             for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
               args[_key - 1] = arguments[_key];
             }
 
-            return _this12.emitEvent(name, args, index, key);
+            return _this13.emitEvent(name, args, index, key);
           },
           'onUpdate:api': function onUpdateApi($f) {
-            return _this12.add$f(index, key, $f);
+            return _this13.add$f(index, key, $f);
           },
           inFor: true,
-          modelValue: _this12.field ? _defineProperty({}, _this12.field, _this12._value(_this12.modelValue[index])) : _this12.modelValue[index],
+          modelValue: _this13.field ? _defineProperty({}, _this13.field, _this13._value(_this13.modelValue[index])) : _this13.modelValue[index],
           rule: rule,
           option: options,
           extendOption: true
@@ -2083,7 +2092,7 @@
     return str.replace(str[0], str[0].toLocaleUpperCase());
   }
 
-  var getRuleInject = function getRuleInject(vm, parent) {
+  var _getGroupInject = function getGroupInject(vm, parent) {
     if (!vm || vm === parent) {
       return;
     }
@@ -2093,7 +2102,7 @@
     }
 
     if (vm.parent) {
-      return getRuleInject(vm.parent, parent);
+      return _getGroupInject(vm.parent, parent);
     }
   };
 
@@ -2117,7 +2126,7 @@
           }
         },
         extendOption: Boolean,
-        driver: String,
+        driver: [String, Object],
         modelValue: Object,
         disabled: {
           type: Boolean,
@@ -2127,6 +2136,7 @@
           type: Boolean,
           "default": undefined
         },
+        index: [String, Number],
         api: Object,
         name: String,
         subForm: {
@@ -2164,7 +2174,7 @@
 
         var addSubForm = function addSubForm() {
           if (parent) {
-            var _inject = getRuleInject(vm, parent);
+            var _inject = _getGroupInject(vm, parent);
 
             if (_inject) {
               var sub;
@@ -2182,7 +2192,7 @@
         };
 
         var rmSubForm = function rmSubForm() {
-          var inject = getRuleInject(vm, parent);
+          var inject = _getGroupInject(vm, parent);
 
           if (inject) {
             if (isMore) {
@@ -2200,33 +2210,36 @@
 
         var styleEl = null;
         vue.onBeforeMount(function () {
-          var content = '';
-          var globalClass = props.option && props.option.globalClass || {};
-          Object.keys(globalClass).forEach(function (k) {
-            var subCss = '';
-            globalClass[k].style && Object.keys(globalClass[k].style).forEach(function (key) {
-              subCss += toLine(key) + ':' + globalClass[k].style[key] + ';';
+          vue.watchEffect(function () {
+            var content = '';
+            var globalClass = props.option && props.option.globalClass || {};
+            Object.keys(globalClass).forEach(function (k) {
+              var subCss = '';
+              globalClass[k].style && Object.keys(globalClass[k].style).forEach(function (key) {
+                subCss += toLine(key) + ':' + globalClass[k].style[key] + ';';
+              });
+
+              if (globalClass[k].content) {
+                subCss += globalClass[k].content + ';';
+              }
+
+              if (subCss) {
+                content += ".".concat(k, "{").concat(subCss, "}");
+              }
             });
 
-            if (globalClass[k].content) {
-              subCss += globalClass[k].content + ';';
+            if (props.option && props.option.style) {
+              content += props.option.style;
             }
 
-            if (subCss) {
-              content += ".".concat(k, "{").concat(subCss, "}");
+            if (!styleEl) {
+              styleEl = document.createElement('style');
+              styleEl.type = 'text/css';
+              document.head.appendChild(styleEl);
             }
-          });
 
-          if (props.option && props.option.style) {
-            content += props.option.style;
-          }
-
-          if (content) {
-            styleEl = document.createElement('style');
-            styleEl.type = 'text/css';
-            styleEl.innerHTML = content;
-            document.head.appendChild(styleEl);
-          }
+            styleEl.innerHTML = content || '';
+          });
         });
         var emit$topForm = debounce(function () {
           fc.bus.$emit('$loadData.$topForm');
@@ -2292,7 +2305,6 @@
           if (JSON.stringify(n || {}) === data.updateValue) return;
 
           if (fapi.config.forceCoverValue) {
-            fc.$handle.appendData = {};
             fapi.coverValue(n || {});
           } else {
             fapi.setValue(n || {});
@@ -2300,11 +2312,26 @@
         }, {
           deep: true
         });
+        vue.watch(function () {
+          return props.index;
+        }, function () {
+          fapi.coverValue({});
+          vue.nextTick(function () {
+            vue.nextTick(function () {
+              fapi.clearValidateState();
+            });
+          });
+        }, {
+          flush: 'sync'
+        });
         return _objectSpread2(_objectSpread2({
           fc: vue.markRaw(fc),
           parent: parent ? vue.markRaw(parent) : parent,
           fapi: vue.markRaw(fapi)
         }, vue.toRefs(data)), {}, {
+          getGroupInject: function getGroupInject() {
+            return _getGroupInject(vm, parent);
+          },
           refresh: function refresh() {
             ++data.unique;
           },
@@ -2410,7 +2437,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 arrayAttrs = ['validate', 'children', 'control'];
-  var normalAttrs = ['effect'];
+  var normalAttrs = ['effect', 'deep'];
   function attrs() {
     return [].concat(keyAttrs, _toConsumableArray(normalMerge), _toConsumableArray(toArrayMerge), _toConsumableArray(functionalMerge), arrayAttrs, normalAttrs);
   }
@@ -2996,6 +3023,31 @@
         return allSubForm();
       },
 
+      get siblings() {
+        var inject = h.vm.setupState.getGroupInject();
+
+        if (inject) {
+          var subForm = inject.getSubForm();
+
+          if (Array.isArray(subForm)) {
+            return _toConsumableArray(subForm);
+          }
+        }
+
+        return undefined;
+      },
+
+      get index() {
+        var siblings = api.siblings;
+
+        if (siblings) {
+          var idx = siblings.indexOf(api);
+          return idx > -1 ? idx : undefined;
+        }
+
+        return undefined;
+      },
+
       formData: function formData(fields) {
         return tidyFields(fields).reduce(function (initial, id) {
           var ctx = h.getFieldCtx(id);
@@ -3013,6 +3065,7 @@
         var data = _objectSpread2({}, formData || {});
 
         h.deferSyncValue(function () {
+          h.appendData = {};
           api.fields().forEach(function (key) {
             var ctxs = h.fieldCtx[key];
 
@@ -3025,7 +3078,7 @@
             }
           });
           extend(h.appendData, data);
-        });
+        }, true);
       },
       setValue: function setValue(field) {
         var formData = field;
@@ -3038,7 +3091,7 @@
               ctx.rule.value = formData[key];
             });
           });
-        });
+        }, true);
       },
       removeField: function removeField(field) {
         var ctx = h.getCtx(field);
@@ -3310,6 +3363,9 @@
             ctx.rule.value = copy(ctx.defaultValue);
           });
         });
+        vue.nextTick(function () {
+          api.clearValidateState();
+        });
       },
       method: function method(id, name) {
         var el = api.el(id);
@@ -5219,7 +5275,7 @@
           this.deferSyncFn = null;
 
           if (fn.sync) {
-            this.syncValue();
+            this.syncForm();
           }
         }
       },
@@ -5542,7 +5598,9 @@
                   return or ? false : valid;
                 };
 
-                return checkCondition(item);
+                var _val = checkCondition(item);
+
+                return item.invert === true ? !_val : _val;
               } else if (is.Function(item)) {
                 fn = function fn() {
                   return item(_this.api.form, _this.api);
@@ -6844,7 +6902,7 @@
         }
 
         if (this.vm.props.driver) {
-          this.renderDriver = this.drivers[this.vm.props.driver];
+          this.renderDriver = _typeof(this.vm.props.driver) === 'object' ? this.vm.props.driver : this.drivers[this.vm.props.driver];
         }
 
         if (!this.renderDriver && this.vm.setupState.parent) {
@@ -6973,6 +7031,8 @@
                 unwatch();
 
                 _this5.bus.$emit('$loadData.$var.' + key);
+
+                return val;
               }
 
               val = invoke(function () {
@@ -7618,11 +7678,12 @@
       var rule = ctx.prop;
       var uni = "".concat(this.key).concat(ctx.key);
       var col = rule.col;
-      var isTitle = this.isTitle(rule);
+      var isTitle = this.isTitle(rule) && rule.wrap.title !== false;
       var labelWidth = !col.labelWidth && !isTitle ? 0 : col.labelWidth;
       var _this$rule$props = this.rule.props,
           inline = _this$rule$props.inline,
           _col = _this$rule$props.col;
+      delete rule.wrap.title;
       var item = isFalse(rule.wrap.show) ? children : this.$r(mergeProps([rule.wrap, {
         props: _objectSpread2(_objectSpread2({
           labelWidth: labelWidth === void 0 ? labelWidth : toString(labelWidth),
@@ -8146,7 +8207,7 @@
   function elmFormCreate() {
     return FormCreateFactory({
       ui: 'element-ui',
-      version: '3.2.6',
+      version: '3.2.8',
       manager: manager,
       extendApi: extendApi,
       install: install,