@form-create/element-ui 2.5.10 → 2.5.14

package/dist/form-create.js

@@ -1,5 +1,5 @@
 /*!
- * @form-create/element-ui v2.5.10
+ * @form-create/element-ui v2.5.14
  * (c) 2018-2021 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
@@ -268,6 +268,12 @@
       type: String
     },
     watch: {
+      'formCreateInject.options': {
+        handler: function handler() {
+          this.update();
+        },
+        deep: true
+      },
       value: function value() {
         this.update();
       }
@@ -278,8 +284,12 @@
       };
     },
     methods: {
+      options: function options() {
+        var opt = this.formCreateInject.options;
+        return Array.isArray(opt) ? opt : [];
+      },
       onInput: function onInput(n) {
-        this.$emit('input', this.formCreateInject.options.filter(function (opt) {
+        this.$emit('input', this.options().filter(function (opt) {
           return n.indexOf(opt.label) !== -1;
         }).map(function (opt) {
           return opt.value;
@@ -290,7 +300,7 @@
       update: function update() {
         var _this = this;
 
-        this.trueValue = this.value ? this.formCreateInject.options.filter(function (opt) {
+        this.trueValue = this.value ? this.options().filter(function (opt) {
           return _this.value.indexOf(opt.value) !== -1;
         }).map(function (option) {
           return option.label;
@@ -311,7 +321,7 @@
         "on": {
           "input": this.onInput
         }
-      }]), [this.formCreateInject.options.map(function (opt, index) {
+      }]), [this.options().map(function (opt, index) {
         var props = _objectSpread2({}, opt);
 
         var Type = _this2.type === 'button' ? 'ElCheckboxButton' : 'ElCheckbox';
@@ -677,10 +687,6 @@
         })]);
       },
       handleClick: function handleClick(src) {
-        if (this.disabled) {
-          return;
-        }
-
         return this.onHandle(src);
       },
       handleRemove: function handleRemove(src) {
@@ -859,6 +865,12 @@
       type: String
     },
     watch: {
+      'formCreateInject.options': {
+        handler: function handler() {
+          this.update();
+        },
+        deep: true
+      },
       value: function value() {
         this.update();
       }
@@ -869,8 +881,12 @@
       };
     },
     methods: {
+      options: function options() {
+        var opt = this.formCreateInject.options;
+        return Array.isArray(opt) ? opt : [];
+      },
       onInput: function onInput(n) {
-        this.$emit('input', this.formCreateInject.options.filter(function (opt) {
+        this.$emit('input', this.options().filter(function (opt) {
           return opt.label === n;
         }).reduce(function (initial, opt) {
           return opt.value;
@@ -879,7 +895,7 @@
       update: function update() {
         var _this = this;
 
-        this.trueValue = this.formCreateInject.options.filter(function (opt) {
+        this.trueValue = this.options().filter(function (opt) {
           return opt.value === _this.value;
         }).reduce(function (initial, opt) {
           return opt.label;
@@ -900,7 +916,7 @@
         "on": {
           "input": this.onInput
         }
-      }]), [this.formCreateInject.options.map(function (opt, index) {
+      }]), [this.options().map(function (opt, index) {
         var props = _objectSpread2({}, opt);
 
         var Type = _this2.type === 'button' ? 'ElRadioButton' : 'ElRadio';
@@ -947,7 +963,8 @@
       }
     },
     render: function render(h, ctx) {
-      return h("ElSelect", helper([{}, ctx.data]), [ctx.props.formCreateInject.options.map(function (props, index) {
+      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),
@@ -1136,10 +1153,6 @@
         this.$refs.upload.handleRemove(file);
       },
       handleClick: function handleClick(file) {
-        if (this.isDisabled()) {
-          return;
-        }
-
         this.onHandle(file);
       },
       makeItem: function makeItem(file, index) {
@@ -1358,7 +1371,8 @@
       return {
         len: 0,
         cacheRule: {},
-        cacheValue: {}
+        cacheValue: {},
+        type: undefined
       };
     },
     computed: {
@@ -1530,7 +1544,7 @@
         this.addRule(i, true);
       },
       del: function del(index, key) {
-        if (this.disabled || false === this.onBeforeRemove(this.value)) {
+        if (this.disabled || false === this.onBeforeRemove(this.value, index)) {
           return;
         }
 
@@ -1599,6 +1613,7 @@
       }
     },
     created: function created() {
+      this.type = this.formCreateInject.form.$form();
       var d = (this.expand || 0) - this.value.length;
 
       if (d > 0) {
@@ -1615,6 +1630,7 @@
       var h = arguments[0];
       var keys = Object.keys(this.cacheRule);
       var button = this.button;
+      var Type = this.type;
       return keys.length === 0 ? this.$scopedSlots["default"] ? this.$scopedSlots["default"]({
         vm: this,
         add: this.add
@@ -1642,7 +1658,7 @@
           "attrs": {
             "span": button ? 20 : 24
           }
-        }, [h("ElFormItem", [h("FormCreate", helper([{
+        }, [h("ElFormItem", [h(Type, helper([{
           "key": key
         }, {
           "on": {
@@ -1674,9 +1690,6 @@
           }
         }, [_this9.makeIcon(keys.length, index, key)]) : null]);
       })]);
-    },
-    beforeMount: function beforeMount() {
-      this.$options.components.FormCreate = this.formCreateInject.form.$form();
     }
   };
 
@@ -1708,7 +1721,8 @@
     data: function data() {
       return {
         cacheRule: {},
-        cacheValue: {}
+        cacheValue: {},
+        type: undefined
       };
     },
     watch: {
@@ -1770,13 +1784,15 @@
     },
     created: function created() {
       this.addRule();
+      this.type = this.formCreateInject.form.$form();
     },
     render: function render() {
       var h = arguments[0];
       var _this$cacheRule = this.cacheRule,
           rule = _this$cacheRule.rule,
           options = _this$cacheRule.options;
-      return h("FormCreate", helper([{}, {
+      var Type = this.type;
+      return h(Type, helper([{}, {
         "on": {
           'update:value': this.formData,
           'emit-event': this.emitEvent,
@@ -1789,9 +1805,6 @@
           "extendOption": true
         }
       }]));
-    },
-    beforeMount: function beforeMount() {
-      this.$options.components.FormCreate = this.formCreateInject.form.$form();
     }
   };
 
@@ -1916,6 +1929,7 @@
         Object.keys(this.formCreate.prop).forEach(function (k) {
           extend(_this2.$options[k], _this2.formCreate.prop[k]);
         });
+        this.$emit('beforeCreate', this.formCreate.api());
       }
     };
   }
@@ -1991,11 +2005,25 @@
 
   var keyAttrs = ['type', 'slot', 'emitPrefix', 'value', 'name', 'native', 'hidden', 'display', 'inject', 'options', 'emit', 'nativeEmit', 'link', 'prefix', 'suffix', 'update', 'sync', 'optionsTo', 'key'];
   var arrayAttrs = ['validate', 'children', 'control'];
-  var normalAttrs = ['effect'];
+  var normalAttrs = ['effect', 'deep'];
   function attrs() {
     return [].concat(keyAttrs, _toConsumableArray(normalMerge$1), _toConsumableArray(toArrayMerge$1), _toConsumableArray(functionalMerge$1), arrayAttrs, normalAttrs);
   }
 
+  function format(type, msg, rule) {
+    return "[form-create ".concat(type, "]: ").concat(msg) + (rule ? '\n\nrule: ' + JSON.stringify(rule.getRule ? rule.getRule() : rule) : '');
+  }
+  function tip(msg, rule) {
+    console.warn(format('tip', msg, rule));
+  }
+  function err(msg, rule) {
+    console.error(format('err', msg, rule));
+  }
+  function logError(e) {
+    err(e.toString());
+    console.error(e);
+  }
+
   function deepExtend(origin) {
     var target = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     var mode = arguments.length > 2 ? arguments[2] : undefined;
@@ -2046,23 +2074,10 @@
     }).value;
   }
 
-  function format(type, msg, rule) {
-    return "[form-create ".concat(type, "]: ").concat(msg) + (rule ? '\n\nrule: ' + JSON.stringify(rule.getRule ? rule.getRule() : rule) : '');
-  }
-  function tip(msg, rule) {
-    console.warn(format('tip', msg, rule));
-  }
-  function err(msg, rule) {
-    console.error(format('err', msg, rule));
-  }
-  function logError(e) {
-    err(e.toString());
-    console.error(e);
-  }
-
   var PREFIX = '[[FORM-CREATE-PREFIX-';
   var SUFFIX = '-FORM-CREATE-SUFFIX]]';
   var $T = '$FN:';
+  var $TX = '$FNX:';
   var FUNCTION = 'function';
   function toJson(obj, space) {
     return JSON.stringify(deepExtend([], obj, true), function (key, val) {
@@ -2087,7 +2102,7 @@
   }
 
   function parseFn(fn, mode) {
-    if (fn && is.String(fn)) {
+    if (fn && is.String(fn) && fn.length > 4) {
       var v = fn.trim();
       var flag = false;
 
@@ -2098,8 +2113,8 @@
         } else if (v.indexOf($T) === 0) {
           v = v.replace($T, '');
           flag = true;
-        } else if (v.indexOf('$FNX:') === 0) {
-          v = makeFn('function($inject){' + v.replace('$FNX:', '') + '}');
+        } else if (v.indexOf($TX) === 0) {
+          v = makeFn('function($inject){' + v.replace($TX, '') + '}');
           v.__json = fn;
           v.__inject = true;
           return v;
@@ -2112,7 +2127,7 @@
         val.__json = fn;
         return val;
       } catch (e) {
-        err("\u89E3\u6790\u5931\u8D25:".concat(v));
+        err("\u89E3\u6790\u5931\u8D25:".concat(v, "\n\nerr: ").concat(e));
         return undefined;
       }
     }
@@ -2135,11 +2150,11 @@
     };
   } //todo 优化位置
 
-  function copyRule(rule, mode) {
-    return copyRules([rule], mode || false)[0];
+  function copyRule(rule) {
+    return copyRules([rule])[0];
   }
-  function copyRules(rules, mode) {
-    return deepExtend([], _toConsumableArray(rules), mode || false);
+  function copyRules(rules) {
+    return parseJson(toJson(rules));
   }
   function mergeRule(rule, merge) {
     mergeProps(Array.isArray(merge) ? merge : [merge], rule, {
@@ -2203,7 +2218,7 @@
         to;
     (idx || '').split('.').forEach(function (v) {
       if (to) {
-        if (!_data[to]) {
+        if (!_data[to] || _typeof(_data[to]) != 'object') {
           _data[to] = {};
         }
 
@@ -2301,13 +2316,6 @@
     return deepCopy(value);
   }
 
-  function byRules(ctxs, origin) {
-    return Object.keys(ctxs).reduce(function (initial, key) {
-      initial[key] = origin ? ctxs[key].origin : ctxs[key].rule;
-      return initial;
-    }, {});
-  }
-
   function Api(h) {
     function tidyFields(fields) {
       if (is.Undef(fields)) fields = h.fields();else if (!Array.isArray(fields)) fields = [fields];
@@ -2316,10 +2324,10 @@
 
     function props(fields, key, val) {
       tidyFields(fields).forEach(function (field) {
-        var ctx = h.getCtx(field);
-        if (!ctx) return;
-        $set(ctx.rule, key, val);
-        h.$render.clearCache(ctx);
+        h.getCtxs(field).forEach(function (ctx) {
+          $set(ctx.rule, key, val);
+          h.$render.clearCache(ctx);
+        });
       });
     }
 
@@ -2334,11 +2342,6 @@
     }
 
     var api = {
-      helper: {
-        tidyFields: tidyFields,
-        props: props
-      },
-
       get config() {
         return h.options;
       },
@@ -2365,23 +2368,26 @@
 
       formData: function formData(fields) {
         return tidyFields(fields).reduce(function (initial, id) {
-          var ctx = h.fieldCtx[id];
+          var ctx = h.getFieldCtx(id);
           if (!ctx) return initial;
           initial[ctx.field] = copy(ctx.rule.value);
           return initial;
         }, copy(h.appendData));
       },
       getValue: function getValue(field) {
-        var ctx = h.fieldCtx[field];
+        var ctx = h.getFieldCtx(field);
         if (!ctx) return;
         return copy(ctx.rule.value);
       },
       coverValue: function coverValue(formData) {
         h.deferSyncValue(function () {
-          Object.keys(h.fieldCtx).forEach(function (key) {
-            var ctx = h.fieldCtx[key];
-            if (!ctx) return h.appendData[key] = formData[key];
-            ctx.rule.value = hasProperty(formData, key) ? formData[key] : undefined;
+          api.fields().forEach(function (key) {
+            var ctxs = h.fieldCtx[key];
+            if (!ctxs) return h.appendData[key] = formData[key];
+            var flag = hasProperty(formData, key);
+            ctxs.forEach(function (ctx) {
+              ctx.rule.value = flag ? formData[key] : undefined;
+            });
           });
         });
       },
@@ -2390,17 +2396,22 @@
         if (arguments.length >= 2) formData = _defineProperty({}, field, arguments[1]);
         h.deferSyncValue(function () {
           Object.keys(formData).forEach(function (key) {
-            var ctx = h.fieldCtx[key];
-            if (!ctx) return h.appendData[key] = formData[key];
-            ctx.rule.value = formData[key];
+            var ctxs = h.fieldCtx[key];
+            if (!ctxs) return h.appendData[key] = formData[key];
+            ctxs.forEach(function (ctx) {
+              ctx.rule.value = formData[key];
+            });
           });
         });
       },
       removeField: function removeField(field) {
         var ctx = h.getCtx(field);
-        if (!ctx) return;
-        ctx.rm();
-        return ctx.origin;
+        h.deferSyncValue(function () {
+          h.getCtxs(field).forEach(function (ctx) {
+            ctx.rm();
+          });
+        }, true);
+        return ctx ? ctx.origin : undefined;
       },
       removeRule: function removeRule(rule) {
         var ctx = rule && byCtx(rule);
@@ -2416,10 +2427,8 @@
         return h.fields();
       },
       append: function append(rule, after, child) {
-        var fields = Object.keys(h.fieldCtx),
-            index = h.sort.length - 1,
+        var index = h.sort.length - 1,
             rules;
-        if (rule.field && fields.indexOf(rule.field) > -1) return err("".concat(rule.field, " \u5B57\u6BB5\u5DF2\u5B58\u5728"), rule);
         var ctx = h.getCtx(after);
 
         if (ctx) {
@@ -2435,10 +2444,8 @@
         rules.splice(index + 1, 0, rule);
       },
       prepend: function prepend(rule, after, child) {
-        var fields = Object.keys(h.fieldCtx),
-            index = 0,
+        var index = 0,
             rules;
-        if (rule.field && fields.indexOf(rule.field) > -1) return err("".concat(rule.field, " \u5B57\u6BB5\u5DF2\u5B58\u5728"), rule);
         var ctx = h.getCtx(after);
 
         if (ctx) {
@@ -2472,17 +2479,33 @@
       },
       disabled: function disabled(_disabled, fields) {
         tidyFields(fields).forEach(function (field) {
-          var ctx = h.fieldCtx[field];
-          if (!ctx) return;
-          $set(ctx.rule.props, 'disabled', !!_disabled);
+          h.getCtxs(field).forEach(function (ctx) {
+            $set(ctx.rule.props, 'disabled', !!_disabled);
+          });
         });
         h.refresh();
       },
+      all: function all(origin) {
+        return Object.keys(h.ctxs).map(function (k) {
+          var ctx = h.ctxs[k];
+          return origin ? ctx.origin : ctx.rule;
+        });
+      },
       model: function model(origin) {
-        return byRules(h.fieldCtx, origin);
+        return h.fields().reduce(function (initial, key) {
+          var ctx = h.fieldCtx[key][0];
+          initial[key] = origin ? ctx.origin : ctx.rule;
+          return initial;
+        }, {});
       },
       component: function component(origin) {
-        return byRules(h.nameCtx, origin);
+        return Object.keys(h.nameCtx).reduce(function (initial, key) {
+          var ctx = h.nameCtx[key].map(function (ctx) {
+            return origin ? ctx.origin : ctx.rule;
+          });
+          initial[key] = ctx.length === 1 ? ctx[0] : ctx;
+          return initial;
+        }, {});
       },
       bind: function bind() {
         return api.form;
@@ -2500,25 +2523,39 @@
         });
       },
       sync: function sync(field) {
-        var ctx = is.Object(field) ? byCtx(field) : h.getCtx(field);
+        if (Array.isArray(field)) {
+          field.forEach(function (v) {
+            return api.sync(v);
+          });
+          return;
+        }
 
-        if (ctx && !ctx.deleted) {
-          var subForm = h.subForm[field];
+        var ctxs = is.Object(field) ? byCtx(field) : h.getCtxs(field);
 
-          if (subForm) {
-            if (Array.isArray(subForm)) {
-              subForm.forEach(function (form) {
-                form.refresh();
-              });
-            } else if (subForm) {
-              subForm.refresh();
-            }
-          } //ctx.updateKey(true);
+        if (!ctxs) {
+          return;
+        }
 
+        ctxs = Array.isArray(ctxs) ? ctxs : [ctxs];
+        ctxs.forEach(function (ctx) {
+          if (!ctx.deleted) {
+            var subForm = h.subForm[ctx.id];
 
-          h.$render.clearCache(ctx);
-          h.refresh();
-        }
+            if (subForm) {
+              if (Array.isArray(subForm)) {
+                subForm.forEach(function (form) {
+                  form.refresh();
+                });
+              } else if (subForm) {
+                subForm.refresh();
+              }
+            } //ctx.updateKey(true);
+
+
+            h.$render.clearCache(ctx);
+          }
+        });
+        h.refresh();
       },
       refresh: function refresh() {
         allSubForm().forEach(function (sub) {
@@ -2541,8 +2578,9 @@
         h.changeStatus = false;
       },
       updateRule: function updateRule(id, rule) {
-        var r = api.getRule(id);
-        r && extend(r, rule);
+        h.getCtxs(id).forEach(function (ctx) {
+          extend(ctx.rule, rule);
+        });
       },
       updateRules: function updateRules(rules) {
         Object.keys(rules).forEach(function (id) {
@@ -2550,8 +2588,9 @@
         });
       },
       mergeRule: function mergeRule$1(id, rule) {
-        var ctx = h.getCtx(id);
-        ctx && mergeRule(ctx.rule, rule);
+        h.getCtxs(id).forEach(function (ctx) {
+          mergeRule(ctx.rule, rule);
+        });
       },
       mergeRules: function mergeRules(rules) {
         Object.keys(rules).forEach(function (id) {
@@ -2584,13 +2623,12 @@
         api.refresh();
       },
       resetFields: function resetFields(fields) {
-        var ctxs = h.fieldCtx;
         tidyFields(fields).forEach(function (field) {
-          var ctx = ctxs[field];
-          if (!ctx) return;
-          h.$render.clearCache(ctx);
-          ctx.rule.value = copy(ctx.defaultValue);
-          h.refreshControl(ctx);
+          h.getCtxs(field).forEach(function (ctx) {
+            h.$render.clearCache(ctx);
+            ctx.rule.value = copy(ctx.defaultValue);
+            h.refreshControl(ctx);
+          });
         });
       },
       method: function method(id, name) {
@@ -2630,7 +2668,8 @@
         el && el.$emit && el.$emit('close-modal');
       },
       getSubForm: function getSubForm(field) {
-        return h.subForm[field];
+        var ctx = h.getCtx(field);
+        return ctx ? h.subForm[ctx.id] : undefined;
       },
       nextTick: function nextTick(fn) {
         h.bus.$once('next-tick', fn);
@@ -2639,13 +2678,26 @@
       nextRefresh: function nextRefresh(fn) {
         h.nextRefresh();
         fn && invoke(fn);
+      },
+      emit: function emit(name) {
+        var _h$vm;
+
+        for (var _len3 = arguments.length, args = new Array(_len3 > 1 ? _len3 - 1 : 0), _key3 = 1; _key3 < _len3; _key3++) {
+          args[_key3 - 1] = arguments[_key3];
+        }
+
+        (_h$vm = h.vm).$emit.apply(_h$vm, [name].concat(args));
+      },
+      helper: {
+        tidyFields: tidyFields,
+        props: props
       }
     };
     ['on', 'once', 'off', 'set'].forEach(function (n) {
       api[n] = function () {
-        var _h$vm;
+        var _h$vm2;
 
-        (_h$vm = h.vm)["$".concat(n)].apply(_h$vm, arguments);
+        (_h$vm2 = h.vm)["$".concat(n)].apply(_h$vm2, arguments);
       };
     });
     api.changeValue = api.changeField = api.setValue;
@@ -2769,7 +2821,7 @@
 
         var vm = rule.vm;
         if (!vm) return new _vue();else if (is.Function(vm)) return invoke(function () {
-          return vm(_this3.$handle.getInjectData(rule));
+          return rule.vm(_this3.$handle.getInjectData(rule));
         });else if (!vm._isVue) return new _vue(vm);
         return vm;
       },
@@ -2785,6 +2837,14 @@
           deepSet(ctx.prop, ctx.prop.optionsTo, ctx.prop.options);
         }
       },
+      deepSet: function deepSet$1(ctx) {
+        var deep = ctx.rule.deep;
+        deep && Object.keys(deep).sort(function (a, b) {
+          return a.length < b.length ? -1 : 1;
+        }).forEach(function (str) {
+          deepSet(ctx.prop, str, deep[str]);
+        });
+      },
       setTempProps: function setTempProps(vm, ctx) {
         if (!vm.$props) return;
         var prop = ctx.prop;
@@ -2852,12 +2912,17 @@
         return ctx.rule.slot === slot ? this.renderCtx(ctx) : undefined;
       },
       renderId: function renderId(name, type) {
-        var ctx = this.$handle[type === 'field' ? 'nameCtx' : 'fieldCtx'][name];
-        return ctx ? this.renderCtx(ctx, ctx.parent) : undefined;
+        var _this5 = this;
+
+        var ctxs = this.$handle[type === 'field' ? 'fieldCtx' : 'nameCtx'][name];
+        return ctxs ? ctxs.map(function (ctx) {
+          return _this5.renderCtx(ctx, ctx.parent);
+        }) : undefined;
       },
       renderCtx: function renderCtx(ctx, parent) {
         if (ctx.type === 'hidden') return;
         var rule = ctx.rule;
+        var preview = this.options.preview || false;
 
         if (!this.cache[ctx.id] || this.cache[ctx.id].slot !== rule.slot) {
           var vn;
@@ -2879,6 +2944,7 @@
             ctx.initProp();
             this.mergeGlobal(ctx);
             this.$manager.tidyRule(ctx);
+            this.deepSet(ctx);
             this.setOptions(ctx);
             this.ctxProp(ctx);
             var prop = ctx.prop;
@@ -2907,11 +2973,13 @@
                 vn = this.vm.$scopedSlots[slot]({
                   rule: rule,
                   prop: prop,
+                  preview: preview,
                   children: children,
+                  api: this.$handle.api,
                   model: prop.model || {}
                 });
               } else {
-                vn = ctx.parser.render(children, ctx);
+                vn = preview ? ctx.parser.preview(children, ctx) : ctx.parser.render(children, ctx);
               }
             }
 
@@ -2938,13 +3006,13 @@
         return this.getCache(ctx);
       },
       display: function display(vn) {
-        var _this5 = this;
+        var _this6 = this;
 
         if (Array.isArray(vn)) {
           var data = [];
           vn.forEach(function (v) {
-            if (Array.isArray(v)) return _this5.display(v);
-            if (_this5.none(v)) data.push(v);
+            if (Array.isArray(v)) return _this6.display(v);
+            if (_this6.none(v)) data.push(v);
           });
           return data;
         } else {
@@ -2973,22 +3041,29 @@
         }, [vn]);
       },
       injectProp: function injectProp(ctx) {
-        var _this6 = this;
+        var _this7 = this;
 
         if (!this.vm.ctxInject[ctx.id]) {
-          $set(this.vm.ctxInject, ctx.id, {});
+          $set(this.vm.ctxInject, ctx.id, {
+            api: this.$handle.api,
+            form: this.fc.create,
+            subForm: function subForm(_subForm) {
+              _this7.$handle.addSubForm(ctx, _subForm);
+            },
+            options: [],
+            children: [],
+            prop: {},
+            preview: false,
+            field: ctx.field,
+            rule: ctx.rule
+          });
         }
 
-        extend(this.vm.ctxInject[ctx.id], {
-          api: this.$handle.api,
-          form: this.fc.create,
-          subForm: function subForm(_subForm) {
-            _this6.$handle.addSubForm(ctx, _subForm);
-          },
-          field: ctx.field,
+        var inject = this.vm.ctxInject[ctx.id];
+        extend(inject, {
+          preview: this.options.preview || false,
           options: ctx.prop.options,
           children: ctx.rule.children,
-          rule: ctx.rule,
           prop: function () {
             var temp = _objectSpread2({}, ctx.prop);
 
@@ -2997,10 +3072,10 @@
             return temp;
           }()
         });
-        return this.vm.ctxInject[ctx.id];
+        return inject;
       },
       ctxProp: function ctxProp(ctx, custom) {
-        var _this7 = this;
+        var _this8 = this;
 
         var ref = ctx.ref,
             key = ctx.key,
@@ -3013,7 +3088,10 @@
           slot: undefined,
           on: {
             'hook:mounted': function hookMounted() {
-              _this7.onMounted(ctx);
+              _this8.onMounted(ctx);
+            },
+            'fc.sub-form': function fcSubForm(subForm) {
+              _this8.$handle.addSubForm(ctx, subForm);
             }
           }
         }];
@@ -3023,9 +3101,9 @@
             model: {
               value: this.$handle.getFormData(ctx),
               callback: function callback(value) {
-                _this7.onInput(ctx, value);
+                _this8.onInput(ctx, value);
               },
-              expression: "formData.".concat(ctx.field)
+              expression: "formData.".concat(ctx.id)
             }
           });
         }
@@ -3047,13 +3125,13 @@
         this.$handle.onInput(ctx, value);
       },
       renderChildren: function renderChildren(ctx) {
-        var _this8 = this;
+        var _this9 = this;
 
         var children = ctx.rule.children,
             orgChildren = this.orgChildren[ctx.id];
 
         var isRm = function isRm(child) {
-          return !is.String(child) && child.__fc__ && !_this8.$handle.ctxs[child.__fc__.id];
+          return !is.String(child) && child.__fc__ && !_this9.$handle.ctxs[child.__fc__.id];
         };
 
         if (!is.trueArray(children) && orgChildren) {
@@ -3062,7 +3140,7 @@
               if (!child) return;
 
               if (isRm(child)) {
-                _this8.$handle.rmCtx(child.__fc__);
+                _this9.$handle.rmCtx(child.__fc__);
               }
             });
           });
@@ -3075,7 +3153,7 @@
             if (!child) return;
 
             if (children.indexOf(child) === -1 && isRm(child)) {
-              _this8.$handle.rmCtx(child.__fc__);
+              _this9.$handle.rmCtx(child.__fc__);
             }
           });
         });
@@ -3084,14 +3162,14 @@
           if (is.String(child)) return child;
 
           if (child.__fc__) {
-            return _this8.renderCtx(child.__fc__, ctx);
+            return _this9.renderCtx(child.__fc__, ctx);
           }
 
-          if (!_this8.$handle.isRepeatRule(child.__origin__ || child) && child.type) {
-            _this8.vm.$nextTick(function () {
-              _this8.$handle.loadChildren(children, ctx);
+          if (child.type) {
+            _this9.vm.$nextTick(function () {
+              _this9.$handle.loadChildren(children, ctx);
 
-              _this8.$handle.refresh();
+              _this9.$handle.refresh();
             });
           }
         });
@@ -3103,7 +3181,7 @@
         return this.vNode.make(lower(ctx.originType), prop, children);
       },
       renderRule: function renderRule(rule, children, origin) {
-        var _this9 = this;
+        var _this10 = this;
 
         if (!rule) return undefined;
         if (is.String(rule)) return rule;
@@ -3126,7 +3204,7 @@
 
         if (is.trueArray(rule.children)) {
           data.push(rule.children.map(function (v) {
-            return _this9.renderRule(v);
+            return _this10.renderRule(v);
           }));
         }
 
@@ -3160,7 +3238,6 @@
   function useInject(Handler) {
     extend(Handler.prototype, {
       parseInjectEvent: function parseInjectEvent(rule, on) {
-        if (rule.inject === false) return;
         var inject = rule.inject || this.options.injectEvent;
         return this.parseEventLst(rule, on, inject);
       },
@@ -3177,13 +3254,16 @@
         return data;
       },
       parseEvent: function parseEvent(rule, fn, inject, deep) {
-        if (is.Function(fn) && (!is.Undef(inject) || fn.__inject)) {
+        if (is.Function(fn) && (inject !== false && !is.Undef(inject) || fn.__inject)) {
           return this.inject(rule, fn, inject);
         } else if (!deep && Array.isArray(fn) && fn[0] && (is.String(fn[0]) || is.Function(fn[0]))) {
           return this.parseEventLst(rule, fn, inject, true);
         } else if (is.String(fn)) {
           var val = parseFn(fn);
-          return is.String(val) ? val : this.parseEvent(rule, val, inject, true);
+
+          if (val && fn !== val) {
+            return val.__inject ? this.parseEvent(rule, val, inject, true) : val;
+          }
         }
       },
       parseEmit: function parseEmit(ctx, on) {
@@ -3246,6 +3326,7 @@
             option = _this$vm$$options$pro.option,
             rule = _this$vm$$options$pro.rule;
         return {
+          api: this.api,
           $f: this.api,
           rule: rule,
           self: self.__origin__,
@@ -3503,7 +3584,7 @@
           extend(_this2, {
             root: []
           });
-        });
+        }, _this2.input);
       });
     },
     update: function update(handle, init) {
@@ -3561,7 +3642,7 @@
       loadFn: function loadFn(item, rule) {
         var _this3 = this;
 
-        ['on', 'props', 'nativeOn'].forEach(function (k) {
+        ['on', 'props', 'nativeOn', 'deep'].forEach(function (k) {
           item[k] && _this3.parseInjectEvent(rule, item[k]);
         });
       },
@@ -3588,9 +3669,6 @@
           }, {})
         }], ctx.computed);
       },
-      isRepeatRule: function isRepeatRule(rule) {
-        return this.repeatRule.indexOf(rule) > -1;
-      },
       loadRule: function loadRule() {
         var _this5 = this;
 
@@ -3674,7 +3752,7 @@
           var rule = getRule(_rule);
 
           var isRepeat = function isRepeat() {
-            return !!(rule.field && _this6.fieldCtx[rule.field] && _this6.fieldCtx[rule.field] !== _rule.__fc__);
+            return !!(rule.field && _this6.fieldCtx[rule.field] && _this6.fieldCtx[rule.field][0] !== _rule.__fc__);
           };
 
           _this6.ruleEffect(rule, 'init', {
@@ -3682,11 +3760,7 @@
           });
 
           if (isRepeat()) {
-            _this6.repeatRule.push(_rule);
-
             _this6.vm.$emit('repeat-field', _rule, _this6.api);
-
-            return err("".concat(rule.field, " \u5B57\u6BB5\u5DF2\u5B58\u5728"), _rule);
           }
 
           var ctx;
@@ -3792,14 +3866,17 @@
             return val === control.value;
           };
 
+          if (!is.trueArray(control.rule)) return "continue";
+
           var data = _objectSpread2(_objectSpread2({}, control), {}, {
             valid: invoke(function () {
               return handleFn(ctx.rule.value, api);
             }),
-            ctrl: findCtrl(ctx, control.rule)
+            ctrl: findCtrl(ctx, control.rule),
+            isHidden: is.String(control.rule[0])
           });
 
-          if (data.valid && data.ctrl || !data.valid && !data.ctrl) return "continue";
+          if (data.valid && data.ctrl || !data.valid && !data.ctrl && !data.isHidden) return "continue";
           validate.push(data);
         };
 
@@ -3811,53 +3888,56 @@
 
         if (!validate.length) return false;
         var flag = false;
-        validate.reverse().forEach(function (_ref) {
-          var valid = _ref.valid,
-              rule = _ref.rule,
-              prepend = _ref.prepend,
-              append = _ref.append,
-              child = _ref.child,
-              ctrl = _ref.ctrl;
-
-          if (is.String(rule[0])) {
-            valid ? ctx.ctrlRule.push({
-              __ctrl: true,
-              children: rule,
-              valid: valid
-            }) : ctx.ctrlRule.splice(ctx.ctrlRule.indexOf(ctrl), 1);
-
-            _this7.vm.$nextTick(function () {
-              _this7.api.hidden(!valid, rule);
-            });
+        this.deferSyncValue(function () {
+          validate.reverse().forEach(function (_ref) {
+            var isHidden = _ref.isHidden,
+                valid = _ref.valid,
+                rule = _ref.rule,
+                prepend = _ref.prepend,
+                append = _ref.append,
+                child = _ref.child,
+                ctrl = _ref.ctrl;
+
+            if (isHidden) {
+              valid ? ctx.ctrlRule.push({
+                __ctrl: true,
+                children: rule,
+                valid: valid
+              }) : ctx.ctrlRule.splice(ctx.ctrlRule.indexOf(ctrl), 1);
+
+              _this7.vm.$nextTick(function () {
+                _this7.api.hidden(!valid, rule);
+              });
 
-            return;
-          }
+              return;
+            }
 
-          if (valid) {
-            flag = true;
-            var ruleCon = {
-              type: 'fcFragment',
-              "native": true,
-              __ctrl: true,
-              children: rule
-            };
-            ctx.ctrlRule.push(ruleCon);
-
-            _this7.bus.$once('load-start', function () {
-              // this.cycleLoad = true;
-              if (prepend) {
-                api.prepend(ruleCon, prepend, child);
-              } else if (append || child) {
-                api.append(ruleCon, append || ctx.id, child);
-              } else {
-                ctx.root.splice(ctx.root.indexOf(ctx.origin) + 1, 0, ruleCon);
-              }
-            });
-          } else {
-            ctx.ctrlRule.splice(ctx.ctrlRule.indexOf(ctrl), 1);
-            var ctrlCtx = byCtx(ctrl);
-            ctrlCtx && ctrlCtx.rm();
-          }
+            if (valid) {
+              flag = true;
+              var ruleCon = {
+                type: 'fcFragment',
+                "native": true,
+                __ctrl: true,
+                children: rule
+              };
+              ctx.ctrlRule.push(ruleCon);
+
+              _this7.bus.$once('load-start', function () {
+                // this.cycleLoad = true;
+                if (prepend) {
+                  api.prepend(ruleCon, prepend, child);
+                } else if (append || child) {
+                  api.append(ruleCon, append || ctx.id, child);
+                } else {
+                  ctx.root.splice(ctx.root.indexOf(ctx.origin) + 1, 0, ruleCon);
+                }
+              });
+            } else {
+              ctx.ctrlRule.splice(ctx.ctrlRule.indexOf(ctrl), 1);
+              var ctrlCtx = byCtx(ctrl);
+              ctrlCtx && ctrlCtx.rm();
+            }
+          });
         });
         this.vm.$emit('control', ctx.origin, this.api);
         this.effect(ctx, 'control');
@@ -3893,6 +3973,7 @@
         this.refresh();
         this.bus.$off('next-tick', this.nextReload);
         this.bus.$once('next-tick', this.nextReload);
+        this.vm.$emit('update', this.api);
       },
       //todo 组件生成全部通过 alias
       refresh: function refresh() {
@@ -3928,7 +4009,7 @@
   function useInput(Handler) {
     extend(Handler.prototype, {
       getValue: function getValue(ctx) {
-        if (!hasProperty(ctx, 'cacheValue')) {
+        if (is.Undef(ctx.cacheValue)) {
           ctx.cacheValue = ctx.parser.toValue(this.getFormData(ctx), ctx);
         }
 
@@ -3954,18 +4035,19 @@
         }
       },
       setFormData: function setFormData(ctx, value) {
-        $set(this.formData, ctx.field, value);
+        $set(this.formData, ctx.id, value);
       },
       getFormData: function getFormData(ctx) {
-        return this.formData[ctx.field];
+        return this.formData[ctx.id];
       },
       validate: function validate() {
         var _this = this;
 
         toEmpty(this.vm.validate);
-        Object.keys(this.fieldCtx).forEach(function (id) {
-          var ctx = _this.fieldCtx[id];
-          _this.vm.validate[ctx.field] = toArray(ctx.rule.validate);
+        this.fields().forEach(function (id) {
+          _this.fieldCtx[id].forEach(function (ctx) {
+            _this.vm.validate[ctx.id] = toArray(ctx.rule.validate);
+          });
         });
         return this.vm.validate;
       },
@@ -3973,8 +4055,8 @@
         var _this2 = this;
 
         toEmpty(this.form);
-        Object.defineProperties(this.form, Object.keys(this.formData).reduce(function (initial, field) {
-          var ctx = _this2.getCtx(field);
+        Object.defineProperties(this.form, this.fields().reduce(function (initial, field) {
+          var ctx = _this2.getFieldCtx(field);
 
           var handle = _this2.valueHandle(ctx);
 
@@ -4018,14 +4100,18 @@
       },
       addSubForm: function addSubForm(ctx, subForm) {
         if (ctx.input) {
-          this.subForm[ctx.field] = subForm;
+          this.subForm[ctx.id] = subForm;
         }
       },
-      deferSyncValue: function deferSyncValue(fn) {
+      deferSyncValue: function deferSyncValue(fn, sync) {
         if (!this.deferSyncFn) {
           this.deferSyncFn = fn;
         }
 
+        if (!this.deferSyncFn.sync) {
+          this.deferSyncFn.sync = sync;
+        }
+
         invoke(fn);
 
         if (this.deferSyncFn === fn) {
@@ -4052,11 +4138,9 @@
       refreshUpdate: function refreshUpdate(ctx, val) {
         var _this4 = this;
 
-        var fn = ctx.rule.update;
-
-        if (is.Function(fn)) {
+        if (is.Function(ctx.rule.update)) {
           var state = invoke(function () {
-            return fn(val, ctx.origin, _this4.api);
+            return ctx.rule.update(val, ctx.origin, _this4.api);
           });
           if (state === undefined) return;
           ctx.rule.hidden = state === true;
@@ -4070,6 +4154,7 @@
         if (this.refreshControl(ctx)) {
           this.$render.clearCacheAll();
           this.loadRule();
+          this.vm.$emit('update', this.api);
           this.refresh();
         }
 
@@ -4092,7 +4177,7 @@
         });
       },
       fields: function fields() {
-        return Object.keys(this.formData);
+        return Object.keys(this.fieldCtx);
       }
     });
   }
@@ -4103,49 +4188,6 @@
     });
   }
 
-  function useHelper(rules) {
-    if (!Array.isArray(rules) || rules.findField) return;
-    Object.defineProperties(rules, {
-      findField: enumerable(findField),
-      findName: enumerable(findName),
-      setValue: enumerable(setValue)
-    });
-  }
-
-  function find(field, name, origin) {
-    if (!this.length) return;
-    var children = [];
-
-    for (var i = 0; i < this.length; i++) {
-      if (!is.Object(this[i])) continue;
-      var rule = getRule(this[i]);
-      if (rule[name] === field) return origin ? rule : this[i];
-      if (is.trueArray(rule.children)) children = children.concat(rule.children);
-      is.trueArray(rule.control) && rule.control.forEach(function (r) {
-        children = children.concat(r.rule);
-      });
-    }
-
-    return find.call(children, field, name, origin);
-  }
-
-  function findField(field) {
-    return find.call(this, field, 'field');
-  }
-
-  function findName(field) {
-    return find.call(this, field, 'name');
-  }
-
-  function setValue(formData) {
-    var _this = this;
-
-    Object.keys(formData).forEach(function (field) {
-      var rule = find.call(_this, field, 'field', true);
-      if (rule) rule.value = formData[field];
-    });
-  }
-
   var BaseParser = {
     init: function init(ctx) {},
     toFormValue: function toFormValue(value, ctx) {
@@ -4158,13 +4200,46 @@
     render: function render(children, ctx) {
       return ctx.$render.defaultRender(ctx, children);
     },
+    preview: function preview(children, ctx) {
+      return ctx.$render.defaultRender(ctx, children);
+    },
     mergeProp: function mergeProp(ctx) {}
   };
 
   function useContext(Handler) {
     extend(Handler.prototype, {
       getCtx: function getCtx(id) {
-        return this.fieldCtx[id] || this.nameCtx[id] || this.ctxs[id];
+        return this.getFieldCtx(id) || this.getNameCtx(id)[0] || this.ctxs[id];
+      },
+      getCtxs: function getCtxs(id) {
+        return this.fieldCtx[id] || this.nameCtx[id] || (this.ctxs[id] ? [this.ctxs[id]] : []);
+      },
+      setIdCtx: function setIdCtx(ctx, key, type) {
+        var field = "".concat(type, "Ctx");
+
+        if (!this[field][key]) {
+          this[field][key] = [ctx];
+        } else {
+          this[field][key].push(ctx);
+        }
+      },
+      rmIdCtx: function rmIdCtx(ctx, key, type) {
+        var field = "".concat(type, "Ctx");
+        var lst = this[field][key];
+        if (!lst) return false;
+        var flag = lst.splice(lst.indexOf(ctx) >>> 0, 1).length > 0;
+
+        if (!lst.length) {
+          delete this[field][key];
+        }
+
+        return flag;
+      },
+      getFieldCtx: function getFieldCtx(field) {
+        return (this.fieldCtx[field] || [])[0];
+      },
+      getNameCtx: function getNameCtx(name) {
+        return this.nameCtx[name] || [];
       },
       setCtx: function setCtx(ctx) {
         var id = ctx.id,
@@ -4172,9 +4247,9 @@
             name = ctx.name,
             rule = ctx.rule;
         this.ctxs[id] = ctx;
-        if (name) $set(this.nameCtx, name, ctx);
+        name && this.setIdCtx(ctx, name, 'name');
         if (!ctx.input) return;
-        this.fieldCtx[field] = ctx;
+        this.setIdCtx(ctx, field, 'field');
         this.setFormData(ctx, ctx.parser.toFormValue(rule.value, ctx));
 
         if (this.isMounted && !this.reloading) {
@@ -4233,7 +4308,7 @@
             if (key === 'link') {
               ctx.link();
               return;
-            } else if (['props', 'on', 'nativeOn'].indexOf(key) > -1) {
+            } else if (['props', 'on', 'nativeOn', 'deep'].indexOf(key) > -1) {
               _this.parseInjectEvent(ctx.rule, n || {});
 
               if (key === 'props' && ctx.input) {
@@ -4254,6 +4329,8 @@
                 }
 
                 _flag && _this.loadChildren(n, ctx);
+
+                _this.vm.$emit('update', _this.api);
               });
             }
 
@@ -4280,6 +4357,7 @@
         if (ctx.deleted) return;
         var id = ctx.id,
             field = ctx.field,
+            input = ctx.input,
             name = ctx.name;
 
         if (ctx.input) {
@@ -4293,40 +4371,26 @@
         $del(this.$render.tempList, id);
         $del(this.$render.orgChildren, id);
         $del(this.vm.ctxInject, id);
+        $del(this.formData, id);
+        $del(this.subForm, id);
         $del(ctx, 'cacheValue');
-        var f = this.fieldCtx[field];
-        var flag = false;
-
-        if (field && (!f || f === ctx)) {
-          $del(this.formData, field);
-          $del(this.form, field);
-          $del(this.fieldCtx, field);
-          $del(this.subForm, field);
-          flag = true;
-        }
-
-        if (name && this.nameCtx[name] === ctx) {
-          $del(this.nameCtx, name);
-        }
-
-        if (!this.reloading) {
-          if (ctx.parser.loadChildren !== false) {
-            this.deferSyncValue(function () {
+        input && this.rmIdCtx(ctx, field, 'field');
+        name && this.rmIdCtx(ctx, name, 'name');
+        this.deferSyncValue(function () {
+          if (!_this3.reloading) {
+            if (ctx.parser.loadChildren !== false) {
               if (is.trueArray(ctx.rule.children)) {
                 ctx.rule.children.forEach(function (h) {
                   return h.__fc__ && _this3.rmCtx(h.__fc__);
                 });
               }
+            }
 
-              _this3.syncValue();
-            });
-          }
-
-          if (ctx.root === this.rules) {
-            this.vm._renderRule();
+            if (ctx.root === _this3.rules) {
+              _this3.vm._renderRule();
+            }
           }
-        }
-
+        }, input);
         var index = this.sort.indexOf(id);
 
         if (index > -1) {
@@ -4336,7 +4400,7 @@
         this.$render.clearCache(ctx);
         ctx["delete"]();
         this.effect(ctx, 'deleted');
-        flag && this.vm.$emit('removeField', field, ctx.rule, this.api);
+        input && !this.fieldCtx[field] && this.vm.$emit('removeField', field, ctx.rule, this.api);
         ctx.rule.__ctrl || this.vm.$emit('removeRule', ctx.rule, this.api);
         return ctx;
       }
@@ -4541,14 +4605,12 @@
   extend(Handler.prototype, {
     initData: function initData(rules) {
       extend(this, {
-        fieldCtx: {},
         ctxs: {},
+        fieldCtx: {},
         nameCtx: {},
         sort: [],
-        rules: rules,
-        repeatRule: []
+        rules: rules
       });
-      useHelper(rules);
     },
     init: function init() {
       this.appendData = _objectSpread2(_objectSpread2(_objectSpread2({}, this.fc.options.formData || {}), this.vm.value || {}), this.appendData);
@@ -4804,6 +4866,11 @@
 
   function run(inject, rule, api) {
     var option = inject.value;
+
+    if (is.Function(option)) {
+      option = option(rule, api);
+    }
+
     option = parseOpt(option);
 
     if (!option || !option.action) {
@@ -4914,9 +4981,7 @@
 
 
   function FormCreateFactory(config) {
-    var _fragment = _vue.extend(fragment);
-
-    var components = _defineProperty({}, fragment.name, _fragment);
+    var components = _defineProperty({}, fragment.name, fragment);
 
     var parsers = {};
     var directives = {};
@@ -4981,6 +5046,10 @@
 
     function $form() {
       return _vue.extend($FormCreate(FormCreate));
+    }
+
+    function $vnode() {
+      return _vue.extend(fragment);
     } //todo 检查回调函数作用域
 
 
@@ -5102,6 +5171,7 @@
       },
       created: function created() {
         this.$handle.init();
+        this.vm.$emit('created', this.api());
       },
       api: function api() {
         return this.$handle.api;
@@ -5123,7 +5193,7 @@
         component: component,
         directive: directive,
         register: register,
-        fragment: _fragment,
+        $vnode: $vnode,
         parser: parser,
         use: use,
         factory: factory,
@@ -5177,7 +5247,7 @@
           useAttr($formCreate);
           Vue.prototype.$formCreate = $formCreate;
           Vue.component('FormCreate', $form());
-          Vue.component('FcFragment', _fragment);
+          Vue.component('FcFragment', $vnode());
         }
       });
     }
@@ -5526,9 +5596,10 @@
           _col = _this$rule$props.col;
       var item = isFalse(rule.wrap.show) ? children : this.$r(mergeProps([rule.wrap, {
         props: _objectSpread2(_objectSpread2({
-          labelWidth: labelWidth === void 0 ? labelWidth : toString(labelWidth)
+          labelWidth: labelWidth === void 0 ? labelWidth : toString(labelWidth),
+          label: isTitle ? rule.title.title : undefined
         }, rule.wrap || {}), {}, {
-          prop: ctx.field,
+          prop: ctx.id,
           rules: rule.validate
         }),
         "class": rule.className,
@@ -5544,32 +5615,13 @@
       return !(!title.title && !title["native"] || isFalse(title.show));
     },
     makeInfo: function makeInfo(rule, uni) {
-      var _this = this;
-
       var titleProp = rule.title;
       var infoProp = rule.info;
       var isTip = isTooltip(infoProp);
       var form = this.options.form;
-      var children = [titleProp.title + (form.labelSuffix || form['label-suffix'] || '')];
-
-      var titleFn = function titleFn(pop) {
-        return _this.$r(mergeProps([titleProp, {
-          props: titleProp,
-          slot: titleProp.slot || (pop ? isTip ? 'default' : 'reference' : 'label'),
-          key: "".concat(uni, "tit"),
-          type: titleProp.type || 'span'
-        }]), children);
-      };
-
-      if (!isFalse(infoProp.show) && (infoProp.info || infoProp["native"])) {
-        if (infoProp.icon !== false) {
-          children[infoProp.align !== 'left' ? 'unshift' : 'push'](this.$r({
-            type: 'i',
-            "class": infoProp.icon === true ? 'el-icon-warning' : infoProp.icon,
-            key: "".concat(uni, "i")
-          }));
-        }
+      var children = [(titleProp.title || '') + (form.labelSuffix || form['label-suffix'] || '')];
 
+      if (!isFalse(infoProp.show) && (infoProp.info || infoProp["native"]) && !isFalse(infoProp.icon)) {
         var prop = {
           type: infoProp.type || 'popover',
           props: _objectSpread2({}, infoProp),
@@ -5582,10 +5634,20 @@
           prop.props[field] = infoProp.info;
         }
 
-        return this.$r(mergeProps([infoProp, prop]), [titleFn(true)]);
+        children[infoProp.align !== 'left' ? 'unshift' : 'push'](this.$r(mergeProps([infoProp, prop]), [this.$r({
+          type: 'i',
+          slot: isTip ? 'default' : 'reference',
+          "class": infoProp.icon === true ? 'el-icon-warning' : infoProp.icon,
+          key: "".concat(uni, "i")
+        })]));
       }
 
-      return titleFn();
+      return this.$r(mergeProps([titleProp, {
+        props: titleProp,
+        slot: titleProp.slot || 'label',
+        key: "".concat(uni, "tit"),
+        type: titleProp.type || 'span'
+      }]), children);
     },
     makeCol: function makeCol(rule, uni, children) {
       var col = rule.col;
@@ -5635,7 +5697,7 @@
       }, [item]);
     },
     makeResetBtn: function makeResetBtn() {
-      var _this2 = this;
+      var _this = this;
 
       var resetBtn = this.options.resetBtn;
       return this.$r({
@@ -5646,7 +5708,7 @@
         },
         on: {
           click: function click() {
-            var fApi = _this2.$handle.api;
+            var fApi = _this.$handle.api;
             resetBtn.click ? resetBtn.click(fApi) : fApi.resetFields();
           }
         },
@@ -5654,7 +5716,7 @@
       }, [resetBtn.innerText]);
     },
     makeSubmitBtn: function makeSubmitBtn() {
-      var _this3 = this;
+      var _this2 = this;
 
       var submitBtn = this.options.submitBtn;
       return this.$r({
@@ -5665,7 +5727,7 @@
         },
         on: {
           click: function click() {
-            var fApi = _this3.$handle.api;
+            var fApi = _this2.$handle.api;
             submitBtn.click ? submitBtn.click(fApi) : fApi.submit();
           }
         },
@@ -5818,13 +5880,14 @@
         }
       },
       validateField: function validateField(field, callback) {
-        if (!h.fieldCtx[field]) return;
-        var sub = h.subForm[field];
+        var ctx = h.getFieldCtx(field);
+        if (!ctx) return;
+        var sub = h.subForm[ctx.id];
         var len = 0;
         var flag;
 
         var validate = function validate() {
-          h.$manager.validateField(field, function () {
+          h.$manager.validateField(ctx.id, function () {
             for (var _len3 = arguments.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
               args[_key3] = arguments[_key3];
             }
@@ -5874,23 +5937,25 @@
         var clearSub = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
         api.helper.tidyFields(fields).forEach(function (field) {
           if (clearSub) _this.clearSubValidateState(field);
-          var ctx = h.fieldCtx[field];
-          if (!ctx) return;
-          h.$manager.clearValidateState(ctx);
+          h.getCtxs(field).forEach(function (ctx) {
+            h.$manager.clearValidateState(ctx);
+          });
         });
       },
       clearSubValidateState: function clearSubValidateState(fields) {
         api.helper.tidyFields(fields).forEach(function (field) {
-          var subForm = h.subForm[field];
-          if (!subForm) return;
+          h.getCtxs(field).forEach(function (ctx) {
+            var subForm = h.subForm[ctx.id];
+            if (!subForm) return;
 
-          if (Array.isArray(subForm)) {
-            subForm.forEach(function (form) {
-              form.clearValidateState();
-            });
-          } else if (subForm) {
-            subForm.clearValidateState();
-          }
+            if (Array.isArray(subForm)) {
+              subForm.forEach(function (form) {
+                form.clearValidateState();
+              });
+            } else if (subForm) {
+              subForm.clearValidateState();
+            }
+          });
         });
       },
       btn: {
@@ -5993,7 +6058,7 @@
   function elmFormCreate() {
     return FormCreateFactory({
       ui: "".concat("element-ui"),
-      version: "".concat("2.5.10"),
+      version: "".concat("2.5.14"),
       manager: manager,
       extendApi: extendApi,
       install: install,