@form-create/iview 2.5.22 → 2.5.25

package/dist/form-create.js

@@ -1,5 +1,5 @@
 /*!
- * @form-create/iview v2.5.22
+ * @form-create/iview v2.5.25
  * (c) 2018-2022 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
@@ -305,20 +305,22 @@
     },
     render: function render() {
       var h = arguments[0];
-      return h("CheckboxGroup", helper([{}, this.formCreateInject.prop, {
-        "attrs": {
-          "value": this.trueValue
-        },
+      return h("CheckboxGroup", helper([{}, this.formCreateInject.prop, {}, {
+        "props": {
+          value: this.trueValue
+        }
+      }, {
         "on": {
           "input": this.onInput
         }
       }]), [this.options().map(function (opt, index) {
         var props = _objectSpread2({}, opt);
         delete props.value;
-        return h("Checkbox", {
-          "props": _objectSpread2({}, props),
-          "key": '' + index + opt.value
-        });
+        return h("Checkbox", helper([{}, {
+          "props": props
+        }, {
+          "key": '' + index + '-' + opt.value
+        }]));
       }), getSlot(this.$slots)]);
     }
   };
@@ -738,28 +740,30 @@
         });
         return h("div", {
           "class": "_fc-frame"
-        }, [node, h("Modal", {
-          "attrs": {
-            "mask": this.previewMask,
-            "title": modalTitle,
-            "footerHide": true
-          },
+        }, [node, h("Modal", helper([{}, {
+          "props": {
+            mask: this.previewMask,
+            title: modalTitle,
+            footerHide: true
+          }
+        }, {
           "model": {
             value: _this9.previewVisible,
             callback: function callback($$v) {
               _this9.previewVisible = $$v;
             }
           }
-        }, [h("img", {
+        }]), [h("img", {
           "style": "width: 100%",
           "attrs": {
             "src": this.previewImage
           }
-        })]), h("Modal", {
-          "props": _objectSpread2({}, _objectSpread2({
+        })]), h("Modal", helper([{}, {
+          "props": _objectSpread2({
             width: width,
             title: title
-          }, this.modal)),
+          }, this.modal)
+        }, {
           "on": {
             "on-cancel": function onCancel() {
               return _this9.closeModel(true);
@@ -771,7 +775,7 @@
               _this9.frameVisible = $$v;
             }
           }
-        }, [this.frameVisible || !this.reload ? h("iframe", {
+        }]), [this.frameVisible || !this.reload ? h("iframe", {
           "ref": "frame",
           "attrs": {
             "src": src,
@@ -853,20 +857,22 @@
     },
     render: function render() {
       var h = arguments[0];
-      return h("RadioGroup", helper([{}, this.formCreateInject.prop, {
-        "attrs": {
-          "value": this.trueValue
-        },
+      return h("RadioGroup", helper([{}, this.formCreateInject.prop, {}, {
+        "props": {
+          value: this.trueValue
+        }
+      }, {
         "on": {
           "input": this.onInput
         }
       }]), [this.options().map(function (opt, index) {
         var props = _objectSpread2({}, opt);
         delete props.value;
-        return h("Radio", {
-          "props": _objectSpread2({}, props),
-          "key": '' + index + opt.value
-        });
+        return h("Radio", helper([{}, {
+          "props": props
+        }, {
+          "key": '' + index + '-' + opt.value
+        }]));
       }), getSlot(this.$slots)]);
     }
   };
@@ -925,10 +931,11 @@
       var options = ctx.props.formCreateInject.options;
       return h("Select", helper([{}, ctx.data]), [(Array.isArray(options) ? options : []).map(function (props, index) {
         var slot = props.slot;
-        return h("Option", {
-          "props": _objectSpread2({}, props),
-          "key": '' + index + props.value
-        }, [slot ? h("template", {
+        return h("Option", helper([{}, {
+          "props": props
+        }, {
+          "key": '' + index + '-' + props.value
+        }]), [slot ? h("template", {
           "slot": props.slotName || 'default'
         }, [is.Function(slot) ? props.slot(h) : slot]) : null]);
       }), ctx.children]);
@@ -1218,18 +1225,19 @@
         }
         return h("div", {
           "class": "_fc-upload"
-        }, [[this.formCreateInject.prop.props.showUploadList ? [] : this.makeFiles(), this.makeUpload()], h("Modal", {
-          "attrs": {
-            "title": this.modalTitle,
-            "footerHide": true
-          },
+        }, [[this.formCreateInject.prop.props.showUploadList ? [] : this.makeFiles(), this.makeUpload()], h("Modal", helper([{}, {
+          "props": {
+            title: this.modalTitle,
+            footerHide: true
+          }
+        }, {
           "model": {
             value: _this4.previewVisible,
             callback: function callback($$v) {
               _this4.previewVisible = $$v;
             }
           }
-        }, [h("img", {
+        }]), [h("img", {
           "attrs": {
             "alt": "example",
             "src": this.previewImage
@@ -1666,10 +1674,7 @@
               "span": button ? 20 : 24
             }
           }, [h("FormItem", [h(Type, helper([{
-            "key": key,
-            "attrs": {
-              "inFor": true
-            }
+            "key": key
           }, {
             "on": {
               'update:value': function updateValue(formData) {
@@ -1685,20 +1690,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("Col", {
-            "attrs": {
-              "span": 2,
-              "pull": 1,
-              "push": 1
+          }]))])]), button ? h("Col", helper([{}, {
+            "props": {
+              span: 2,
+              pull: 1,
+              push: 1
             }
-          }, [_this9.makeIcon(keys.length, index, key)]) : null]);
+          }]), [_this9.makeIcon(keys.length, index, key)]) : null]);
         })]);
       }
     };
@@ -1809,11 +1815,11 @@
           'emit-event': this.emitEvent,
           input: this.add$f
         }
-      }, {
-        "attrs": {
-          "rule": rule,
-          "option": options,
-          "extendOption": true
+      }, {}, {
+        "props": {
+          rule: rule,
+          option: options,
+          extendOption: true
         }
       }]));
     }
@@ -2566,7 +2572,6 @@
           h.getCtxs(field).forEach(function (ctx) {
             h.$render.clearCache(ctx);
             ctx.rule.value = copy(ctx.defaultValue);
-            h.refreshControl(ctx);
           });
         });
       },
@@ -2670,8 +2675,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;
       }
     });
   }
@@ -3703,6 +3711,7 @@
           if (_ret === "continue") continue;
         }
         if (!validate.length) return false;
+        var hideLst = [];
         var flag = false;
         this.deferSyncValue(function () {
           validate.reverse().forEach(function (_ref) {
@@ -3719,7 +3728,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;
@@ -3749,6 +3758,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;
@@ -4134,9 +4148,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) {
@@ -4597,7 +4613,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];
       }
@@ -4667,9 +4684,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) {
@@ -5832,7 +5853,7 @@
   function ivuFormCreate() {
     return FormCreateFactory({
       ui: "".concat("iview"),
-      version: "".concat("2.5.22"),
+      version: "".concat("2.5.25"),
       manager: manager,
       install: install,
       extendApi: extendApi,