@form-create/element-ui 2.5.22 → 2.5.25

package/dist/form-create.js

@@ -1,5 +1,5 @@
 /*!
- * @form-create/element-ui v2.5.22
+ * @form-create/element-ui v2.5.25
  * (c) 2018-2022 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
@@ -307,10 +307,11 @@
     render: function render() {
       var _this2 = this;
       var h = arguments[0];
-      return h("ElCheckboxGroup", helper([{}, this.formCreateInject.prop, {
-        "attrs": {
-          "value": this.trueValue
-        },
+      return h("ElCheckboxGroup", helper([{}, this.formCreateInject.prop, {}, {
+        "props": {
+          value: this.trueValue
+        }
+      }, {
         "on": {
           "input": this.onInput
         }
@@ -318,10 +319,11 @@
         var props = _objectSpread2({}, opt);
         var Type = _this2.type === 'button' ? 'ElCheckboxButton' : 'ElCheckbox';
         delete props.value;
-        return h(Type, {
-          "props": _objectSpread2({}, props),
-          "key": Type + index + opt.value
-        });
+        return h(Type, helper([{}, {
+          "props": props
+        }, {
+          "key": Type + index + '-' + opt.value
+        }]));
       }), getSlot(this.$slots)]);
     }
   };
@@ -762,36 +764,37 @@
       });
       return h("div", {
         "class": "_fc-frame"
-      }, [node, h("el-dialog", {
-        "attrs": {
-          "appendToBody": true,
-          "modal": this.previewMask,
-          "title": modalTitle,
-          "visible": this.previewVisible
-        },
+      }, [node, h("el-dialog", helper([{}, {
+        "props": {
+          appendToBody: true,
+          modal: this.previewMask,
+          title: modalTitle,
+          visible: this.previewVisible
+        }
+      }, {
         "on": {
           "close": this.handleCancel
         }
-      }, [h("img", {
+      }]), [h("img", {
         "style": "width: 100%",
         "attrs": {
           "src": this.previewImage
         }
-      })]), h("el-dialog", {
-        "attrs": {
-          "appendToBody": true,
-          "visible": this.frameVisible
-        },
-        "props": _objectSpread2({}, _objectSpread2({
+      })]), h("el-dialog", helper([{}, {
+        "props": _objectSpread2(_objectSpread2({
           width: width,
-          title: title
-        }, this.modal)),
+          title: title,
+          appendToBody: true
+        }, this.modal), {}, {
+          visible: this.frameVisible
+        })
+      }, {
         "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,
@@ -863,10 +866,11 @@
     render: function render() {
       var _this2 = this;
       var h = arguments[0];
-      return h("ElRadioGroup", helper([{}, this.formCreateInject.prop, {
-        "attrs": {
-          "value": this.trueValue
-        },
+      return h("ElRadioGroup", helper([{}, this.formCreateInject.prop, {}, {
+        "props": {
+          value: this.trueValue
+        }
+      }, {
         "on": {
           "input": this.onInput
         }
@@ -874,10 +878,11 @@
         var props = _objectSpread2({}, opt);
         var Type = _this2.type === 'button' ? 'ElRadioButton' : 'ElRadio';
         delete props.value;
-        return h(Type, {
-          "props": _objectSpread2({}, props),
-          "key": Type + index + opt.value
-        });
+        return h(Type, helper([{}, {
+          "props": props
+        }, {
+          "key": Type + index + '-' + opt.value
+        }]));
       }), getSlot(this.$slots)]);
     }
   };
@@ -936,10 +941,11 @@
       var options = ctx.props.formCreateInject.options;
       return h("ElSelect", helper([{}, ctx.data]), [(Array.isArray(options) ? options : []).map(function (props, index) {
         var slot = props.slot;
-        return h("ElOption", {
-          "props": _objectSpread2({}, props),
-          "key": '' + index + props.value
-        }, [slot ? h("template", {
+        return h("ElOption", helper([{}, {
+          "props": props
+        }, {
+          "key": '' + index + '-' + props.value
+        }]), [slot ? h("template", {
           "slot": props.slotName || 'default'
         }, [is.Function(slot) ? props.slot(h) : slot]) : null]);
       }), ctx.children]);
@@ -1240,17 +1246,18 @@
       }
       return h("div", {
         "class": '_fc-upload'
-      }, [[this.formCreateInject.prop.props.showFileList ? [] : this.makeFiles(), this.makeUpload()], h("el-dialog", {
-        "attrs": {
-          "appendToBody": true,
-          "modal": this.previewMask,
-          "title": this.modalTitle,
-          "visible": this.previewVisible
-        },
+      }, [[this.formCreateInject.prop.props.showFileList ? [] : this.makeFiles(), this.makeUpload()], h("el-dialog", helper([{}, {
+        "props": {
+          appendToBody: true,
+          modal: this.previewMask,
+          title: this.modalTitle,
+          visible: this.previewVisible
+        }
+      }, {
         "on": {
           "close": this.handleCancel
         }
-      }, [h("img", {
+      }]), [h("img", {
         "attrs": {
           "alt": "example",
           "src": this.previewImage
@@ -1670,10 +1677,7 @@
             "span": button ? 20 : 24
           }
         }, [h("ElFormItem", [h(Type, helper([{
-          "key": key,
-          "attrs": {
-            "inFor": true
-          }
+          "key": key
         }, {
           "on": {
             'update:value': function updateValue(formData) {
@@ -1689,20 +1693,21 @@
               return _this9.add$f(index, key, $f);
             }
           }
-        }, {
-          "attrs": {
-            "value": _this9.field ? _defineProperty({}, _this9.field, _this9._value(_this9.value[index])) : _this9.value[index],
-            "rule": rule,
-            "option": options,
-            "extendOption": true
+        }, {}, {
+          "props": {
+            value: _this9.field ? _defineProperty({}, _this9.field, _this9._value(_this9.value[index])) : _this9.value[index],
+            rule: rule,
+            option: options,
+            extendOption: true,
+            inFor: true
           }
-        }]))])]), button ? h("ElCol", {
-          "attrs": {
-            "span": 2,
-            "pull": 1,
-            "push": 1
+        }]))])]), button ? h("ElCol", helper([{}, {
+          "props": {
+            span: 2,
+            pull: 1,
+            push: 1
           }
-        }, [_this9.makeIcon(keys.length, index, key)]) : null]);
+        }]), [_this9.makeIcon(keys.length, index, key)]) : null]);
       })]);
     }
   };
@@ -1803,11 +1808,11 @@
           'emit-event': this.emitEvent,
           input: this.add$f
         }
-      }, {
-        "attrs": {
-          "rule": rule,
-          "option": options,
-          "extendOption": true
+      }, {}, {
+        "props": {
+          rule: rule,
+          option: options,
+          extendOption: true
         }
       }]));
     }
@@ -2560,7 +2565,6 @@
           h.getCtxs(field).forEach(function (ctx) {
             h.$render.clearCache(ctx);
             ctx.rule.value = copy(ctx.defaultValue);
-            h.refreshControl(ctx);
           });
         });
       },
@@ -2664,8 +2668,11 @@
       },
       getCache: function getCache(ctx) {
         var cache = this.cache[ctx.id];
-        cache.use = true;
-        return cache.vnode;
+        if (cache) {
+          cache.use = true;
+          return cache.vnode;
+        }
+        return undefined;
       }
     });
   }
@@ -3697,6 +3704,7 @@
           if (_ret === "continue") continue;
         }
         if (!validate.length) return false;
+        var hideLst = [];
         var flag = false;
         this.deferSyncValue(function () {
           validate.reverse().forEach(function (_ref) {
@@ -3713,7 +3721,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;
@@ -3743,6 +3751,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;
@@ -4128,9 +4141,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) {
@@ -4591,7 +4606,8 @@
           }
         }, val);
         if (!validate.message) {
-          validate.message = rule.title + ' is required';
+          var title = rule.title || '';
+          validate.message = ((_typeof(title) === 'object' ? title.title : title) || '') + '不能为空';
         }
         inject.getProp().validate = [validate];
       }
@@ -4661,9 +4677,13 @@
       return fetch(_objectSpread2(_objectSpread2({}, option), {}, {
         onSuccess: function onSuccess(body) {
           if (check()) return;
-          set((option.parse || function (v) {
+          var fn = function fn(v) {
             return v.data;
-          })(body, rule, api));
+          };
+          if (is.Function(option.parse)) {
+            fn = option.parse;
+          }
+          set(fn(body, rule, api));
           api.sync(rule);
         },
         onError: function onError(e) {
@@ -5787,7 +5807,7 @@
   function elmFormCreate() {
     return FormCreateFactory({
       ui: "".concat("element-ui"),
-      version: "".concat("2.5.22"),
+      version: "".concat("2.5.25"),
       manager: manager,
       extendApi: extendApi,
       install: install,