@form-create/view-design 2.5.11 → 2.5.15

package/dist/form-create.js

@@ -1,5 +1,5 @@
 /*!
- * @form-create/view-design v2.5.11
+ * @form-create/view-design v2.5.15
  * (c) 2018-2021 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
@@ -267,6 +267,12 @@
       }
     },
     watch: {
+      'formCreateInject.options': {
+        handler: function handler() {
+          this.update();
+        },
+        deep: true
+      },
       value: function value() {
         this.update();
       }
@@ -277,8 +283,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;
@@ -289,7 +299,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;
@@ -308,7 +318,7 @@
         "on": {
           "input": this.onInput
         }
-      }]), [this.formCreateInject.options.map(function (opt, index) {
+      }]), [this.options().map(function (opt, index) {
         var props = _objectSpread2({}, opt);
 
         delete props.value;
@@ -831,6 +841,12 @@
       value: {}
     },
     watch: {
+      'formCreateInject.options': {
+        handler: function handler() {
+          this.update();
+        },
+        deep: true
+      },
       value: function value() {
         this.update();
       }
@@ -841,8 +857,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;
@@ -851,7 +871,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;
@@ -870,7 +890,7 @@
         "on": {
           "input": this.onInput
         }
-      }]), [this.formCreateInject.options.map(function (opt, index) {
+      }]), [this.options().map(function (opt, index) {
         var props = _objectSpread2({}, opt);
 
         delete props.value;
@@ -916,7 +936,8 @@
       }
     },
     render: function render(h, ctx) {
-      return h("Select", helper([{}, ctx.data]), [ctx.props.formCreateInject.options.map(function (props, index) {
+      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),
@@ -1320,7 +1341,8 @@
         return {
           len: 0,
           cacheRule: {},
-          cacheValue: {}
+          cacheValue: {},
+          type: undefined
         };
       },
       computed: {
@@ -1492,7 +1514,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;
           }
 
@@ -1565,6 +1587,7 @@
         }
       },
       created: function created() {
+        this.type = this.formCreateInject.form.$form();
         var d = (this.expand || 0) - this.value.length;
 
         if (d > 0) {
@@ -1581,6 +1604,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
@@ -1610,7 +1634,7 @@
             "attrs": {
               "span": button ? 20 : 24
             }
-          }, [h("FormItem", [h("FormCreate", helper([{
+          }, [h("FormItem", [h(Type, helper([{
             "key": key
           }, {
             "on": {
@@ -1642,9 +1666,6 @@
             }
           }, [_this9.makeIcon(keys.length, index, key)]) : null]);
         })]);
-      },
-      beforeMount: function beforeMount() {
-        this.$options.components.FormCreate = this.formCreateInject.form.$form();
       }
     };
   }
@@ -1686,7 +1707,8 @@
     data: function data() {
       return {
         cacheRule: {},
-        cacheValue: {}
+        cacheValue: {},
+        type: undefined
       };
     },
     watch: {
@@ -1748,13 +1770,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,
@@ -1767,9 +1791,6 @@
           "extendOption": true
         }
       }]));
-    },
-    beforeMount: function beforeMount() {
-      this.$options.components.FormCreate = this.formCreateInject.form.$form();
     }
   };
 
@@ -1894,6 +1915,7 @@
         Object.keys(this.formCreate.prop).forEach(function (k) {
           extend(_this2.$options[k], _this2.formCreate.prop[k]);
         });
+        this.$emit('beforeCreate', this.formCreate.api());
       }
     };
   }
@@ -1974,6 +1996,20 @@
     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;
@@ -2002,14 +2038,18 @@
           }
 
           origin[key] = deepExtend(origin[key], clone, mode);
-        } else if (is.Undef(clone)) {
-          $set(origin, key, clone);
-        } else if (clone.__json !== undefined) {
-          $set(origin, key, clone.__json);
-        } else if (clone.__origin !== undefined) {
-          $set(origin, key, clone.__origin);
         } else {
           $set(origin, key, clone);
+
+          if (!is.Undef(clone)) {
+            if (clone.__json !== undefined) {
+              origin[key].__json = clone.__json;
+            }
+
+            if (clone.__origin !== undefined) {
+              origin[key].__origin = clone.__origin;
+            }
+          }
         }
       }
     }
@@ -2024,20 +2064,6 @@
     }).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:';
@@ -2114,8 +2140,8 @@
     };
   } //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);
@@ -2306,11 +2332,6 @@
     }
 
     var api = {
-      helper: {
-        tidyFields: tidyFields,
-        props: props
-      },
-
       get config() {
         return h.options;
       },
@@ -2454,6 +2475,12 @@
         });
         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 h.fields().reduce(function (initial, key) {
           var ctx = h.fieldCtx[key][0];
@@ -2641,13 +2668,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;
@@ -2872,6 +2912,7 @@
       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;
@@ -2922,12 +2963,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);
               }
             }
 
@@ -2992,20 +3034,26 @@
         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
+          });
         }
 
         var inject = this.vm.ctxInject[ctx.id];
         extend(inject, {
-          api: this.$handle.api,
-          form: this.fc.create,
-          subForm: function subForm(_subForm) {
-            _this7.$handle.addSubForm(ctx, _subForm);
-          },
-          field: ctx.field,
+          preview: this.options.preview || false,
           options: ctx.prop.options,
           children: ctx.rule.children,
-          rule: ctx.rule,
           prop: function () {
             var temp = _objectSpread2({}, ctx.prop);
 
@@ -3031,6 +3079,9 @@
           on: {
             'hook:mounted': function hookMounted() {
               _this8.onMounted(ctx);
+            },
+            'fc.sub-form': function fcSubForm(subForm) {
+              _this8.$handle.addSubForm(ctx, subForm);
             }
           }
         }];
@@ -3912,6 +3963,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() {
@@ -3947,7 +3999,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);
         }
 
@@ -4071,7 +4123,7 @@
         return JSON.stringify(ctx.rule.value) !== JSON.stringify(value);
       },
       isQuote: function isQuote(ctx, value) {
-        return (is.Object(value) || Array.isArray(value)) && value === ctx.rule.value;
+        return value === ctx.rule.value || is.Object(value) || Array.isArray(value) || is.Function(value);
       },
       refreshUpdate: function refreshUpdate(ctx, val) {
         var _this4 = this;
@@ -4092,6 +4144,7 @@
         if (this.refreshControl(ctx)) {
           this.$render.clearCacheAll();
           this.loadRule();
+          this.vm.$emit('update', this.api);
           this.refresh();
         }
 
@@ -4137,6 +4190,9 @@
     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) {}
   };
 
@@ -4263,6 +4319,8 @@
                 }
 
                 _flag && _this.loadChildren(n, ctx);
+
+                _this.vm.$emit('update', _this.api);
               });
             }
 
@@ -4798,6 +4856,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) {
@@ -4908,9 +4971,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 = {};
@@ -4975,6 +5036,10 @@
 
     function $form() {
       return _vue.extend($FormCreate(FormCreate));
+    }
+
+    function $vnode() {
+      return _vue.extend(fragment);
     } //todo 检查回调函数作用域
 
 
@@ -5096,6 +5161,7 @@
       },
       created: function created() {
         this.$handle.init();
+        this.vm.$emit('created', this.api());
       },
       api: function api() {
         return this.$handle.api;
@@ -5117,7 +5183,7 @@
         component: component,
         directive: directive,
         register: register,
-        fragment: _fragment,
+        $vnode: $vnode,
         parser: parser,
         use: use,
         factory: factory,
@@ -5126,6 +5192,7 @@
         copyRules: copyRules,
         fetch: fetch,
         $form: $form,
+        parseFn: parseFn,
         parseJson: parseJson,
         toJson: toJson,
         init: function init(rules) {
@@ -5171,7 +5238,7 @@
           useAttr($formCreate);
           Vue.prototype.$formCreate = $formCreate;
           Vue.component('FormCreate', $form());
-          Vue.component('FcFragment', _fragment);
+          Vue.component('FcFragment', $vnode());
         }
       });
     }
@@ -5560,34 +5627,12 @@
       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 children = [titleProp.title];
 
-      var titleFn = function titleFn(pop) {
-        return _this.$r(mergeProps([titleProp, {
-          props: titleProp,
-          slot: titleProp.slot || (pop ? 'default' : '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: 'icon',
-            props: {
-              type: infoProp.icon === true ? iviewConfig.infoIcon : infoProp.icon,
-              size: 16
-            },
-            style: 'margin-top: -1px',
-            key: "".concat(uni, "i")
-          }));
-        }
-
+      if (!isFalse(infoProp.show) && (infoProp.info || infoProp["native"]) && !isFalse(infoProp.icon)) {
         var prop = {
           type: infoProp.type || 'poptip',
           props: _objectSpread2({}, infoProp),
@@ -5600,10 +5645,23 @@
           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: 'icon',
+          props: {
+            type: infoProp.icon === true ? iviewConfig.infoIcon : infoProp.icon,
+            size: 16
+          },
+          style: 'margin-top: -1px',
+          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;
@@ -6033,7 +6091,7 @@
   function ivuFormCreate() {
     return FormCreateFactory({
       ui: "".concat("view-design"),
-      version: "".concat("2.5.11"),
+      version: "".concat("2.5.15"),
       manager: manager,
       install: install,
       extendApi: extendApi,