@form-create/iview 2.5.20 → 2.5.23

package/dist/form-create.js

@@ -1,5 +1,5 @@
 /*!
- * @form-create/iview v2.5.20
+ * @form-create/iview v2.5.23
  * (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)]);
     }
@@ -755,10 +755,11 @@
           "attrs": {
             "src": this.previewImage
           }
-        })]), h("Modal", helper([{}, _objectSpread2({
-          width: width,
-          title: title
-        }, this.modal), {
+        })]), h("Modal", {
+          "props": _objectSpread2({}, _objectSpread2({
+            width: width,
+            title: title
+          }, this.modal)),
           "on": {
             "on-cancel": function onCancel() {
               return _this9.closeModel(true);
@@ -770,7 +771,7 @@
               _this9.frameVisible = $$v;
             }
           }
-        }]), [this.frameVisible || !this.reload ? h("iframe", {
+        }, [this.frameVisible || !this.reload ? h("iframe", {
           "ref": "frame",
           "attrs": {
             "src": src,
@@ -864,7 +865,7 @@
         delete props.value;
         return h("Radio", {
           "props": _objectSpread2({}, props),
-          "key": '' + index + opt.value
+          "key": '' + index + '-' + opt.value
         });
       }), getSlot(this.$slots)]);
     }
@@ -926,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]);
@@ -1404,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);
+                }
               }
             });
           },
@@ -2559,7 +2566,6 @@
           h.getCtxs(field).forEach(function (ctx) {
             h.$render.clearCache(ctx);
             ctx.rule.value = copy(ctx.defaultValue);
-            h.refreshControl(ctx);
           });
         });
       },
@@ -2615,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
@@ -2958,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'
@@ -3765,7 +3776,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);
@@ -4122,9 +4133,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) {
@@ -4574,16 +4587,16 @@
   var $required = {
     name: 'required',
     load: function load(inject, rule, api) {
-      var val = parseVa(inject.getValue());
+      var val = parseVal(inject.getValue());
       if (val.required === false) {
         inject.clearProp();
       } else {
-        var validate = _objectSpread2(_objectSpread2({}, val), {}, {
+        var validate = _objectSpread2({
           required: true,
           validator: function validator(_, v, call) {
             is.empty(v) ? call(validate.message) : call();
           }
-        });
+        }, val);
         if (!validate.message) {
           validate.message = rule.title + ' is required';
         }
@@ -4595,7 +4608,7 @@
       $required.load.apply($required, arguments);
     }
   };
-  function parseVa(val) {
+  function parseVal(val) {
     if (is.Boolean(val)) {
       return {
         required: val
@@ -4604,6 +4617,10 @@
       return {
         message: val
       };
+    } else if (is.Function(val)) {
+      return {
+        validator: val
+      };
     } else if (!is.Object(val)) {
       return {};
     } else {
@@ -5816,7 +5833,7 @@
   function ivuFormCreate() {
     return FormCreateFactory({
       ui: "".concat("iview"),
-      version: "".concat("2.5.20"),
+      version: "".concat("2.5.23"),
       manager: manager,
       install: install,
       extendApi: extendApi,