@form-create/iview 2.5.21 → 2.5.24

package/dist/form-create.js

@@ -1,5 +1,5 @@
 /*!
- * @form-create/iview v2.5.21
+ * @form-create/iview v2.5.24
  * (c) 2018-2022 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
@@ -317,7 +317,7 @@
         delete props.value;
         return h("Checkbox", {
           "props": _objectSpread2({}, props),
-          "key": '' + index + opt.value
+          "key": '' + index + '-' + opt.value
         });
       }), getSlot(this.$slots)]);
     }
@@ -865,7 +865,7 @@
         delete props.value;
         return h("Radio", {
           "props": _objectSpread2({}, props),
-          "key": '' + index + opt.value
+          "key": '' + index + '-' + opt.value
         });
       }), getSlot(this.$slots)]);
     }
@@ -927,7 +927,7 @@
         var slot = props.slot;
         return h("Option", {
           "props": _objectSpread2({}, props),
-          "key": '' + index + props.value
+          "key": '' + index + '-' + props.value
         }, [slot ? h("template", {
           "slot": props.slotName || 'default'
         }, [is.Function(slot) ? props.slot(h) : slot]) : null]);
@@ -1405,14 +1405,20 @@
             var _this = this;
             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('reload', 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);
+                }
               }
             });
           },
@@ -2560,7 +2566,6 @@
           h.getCtxs(field).forEach(function (ctx) {
             h.$render.clearCache(ctx);
             ctx.rule.value = copy(ctx.defaultValue);
-            h.refreshControl(ctx);
           });
         });
       },
@@ -2616,6 +2621,9 @@
         }
         (_h$vm = h.vm).$emit.apply(_h$vm, [name].concat(args));
       },
+      deferSyncValue: function deferSyncValue(fn, sync) {
+        h.deferSyncValue(fn, sync);
+      },
       helper: {
         tidyFields: tidyFields,
         props: props
@@ -2959,6 +2967,8 @@
             vn.data.style.push({
               display: 'none'
             });
+          } else if (is.String(vn.data.style)) {
+            vn.data.style += ';display:none;';
           } else {
             vn.data.style = [vn.data.style, {
               display: 'none'
@@ -3692,6 +3702,7 @@
           if (_ret === "continue") continue;
         }
         if (!validate.length) return false;
+        var hideLst = [];
         var flag = false;
         this.deferSyncValue(function () {
           validate.reverse().forEach(function (_ref) {
@@ -3708,7 +3719,7 @@
                 children: rule,
                 valid: valid
               }) : ctx.ctrlRule.splice(ctx.ctrlRule.indexOf(ctrl), 1);
-              _this7.vm.$nextTick(function () {
+              hideLst[valid ? 'push' : 'unshift'](function () {
                 _this7.api.hidden(!valid, rule);
               });
               return;
@@ -3738,6 +3749,11 @@
             }
           });
         });
+        hideLst.length && this.vm.$nextTick(function () {
+          hideLst.forEach(function (v) {
+            return v();
+          });
+        });
         this.vm.$emit('control', ctx.origin, this.api);
         this.effect(ctx, 'control');
         return flag;
@@ -3766,7 +3782,7 @@
           _this8.loadRule();
           _this8.reloading = false;
           _this8.refresh();
-          _this8.vm.$emit('reload', _this8.api);
+          _this8.vm.$emit('reloading', _this8.api);
         });
         this.bus.$off('next-tick', this.nextReload);
         this.bus.$once('next-tick', this.nextReload);
@@ -4123,9 +4139,11 @@
         $del(this.formData, id);
         $del(this.subForm, id);
         $del(ctx, 'cacheValue');
-        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 (!_this3.reloading) {
             if (ctx.parser.loadChildren !== false) {
@@ -4586,7 +4604,7 @@
           }
         }, val);
         if (!validate.message) {
-          validate.message = rule.title + ' is required';
+          validate.message = rule.title + '不能为空';
         }
         inject.getProp().validate = [validate];
       }
@@ -5821,7 +5839,7 @@
   function ivuFormCreate() {
     return FormCreateFactory({
       ui: "".concat("iview"),
-      version: "".concat("2.5.21"),
+      version: "".concat("2.5.24"),
       manager: manager,
       install: install,
       extendApi: extendApi,