@form-create/element-ui 2.5.11 → 2.5.12

package/dist/form-create.js

@@ -1,5 +1,5 @@
 /*!
- * @form-create/element-ui v2.5.11
+ * @form-create/element-ui v2.5.12
  * (c) 2018-2021 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
@@ -277,9 +277,15 @@
         trueValue: []
       };
     },
+    computed: {
+      options: function options() {
+        var opt = this.formCreateInject.options;
+        return Array.isArray(opt) ? opt : [];
+      }
+    },
     methods: {
       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 +296,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 +317,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';
@@ -864,9 +870,15 @@
         trueValue: []
       };
     },
+    computed: {
+      options: function options() {
+        var opt = this.formCreateInject.options;
+        return Array.isArray(opt) ? opt : [];
+      }
+    },
     methods: {
       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;
@@ -875,7 +887,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;
@@ -896,7 +908,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';
@@ -943,7 +955,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),
@@ -1350,7 +1363,8 @@
       return {
         len: 0,
         cacheRule: {},
-        cacheValue: {}
+        cacheValue: {},
+        type: undefined
       };
     },
     computed: {
@@ -1522,7 +1536,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;
         }
 
@@ -1591,6 +1605,7 @@
       }
     },
     created: function created() {
+      this.type = this.formCreateInject.form.$form();
       var d = (this.expand || 0) - this.value.length;
 
       if (d > 0) {
@@ -1607,6 +1622,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
@@ -1634,7 +1650,7 @@
           "attrs": {
             "span": button ? 20 : 24
           }
-        }, [h("ElFormItem", [h("FormCreate", helper([{
+        }, [h("ElFormItem", [h(Type, helper([{
           "key": key
         }, {
           "on": {
@@ -1666,9 +1682,6 @@
           }
         }, [_this9.makeIcon(keys.length, index, key)]) : null]);
       })]);
-    },
-    beforeMount: function beforeMount() {
-      this.$options.components.FormCreate = this.formCreateInject.form.$form();
     }
   };
 
@@ -1700,7 +1713,8 @@
     data: function data() {
       return {
         cacheRule: {},
-        cacheValue: {}
+        cacheValue: {},
+        type: undefined
       };
     },
     watch: {
@@ -1762,13 +1776,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,
@@ -1781,9 +1797,6 @@
           "extendOption": true
         }
       }]));
-    },
-    beforeMount: function beforeMount() {
-      this.$options.components.FormCreate = this.formCreateInject.form.$form();
     }
   };
 
@@ -3045,6 +3058,9 @@
           on: {
             'hook:mounted': function hookMounted() {
               _this8.onMounted(ctx);
+            },
+            'fc.sub-form': function fcSubForm(subForm) {
+              _this8.$handle.addSubForm(ctx, subForm);
             }
           }
         }];
@@ -4922,9 +4938,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 = {};
@@ -4989,6 +5003,10 @@
 
     function $form() {
       return _vue.extend($FormCreate(FormCreate));
+    }
+
+    function $vnode() {
+      return _vue.extend(fragment);
     } //todo 检查回调函数作用域
 
 
@@ -5131,7 +5149,7 @@
         component: component,
         directive: directive,
         register: register,
-        fragment: _fragment,
+        $vnode: $vnode,
         parser: parser,
         use: use,
         factory: factory,
@@ -5185,7 +5203,7 @@
           useAttr($formCreate);
           Vue.prototype.$formCreate = $formCreate;
           Vue.component('FormCreate', $form());
-          Vue.component('FcFragment', _fragment);
+          Vue.component('FcFragment', $vnode());
         }
       });
     }
@@ -5534,7 +5552,8 @@
           _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.id,
           rules: rule.validate
@@ -5558,7 +5577,7 @@
       var infoProp = rule.info;
       var isTip = isTooltip(infoProp);
       var form = this.options.form;
-      var children = [titleProp.title + (form.labelSuffix || form['label-suffix'] || '')];
+      var children = [(titleProp.title || '') + (form.labelSuffix || form['label-suffix'] || '')];
 
       var titleFn = function titleFn(pop) {
         return _this.$r(mergeProps([titleProp, {
@@ -6004,7 +6023,7 @@
   function elmFormCreate() {
     return FormCreateFactory({
       ui: "".concat("element-ui"),
-      version: "".concat("2.5.11"),
+      version: "".concat("2.5.12"),
       manager: manager,
       extendApi: extendApi,
       install: install,