@form-create/element-ui 3.2.7 → 3.2.8

package/dist/form-create.esm.js

@@ -1,10 +1,10 @@
 /*!
- * @form-create/element-ui v3.2.7
+ * @form-create/element-ui v3.2.8
  * (c) 2018-2024 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
  */
-import { defineComponent, toRef, ref, watch, createVNode, resolveComponent, mergeProps as mergeProps$1, openBlock, createElementBlock, createElementVNode, isVNode, nextTick, createTextVNode, markRaw, reactive, getCurrentInstance, provide, inject, toRefs, onBeforeMount, onMounted, onBeforeUnmount, onUpdated, computed, withDirectives, resolveDirective, createApp, h } from 'vue';
+import { defineComponent, toRef, ref, watch, createVNode, resolveComponent, mergeProps as mergeProps$1, openBlock, createElementBlock, createElementVNode, isVNode, nextTick, createTextVNode, markRaw, reactive, getCurrentInstance, provide, inject, toRefs, onBeforeMount, watchEffect, onMounted, onBeforeUnmount, onUpdated, computed, withDirectives, resolveDirective, createApp, h } from 'vue';
 
 function ownKeys(object, enumerableOnly) {
   var keys = Object.keys(object);
@@ -277,11 +277,12 @@ var Checkbox = defineComponent({
         }
 
         return createVNode(Type, {
-          "value": customValue.value,
-          "label": customValue.value
+          "value": customValue.value || undefined,
+          "label": customValue.value || undefined
         }, {
           "default": function _default() {
             return [createVNode(resolveComponent("ElInput"), {
+              "size": "small",
               "modelValue": customValue.value,
               "onUpdate:modelValue": updateCustomValue
             }, null)];
@@ -1064,11 +1065,13 @@ var Radio = defineComponent({
         }
 
         return createVNode(Type, {
-          "value": customValue.value,
-          "label": customValue.value
+          "checked": false,
+          "value": customValue.value || undefined,
+          "label": customValue.value || undefined
         }, {
           "default": function _default() {
             return [createVNode(resolveComponent("ElInput"), {
+              "size": "small",
               "modelValue": customValue.value,
               "onUpdate:modelValue": updateCustomValue
             }, null)];
@@ -1821,13 +1824,18 @@ var Group = defineComponent({
       }, 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({
@@ -1836,7 +1844,7 @@ var Group = defineComponent({
           vm: this,
           key: key,
           del: function del() {
-            return _this10.del(index, key);
+            return _this11.del(index, key);
           },
           add: this.add
         });
@@ -1872,12 +1880,12 @@ var Group = defineComponent({
     }
   },
   created: function created() {
-    var _this11 = this;
+    var _this12 = this;
 
     watch(function () {
-      return _objectSpread2({}, _this11.cacheRule);
+      return _objectSpread2({}, _this12.cacheRule);
     }, function (n) {
-      _this11.sort = Object.keys(n);
+      _this12.sort = Object.keys(n);
     }, {
       immediate: true
     });
@@ -1892,7 +1900,7 @@ var Group = defineComponent({
     }
   },
   render: function render() {
-    var _this12 = this;
+    var _this13 = this;
 
     var keys = this.sort;
     var button = this.button;
@@ -1906,10 +1914,10 @@ var Group = defineComponent({
       "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 createVNode("div", {
         "class": "_fc-group-container",
         "key": key
@@ -1918,20 +1926,20 @@ var Group = defineComponent({
       }, {
         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
@@ -2080,7 +2088,7 @@ function upper(str) {
   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;
   }
@@ -2090,7 +2098,7 @@ var getRuleInject = function getRuleInject(vm, parent) {
   }
 
   if (vm.parent) {
-    return getRuleInject(vm.parent, parent);
+    return _getGroupInject(vm.parent, parent);
   }
 };
 
@@ -2162,7 +2170,7 @@ function $FormCreate(FormCreate, components, directives) {
 
       var addSubForm = function addSubForm() {
         if (parent) {
-          var _inject = getRuleInject(vm, parent);
+          var _inject = _getGroupInject(vm, parent);
 
           if (_inject) {
             var sub;
@@ -2180,7 +2188,7 @@ function $FormCreate(FormCreate, components, directives) {
       };
 
       var rmSubForm = function rmSubForm() {
-        var inject = getRuleInject(vm, parent);
+        var inject = _getGroupInject(vm, parent);
 
         if (inject) {
           if (isMore) {
@@ -2198,33 +2206,36 @@ function $FormCreate(FormCreate, components, directives) {
 
       var styleEl = null;
       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] + ';';
+        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');
@@ -2314,6 +2325,9 @@ function $FormCreate(FormCreate, components, directives) {
         parent: parent ? markRaw(parent) : parent,
         fapi: markRaw(fapi)
       }, toRefs(data)), {}, {
+        getGroupInject: function getGroupInject() {
+          return _getGroupInject(vm, parent);
+        },
         refresh: function refresh() {
           ++data.unique;
         },
@@ -2419,7 +2433,7 @@ var mergeFn = function mergeFn(fn1, fn2) {
 
 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);
 }
@@ -3005,6 +3019,31 @@ function Api(h) {
       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);
@@ -3320,6 +3359,9 @@ function Api(h) {
           ctx.rule.value = copy(ctx.defaultValue);
         });
       });
+      nextTick(function () {
+        api.clearValidateState();
+      });
     },
     method: function method(id, name) {
       var el = api.el(id);
@@ -5552,7 +5594,9 @@ function useContext(Handler) {
                 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);
@@ -6983,6 +7027,8 @@ function FormCreateFactory(config) {
               unwatch();
 
               _this5.bus.$emit('$loadData.$var.' + key);
+
+              return val;
             }
 
             val = invoke(function () {
@@ -7628,11 +7674,12 @@ var manager = {
     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),
@@ -8156,7 +8203,7 @@ function install(FormCreate) {
 function elmFormCreate() {
   return FormCreateFactory({
     ui: 'element-ui',
-    version: '3.2.7',
+    version: '3.2.8',
     manager: manager,
     extendApi: extendApi,
     install: install,