@form-create/element-ui 3.1.8 → 3.1.11

package/dist/form-create.esm.js

@@ -1,5 +1,5 @@
 /*!
- * @form-create/element-ui v3.1.8
+ * @form-create/element-ui v3.1.11
  * (c) 2018-2022 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
@@ -255,7 +255,7 @@ var Checkbox = defineComponent({
           delete props.value;
           return createVNode(Type, mergeProps$1(props, {
             "label": value,
-            "key": name + index + opt.value
+            "key": name + index + '-' + opt.value
           }), {
             "default": function _default() {
               return [props.label || props.value || ''];
@@ -992,7 +992,7 @@ var Radio = defineComponent({
           delete props.value;
           return createVNode(Type, mergeProps$1(props, {
             "label": value,
-            "key": name + index + opt.value
+            "key": name + index + '-' + opt.value
           }), {
             "default": function _default() {
               return [props.label || props.value || ''];
@@ -1044,7 +1044,7 @@ var Select = defineComponent({
       "default": function _default() {
         return [_this.options().map(function (props, index) {
           return createVNode(resolveComponent("ElOption"), mergeProps$1(props, {
-            "key": '' + index + props.value
+            "key": '' + index + '-' + props.value
           }), null);
         }), (_this$$slots$default = (_this$$slots = _this.$slots)["default"]) === null || _this$$slots$default === void 0 ? void 0 : _this$$slots$default.call(_this$$slots)];
       }
@@ -1502,14 +1502,22 @@ var Group = defineComponent({
         Object.keys(this.cacheRule).forEach(function (v) {
           var item = _this.cacheRule[v];
 
-          if (n === o) {
-            deepExtend(item.rule, n);
-          } else {
+          if (item.$f) {
             var val = item.$f.formData();
-            item.$f.once('reloading', function () {
-              item.$f.setValue(val);
-            });
-            item.rule = deepCopy(n);
+
+            if (n === o) {
+              item.$f.deferSyncValue(function () {
+                deepExtend(item.rule, n);
+                item.$f.setValue(val);
+              }, true);
+            } else {
+              var _val = item.$f.formData();
+
+              item.$f.once('reloading', function () {
+                item.$f.setValue(_val);
+              });
+              item.rule = deepCopy(n);
+            }
           }
         });
       },
@@ -2831,7 +2839,6 @@ function Api(h) {
         h.getCtxs(field).forEach(function (ctx) {
           h.$render.clearCache(ctx);
           ctx.rule.value = copy(ctx.defaultValue);
-          h.refreshControl(ctx);
         });
       });
     },
@@ -2882,6 +2889,9 @@ function Api(h) {
       h.nextRefresh();
       fn && invoke(fn);
     },
+    deferSyncValue: function deferSyncValue(fn, sync) {
+      h.deferSyncValue(fn, sync);
+    },
     emit: function emit(name) {
       var _h$vm;
 
@@ -3183,7 +3193,7 @@ function useRender$1(Render) {
       }
     },
     getModelField: function getModelField(ctx) {
-      return ctx.rule.modelField || ctx.parser.modelField || this.fc.modelFields[this.vNode.aliasMap[ctx.field]] || this.fc.modelFields[ctx.field] || this.fc.modelFields[ctx.originType] || 'modelValue';
+      return ctx.rule.modelField || ctx.parser.modelField || this.fc.modelFields[this.vNode.aliasMap[ctx.type]] || this.fc.modelFields[ctx.type] || this.fc.modelFields[ctx.originType] || 'modelValue';
     },
     display: function display(vn) {
       var _this5 = this;
@@ -4156,6 +4166,7 @@ function useLoader(Handler) {
       }
 
       if (!validate.length) return false;
+      var hideLst = [];
       var flag = false;
       this.deferSyncValue(function () {
         validate.reverse().forEach(function (_ref) {
@@ -4173,7 +4184,7 @@ function useLoader(Handler) {
               children: rule,
               valid: valid
             }) : ctx.ctrlRule.splice(ctx.ctrlRule.indexOf(ctrl), 1);
-            nextTick(function () {
+            hideLst[valid ? 'push' : 'unshift'](function () {
               _this7.api.hidden(!valid, rule);
             });
             return;
@@ -4206,6 +4217,11 @@ function useLoader(Handler) {
           }
         });
       });
+      hideLst.length && nextTick(function () {
+        hideLst.forEach(function (v) {
+          return v();
+        });
+      });
       this.vm.emit('control', ctx.origin, this.api);
       this.effect(ctx, 'control');
       return flag;
@@ -4675,9 +4691,13 @@ function useContext(Handler) {
       $del(this.formData, id);
       $del(this.subForm, id);
       $del(this.vm.setupState.ctxInject, id);
-      input && $del(this.form, field);
       input && this.rmIdCtx(ctx, field, 'field');
       name && this.rmIdCtx(ctx, name, 'name');
+
+      if (input && !hasProperty(this.fieldCtx, field)) {
+        $del(this.form, field);
+      }
+
       this.deferSyncValue(function () {
         if (!_this4.reloading) {
           if (ctx.parser.loadChildren !== false) {
@@ -6477,7 +6497,7 @@ var required = {
       }, val);
 
       if (!validate.message) {
-        validate.message = rule.title + ' is required';
+        validate.message = rule.title + '不能为空';
       }
 
       inject.getProp().validate = [validate];
@@ -6533,7 +6553,7 @@ function install(FormCreate) {
 function elmFormCreate() {
   return FormCreateFactory({
     ui: 'element-ui',
-    version: '3.1.8',
+    version: '3.1.11',
     manager: manager,
     extendApi: extendApi,
     install: install,