@form-create/element-ui 2.5.20 → 2.5.23

package/dist/form-create.js

@@ -1,5 +1,5 @@
 /*!
- * @form-create/element-ui v2.5.20
+ * @form-create/element-ui v2.5.23
  * (c) 2018-2022 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
@@ -320,7 +320,7 @@
         delete props.value;
         return h(Type, {
           "props": _objectSpread2({}, props),
-          "key": Type + index + opt.value
+          "key": Type + index + '-' + opt.value
         });
       }), getSlot(this.$slots)]);
     }
@@ -777,23 +777,21 @@
         "attrs": {
           "src": this.previewImage
         }
-      })]), h("el-dialog", helper([{
-        "attrs": {
-          "appendToBody": true
-        }
-      }, _objectSpread2({
-        width: width,
-        title: title
-      }, this.modal), {
+      })]), h("el-dialog", {
         "attrs": {
+          "appendToBody": true,
           "visible": this.frameVisible
         },
+        "props": _objectSpread2({}, _objectSpread2({
+          width: width,
+          title: title
+        }, this.modal)),
         "on": {
           "close": function close() {
             return _this9.closeModel(true);
           }
         }
-      }]), [this.frameVisible || !this.reload ? h("iframe", {
+      }, [this.frameVisible || !this.reload ? h("iframe", {
         "ref": "frame",
         "attrs": {
           "src": src,
@@ -878,7 +876,7 @@
         delete props.value;
         return h(Type, {
           "props": _objectSpread2({}, props),
-          "key": Type + index + opt.value
+          "key": Type + index + '-' + opt.value
         });
       }), getSlot(this.$slots)]);
     }
@@ -940,7 +938,7 @@
         var slot = props.slot;
         return h("ElOption", {
           "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]);
@@ -1417,14 +1415,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);
+              }
             }
           });
         },
@@ -2556,7 +2560,6 @@
           h.getCtxs(field).forEach(function (ctx) {
             h.$render.clearCache(ctx);
             ctx.rule.value = copy(ctx.defaultValue);
-            h.refreshControl(ctx);
           });
         });
       },
@@ -2612,6 +2615,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
@@ -2955,6 +2961,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'
@@ -3762,7 +3770,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);
@@ -4119,9 +4127,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) {
@@ -4571,16 +4581,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';
         }
@@ -4592,7 +4602,7 @@
       $required.load.apply($required, arguments);
     }
   };
-  function parseVa(val) {
+  function parseVal(val) {
     if (is.Boolean(val)) {
       return {
         required: val
@@ -4601,6 +4611,10 @@
       return {
         message: val
       };
+    } else if (is.Function(val)) {
+      return {
+        validator: val
+      };
     } else if (!is.Object(val)) {
       return {};
     } else {
@@ -5774,7 +5788,7 @@
   function elmFormCreate() {
     return FormCreateFactory({
       ui: "".concat("element-ui"),
-      version: "".concat("2.5.20"),
+      version: "".concat("2.5.23"),
       manager: manager,
       extendApi: extendApi,
       install: install,