@form-create/element-ui 3.1.8 → 3.1.11

package/dist/form-create.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.
@@ -259,7 +259,7 @@
             delete props.value;
             return vue.createVNode(Type, vue.mergeProps(props, {
               "label": value,
-              "key": name + index + opt.value
+              "key": name + index + '-' + opt.value
             }), {
               "default": function _default() {
                 return [props.label || props.value || ''];
@@ -996,7 +996,7 @@
             delete props.value;
             return vue.createVNode(Type, vue.mergeProps(props, {
               "label": value,
-              "key": name + index + opt.value
+              "key": name + index + '-' + opt.value
             }), {
               "default": function _default() {
                 return [props.label || props.value || ''];
@@ -1048,7 +1048,7 @@
         "default": function _default() {
           return [_this.options().map(function (props, index) {
             return vue.createVNode(vue.resolveComponent("ElOption"), vue.mergeProps(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)];
         }
@@ -1506,14 +1506,22 @@
           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);
+              }
             }
           });
         },
@@ -2835,7 +2843,6 @@
           h.getCtxs(field).forEach(function (ctx) {
             h.$render.clearCache(ctx);
             ctx.rule.value = copy(ctx.defaultValue);
-            h.refreshControl(ctx);
           });
         });
       },
@@ -2886,6 +2893,9 @@
         h.nextRefresh();
         fn && invoke(fn);
       },
+      deferSyncValue: function deferSyncValue(fn, sync) {
+        h.deferSyncValue(fn, sync);
+      },
       emit: function emit(name) {
         var _h$vm;
 
@@ -3187,7 +3197,7 @@
         }
       },
       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;
@@ -4160,6 +4170,7 @@
         }
 
         if (!validate.length) return false;
+        var hideLst = [];
         var flag = false;
         this.deferSyncValue(function () {
           validate.reverse().forEach(function (_ref) {
@@ -4177,7 +4188,7 @@
                 children: rule,
                 valid: valid
               }) : ctx.ctrlRule.splice(ctx.ctrlRule.indexOf(ctrl), 1);
-              vue.nextTick(function () {
+              hideLst[valid ? 'push' : 'unshift'](function () {
                 _this7.api.hidden(!valid, rule);
               });
               return;
@@ -4210,6 +4221,11 @@
             }
           });
         });
+        hideLst.length && vue.nextTick(function () {
+          hideLst.forEach(function (v) {
+            return v();
+          });
+        });
         this.vm.emit('control', ctx.origin, this.api);
         this.effect(ctx, 'control');
         return flag;
@@ -4679,9 +4695,13 @@
         $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) {
@@ -6481,7 +6501,7 @@
         }, val);
 
         if (!validate.message) {
-          validate.message = rule.title + ' is required';
+          validate.message = rule.title + '不能为空';
         }
 
         inject.getProp().validate = [validate];
@@ -6537,7 +6557,7 @@
   function elmFormCreate() {
     return FormCreateFactory({
       ui: 'element-ui',
-      version: '3.1.8',
+      version: '3.1.11',
       manager: manager,
       extendApi: extendApi,
       install: install,