@form-create/iview 2.5.17 → 2.5.18

package/dist/form-create.js

@@ -1,5 +1,5 @@
 /*!
- * @form-create/iview v2.5.17
+ * @form-create/iview v2.5.18
  * (c) 2018-2022 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
@@ -401,8 +401,8 @@
           "default": 500
         },
         height: {
-          type: [Number, String],
-          "default": 370
+          type: String,
+          "default": '370px'
         },
         maxLength: {
           type: Number,
@@ -686,6 +686,7 @@
           try {
             if (this.helper === true) {
               iframe['form_create_helper'] = {
+                api: this.formCreateInject.api,
                 close: function close(field) {
                   _this7.valid(field);
 
@@ -778,17 +779,14 @@
             }
           }
         }, [h("img", {
+          "style": "width: 100%",
           "attrs": {
-            "alt": "example",
             "src": this.previewImage
-          },
-          "style": "width: 100%"
-        })]), h("Modal", helper([{}, {
-          "props": _objectSpread2({
-            width: width,
-            title: title
-          }, this.modal)
-        }, {
+          }
+        })]), h("Modal", helper([{}, _objectSpread2({
+          width: width,
+          title: title
+        }, this.modal), {
           "on": {
             "on-cancel": function onCancel() {
               return _this9.closeModel(true);
@@ -914,9 +912,28 @@
     },
     trueArray: function trueArray(data) {
       return Array.isArray(data) && data.length > 0;
+    },
+    Function: function Function(v) {
+      var type = this.getType(v);
+      return type === 'Function' || type === 'AsyncFunction';
+    },
+    getType: function getType(v) {
+      var str = Object.prototype.toString.call(v);
+      return /^\[object (.*)\]$/.exec(str)[1];
+    },
+    empty: function empty(value) {
+      if (value === undefined || value === null) {
+        return true;
+      }
+
+      if (Array.isArray(value) && Array.isArray(value) && !value.length) {
+        return true;
+      }
+
+      return typeof value === 'string' && !value;
     }
   };
-  ['Date', 'Object', 'Function', 'String', 'Boolean', 'Array', 'Number'].forEach(function (t) {
+  ['Date', 'Object', 'String', 'Boolean', 'Array', 'Number'].forEach(function (t) {
     is[t] = function (arg) {
       return is.type(arg, t);
     };
@@ -1289,6 +1306,81 @@
     imgUpIcon: 'image'
   });
 
+  function $set(target, field, value) {
+    Vue.set(target, field, value);
+  }
+  function $del(target, field) {
+    Vue["delete"](target, field);
+  }
+
+  function deepExtend(origin) {
+    var target = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    var mode = arguments.length > 2 ? arguments[2] : undefined;
+    var isArr = false;
+
+    for (var key in target) {
+      if (Object.prototype.hasOwnProperty.call(target, key)) {
+        var clone = target[key];
+
+        if ((isArr = Array.isArray(clone)) || is.Object(clone)) {
+          var nst = origin[key] === undefined;
+
+          if (isArr) {
+            isArr = false;
+            nst && $set(origin, key, []);
+          } else if (clone._clone && mode !== undefined) {
+            if (mode) {
+              clone = clone.getRule();
+              nst && $set(origin, key, {});
+            } else {
+              $set(origin, key, clone._clone());
+              continue;
+            }
+          } else {
+            nst && $set(origin, key, {});
+          }
+
+          origin[key] = deepExtend(origin[key], clone, mode);
+        } else {
+          $set(origin, key, clone);
+
+          if (!is.Undef(clone)) {
+            if (!is.Undef(clone.__json)) {
+              origin[key].__json = clone.__json;
+            }
+
+            if (!is.Undef(clone.__origin)) {
+              origin[key].__origin = clone.__origin;
+            }
+          }
+        }
+      }
+    }
+
+    return mode !== undefined && Array.isArray(origin) ? origin.filter(function (v) {
+      return !v || !v.__ctrl;
+    }) : origin;
+  }
+  function deepCopy(value) {
+    return deepExtend({}, {
+      value: value
+    }).value;
+  }
+
+  var _extends$1 = Object.assign || function (a) {
+    for (var b, c = 1; c < arguments.length; c++) {
+      for (var d in b = arguments[c], b) {
+        Object.prototype.hasOwnProperty.call(b, d) && $set(a, d, b[d]);
+      }
+    }
+
+    return a;
+  };
+
+  function extend() {
+    return _extends$1.apply(this, arguments);
+  }
+
   var NAME$6 = 'fcGroup';
   function createGroup(config) {
     return {
@@ -1321,6 +1413,7 @@
             return [];
           }
         },
+        defaultValue: Object,
         disabled: {
           type: Boolean,
           "default": false
@@ -1466,7 +1559,13 @@
             submitBtn: false,
             resetBtn: false
           };
-          options.formData = this.field ? _defineProperty({}, this.field, this._value(this.value[i])) : this.value[i] || {};
+
+          if (this.defaultValue) {
+            if (!options.formData) options.formData = {};
+            var defVal = deepCopy(this.defaultValue);
+            extend(options.formData, this.field ? _defineProperty({}, this.field, defVal) : defVal);
+          }
+
           this.$set(this.cacheRule, ++this.len, {
             rule: rule,
             options: options
@@ -1483,6 +1582,7 @@
 
           this.cacheRule[key].$f = $f;
           this.subForm();
+          this.formData(key, $f.formData());
           this.$nextTick(function () {
             if (_this4.syncDisabled) {
               $f.disabled(_this4.disabled);
@@ -1659,6 +1759,7 @@
             }
           }, {
             "attrs": {
+              "value": _this9.field ? _defineProperty({}, _this9.field, _this9._value(_this9.value[index])) : _this9.value[index],
               "rule": rule,
               "option": options,
               "extendOption": true
@@ -1801,27 +1902,6 @@
 
   var components = [Checkbox, Radio, Select, Tree, Sub, frame, upload, group];
 
-  function $set(target, field, value) {
-    Vue.set(target, field, value);
-  }
-  function $del(target, field) {
-    Vue["delete"](target, field);
-  }
-
-  var _extends$1 = Object.assign || function (a) {
-    for (var b, c = 1; c < arguments.length; c++) {
-      for (var d in b = arguments[c], b) {
-        Object.prototype.hasOwnProperty.call(b, d) && $set(a, d, b[d]);
-      }
-    }
-
-    return a;
-  };
-
-  function extend() {
-    return _extends$1.apply(this, arguments);
-  }
-
   var NAME$8 = 'FormCreate';
   function $FormCreate(FormCreate) {
     return {
@@ -1853,7 +1933,8 @@
         },
         extendOption: Boolean,
         value: Object,
-        api: Object
+        api: Object,
+        name: String
       },
       data: function data() {
         return {
@@ -2015,60 +2096,6 @@
     console.error(e);
   }
 
-  function deepExtend(origin) {
-    var target = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-    var mode = arguments.length > 2 ? arguments[2] : undefined;
-    var isArr = false;
-
-    for (var key in target) {
-      if (Object.prototype.hasOwnProperty.call(target, key)) {
-        var clone = target[key];
-
-        if ((isArr = Array.isArray(clone)) || is.Object(clone)) {
-          var nst = origin[key] === undefined;
-
-          if (isArr) {
-            isArr = false;
-            nst && $set(origin, key, []);
-          } else if (clone._clone && mode !== undefined) {
-            if (mode) {
-              clone = clone.getRule();
-              nst && $set(origin, key, {});
-            } else {
-              $set(origin, key, clone._clone());
-              continue;
-            }
-          } else {
-            nst && $set(origin, key, {});
-          }
-
-          origin[key] = deepExtend(origin[key], clone, mode);
-        } else {
-          $set(origin, key, clone);
-
-          if (!is.Undef(clone)) {
-            if (!is.Undef(clone.__json)) {
-              origin[key].__json = clone.__json;
-            }
-
-            if (!is.Undef(clone.__origin)) {
-              origin[key].__origin = clone.__origin;
-            }
-          }
-        }
-      }
-    }
-
-    return mode !== undefined && Array.isArray(origin) ? origin.filter(function (v) {
-      return !v || !v.__ctrl;
-    }) : origin;
-  }
-  function deepCopy(value) {
-    return deepExtend({}, {
-      value: value
-    }).value;
-  }
-
   var PREFIX = '[[FORM-CREATE-PREFIX-';
   var SUFFIX = '-FORM-CREATE-SUFFIX]]';
   var $T = '$FN:';
@@ -2442,7 +2469,7 @@
       disabled: function disabled(_disabled, fields) {
         tidyFields(fields).forEach(function (field) {
           h.getCtxs(field).forEach(function (ctx) {
-            $set(ctx.rule.props, 'disabled', !!_disabled);
+            ctx.rule.props && $set(ctx.rule.props, 'disabled', !!_disabled);
           });
         });
         h.refresh();
@@ -3109,15 +3136,13 @@
         }];
 
         if (!custom && ctx.input) {
-          props.push({
-            model: {
-              value: this.$handle.getFormData(ctx),
-              callback: function callback(value) {
-                _this8.onInput(ctx, value);
-              },
-              expression: "formData.".concat(ctx.id)
-            }
-          });
+          ctx.prop.model = {
+            value: this.$handle.getFormData(ctx),
+            callback: function callback(value) {
+              _this8.onInput(ctx, value);
+            },
+            expression: "formData.".concat(ctx.id)
+          };
         }
 
         mergeProps(props, ctx.prop);
@@ -4036,7 +4061,7 @@
         this.setFormData(ctx, formValue);
         this.syncValue();
         this.valueChange(ctx, value);
-        this.vm.$emit('change', ctx.field, value, ctx.origin, this.api, setFlag);
+        this.vm.$emit('change', ctx.field, value, ctx.origin, this.api, setFlag || false);
         this.effect(ctx, 'value');
       },
       onInput: function onInput(ctx, value) {
@@ -4047,7 +4072,7 @@
         }
       },
       setFormData: function setFormData(ctx, value) {
-        $set(this.formData, ctx.id, value);
+        $set(this.formData, ctx.id, value === null ? undefined : value);
       },
       getFormData: function getFormData(ctx) {
         return this.formData[ctx.id];
@@ -4301,7 +4326,7 @@
         var vm = this.vm;
         var none = ['field', 'value', 'vm', 'template', 'name', 'config', 'control', 'inject', 'sync', 'payload', 'optionsTo', 'update'];
         Object.keys(ctx.rule).filter(function (k) {
-          return k[0] !== '_' && none.indexOf(k) === -1;
+          return k[0] !== '_' && k[0] !== '$' && none.indexOf(k) === -1;
         }).forEach(function (key) {
           var flag = key === 'children';
           ctx.watch.push(vm.$watch(function () {
@@ -4486,10 +4511,21 @@
         var _this3 = this;
 
         var vm = this.vm;
+        var effect = {};
         Object.keys(ctx.rule.effect || {}).forEach(function (k) {
-          ctx.watch.push(vm.$watch(function () {
+          effect[k] = function () {
             return ctx.rule.effect[k];
-          }, function (n) {
+          };
+        });
+        Object.keys(ctx.rule).forEach(function (k) {
+          if (k[0] === '$') {
+            effect[k.substr(1)] = function () {
+              return ctx.rule[k];
+            };
+          }
+        });
+        Object.keys(effect || {}).forEach(function (k) {
+          ctx.watch.push(vm.$watch(effect[k], function (n) {
             _this3.effect(ctx, 'watch', _defineProperty({}, k, n));
           }, {
             deep: true
@@ -4513,7 +4549,12 @@
         }, event);
       },
       getEffect: function getEffect(rule, name) {
-        if (hasProperty(rule, 'effect') && hasProperty(rule.effect, name)) return rule.effect[name];else return undefined;
+        if (hasProperty(rule, '$' + name)) {
+          return rule['$' + name];
+        }
+
+        if (hasProperty(rule, 'effect') && hasProperty(rule.effect, name)) return rule.effect[name];
+        return undefined;
       },
       emitEffect: function emitEffect(_ref, event, append) {
         var _this4 = this;
@@ -4524,7 +4565,13 @@
             type = _ref.type,
             custom = _ref.custom;
         if (!type || type === 'fcFragment') return;
-        var effect = custom ? custom : rule.effect || {};
+        var effect = custom ? custom : Object.keys(rule).reduce(function (i, k) {
+          if (k[0] === '$') {
+            i[k.substr(1)] = rule[k];
+          }
+
+          return i;
+        }, _objectSpread2({}, rule.effect || {}));
         Object.keys(effect).forEach(function (attr) {
           var p = _this4.providers[attr];
           if (!p || p.input && !input) return;
@@ -4868,6 +4915,42 @@
       }
     }
   };
+  var $required = {
+    name: 'required',
+    load: function load(inject, rule) {
+      var val = parseVa(inject.getValue());
+
+      var validate = _objectSpread2(_objectSpread2({}, val), {}, {
+        required: true,
+        validator: function validator(_, v, c) {
+          is.empty(v) ? c(validate.message) : c();
+        }
+      });
+
+      if (!validate.message) {
+        validate.message = rule.title + ' is required';
+      }
+
+      inject.getProp().validate = [validate];
+    },
+    watch: function watch() {
+      $required.load.apply($required, arguments);
+    }
+  };
+
+  function parseVa(val) {
+    if (is.Boolean(val)) {
+      return {};
+    } else if (is.String(val)) {
+      return {
+        message: val
+      };
+    } else if (!is.Object(val)) {
+      return {};
+    } else {
+      return val;
+    }
+  }
 
   function parseOpt(option) {
     if (is.String(option)) {
@@ -4938,6 +5021,31 @@
     return true;
   }
 
+  var $provider = {
+    fetch: $fetch,
+    required: $required
+  };
+
+  var name = 'html';
+  var html = {
+    name: name,
+    loadChildren: false,
+    render: function render(children, ctx) {
+      if (!ctx.prop.domProps) ctx.prop.domProps = {};
+      ctx.prop.domProps.innerHTML = children;
+      return ctx.vNode.make(ctx.prop.props.tag || 'div', ctx.prop);
+    },
+    renderChildren: function renderChildren(ctx) {
+      if (Array.isArray(ctx.rule.children)) {
+        return ctx.rule.children.filter(function (v) {
+          return is.String(v);
+        }).join('');
+      }
+
+      return '';
+    }
+  };
+
   var _vue = typeof window !== 'undefined' && window.Vue ? window.Vue : Vue;
 
   function _parseProp(name, id) {
@@ -4993,17 +5101,19 @@
     arrayAttrs.push.apply(arrayAttrs, _toConsumableArray(array));
     normalAttrs.push.apply(normalAttrs, _toConsumableArray(normal));
     appendProto([].concat(_toConsumableArray(key), _toConsumableArray(array), _toConsumableArray(normal)));
-  } //todo 表单嵌套
+  }
 
+  var id$1 = 1;
+  var instance = {}; //todo 表单嵌套
 
   function FormCreateFactory(config) {
     var components = _defineProperty({}, fragment.name, fragment);
 
     var parsers = {};
     var directives = {};
-    var providers = {
-      fetch: $fetch
-    };
+
+    var providers = _objectSpread2({}, $provider);
+
     var maker = makerFactory();
     var globalConfig = {
       global: {}
@@ -5012,6 +5122,10 @@
     var CreateNode = CreateNodeFactory();
     exportAttrs(config.attrs || {});
 
+    function getApi(name) {
+      return instance[name];
+    }
+
     function directive() {
       var data = nameProp.apply(void 0, arguments);
       if (data.id && data.prop) directives[data.id] = data.prop;
@@ -5084,18 +5198,35 @@
       return _this.api();
     }
 
-    function factory() {
-      return FormCreateFactory(config);
+    function factory(inherit) {
+      var _config = _objectSpread2({}, config);
+
+      if (inherit) {
+        _config.inherit = {
+          components: components,
+          parsers: parsers,
+          directives: directives,
+          providers: providers,
+          maker: maker,
+          data: data
+        };
+      } else {
+        delete _config.inherit;
+      }
+
+      return FormCreateFactory(_config);
     }
 
     function FormCreate(vm, rules, options) {
       extend(this, {
+        id: id$1++,
         vm: vm,
         create: create,
         manager: createManager(config.manager),
         parsers: parsers,
         providers: providers,
         rules: Array.isArray(rules) ? rules : [],
+        name: vm.$options.propsData.name,
         prop: {
           components: components,
           directives: directives
@@ -5109,6 +5240,10 @@
       });
       this.init();
       this.initOptions(options || {});
+
+      if (this.name) {
+        instance[this.name] = this.api();
+      }
     }
 
     extend(FormCreate.prototype, {
@@ -5144,6 +5279,10 @@
           vm.destroyed = true;
           _this2.unwatch && _this2.unwatch();
           h.reloadRule([]);
+
+          if (_this2.name) {
+            delete instance[_this2.name];
+          }
         });
         vm.$on('hook:updated', function () {
           h.bindNextTick(function () {
@@ -5221,6 +5360,7 @@
         parseFn: parseFn,
         parseJson: parseJson,
         toJson: toJson,
+        getApi: getApi,
         init: function init(rules) {
           var _opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
 
@@ -5274,7 +5414,19 @@
     CreateNode.use({
       fragment: 'fcFragment'
     });
+    parser(html);
     if (config.install) create.use(config);
+
+    if (config.inherit) {
+      var inherit = config.inherit;
+      inherit.components && extend(components, inherit.components);
+      inherit.parsers && extend(parsers, inherit.parsers);
+      inherit.directives && extend(directives, inherit.directives);
+      inherit.providers && extend(providers, inherit.providers);
+      inherit.maker && extend(maker, inherit.maker);
+      inherit.data && extend(data, inherit.data);
+    }
+
     return create;
   }
 
@@ -5284,12 +5436,12 @@
       return date.toString() === 'Invalid Date' ? timeStamp : date;
     }
   }
-  var name = 'datePicker';
+  var name$1 = 'datePicker';
   var datePicker = {
-    name: name,
+    name: name$1,
     maker: function () {
       return ['date', 'dateRange', 'datetime', 'datetimeRange', 'year', 'month'].reduce(function (maker, type) {
-        maker[type] = creatorFactory(name, {
+        maker[type] = creatorFactory(name$1, {
           type: type.toLowerCase()
         });
         return maker;
@@ -5354,28 +5506,28 @@
     }
   };
 
-  var name$1 = 'hidden';
+  var name$2 = 'hidden';
   var hidden = {
-    name: name$1,
-    maker: _defineProperty({}, name$1, function (field, value) {
-      return creatorFactory(name$1)('', field, value);
+    name: name$2,
+    maker: _defineProperty({}, name$2, function (field, value) {
+      return creatorFactory(name$2)('', field, value);
     }),
     render: function render() {
       return [];
     }
   };
 
-  var name$2 = 'input';
+  var name$3 = 'input';
   var input = {
-    name: name$2,
+    name: name$3,
     maker: function () {
       var maker = ['password', 'url', 'email', 'text', 'textarea'].reduce(function (maker, type) {
-        maker[type] = creatorFactory(name$2, {
+        maker[type] = creatorFactory(name$3, {
           type: type
         });
         return maker;
       }, {});
-      maker.idate = creatorFactory(name$2, {
+      maker.idate = creatorFactory(name$3, {
         type: 'date'
       });
       return maker;
@@ -5389,11 +5541,11 @@
     }
   };
 
-  var name$3 = 'slider';
+  var name$4 = 'slider';
   var slider = {
-    name: name$3,
+    name: name$4,
     maker: {
-      sliderRange: creatorFactory(name$3, {
+      sliderRange: creatorFactory(name$4, {
         range: true
       })
     },
@@ -5877,7 +6029,7 @@
   useFrame(maker);
   useTimePicker(maker);
 
-  var css_248z$2 = ".form-create .form-create .ivu-form-item {\n    margin-bottom: 24px;\n}\n\n.form-create .form-create .ivu-form-item .ivu-form-item {\n    margin-bottom: 0px;\n}\n\n.form-create{\n    transform: rotateZ(0);\n}\n";
+  var css_248z$2 = ".form-create .form-create .ivu-form-item {\n    margin-bottom: 24px;\n}\n\n.form-create .form-create .ivu-form-item .ivu-form-item {\n    margin-bottom: 0px;\n}\n";
   styleInject(css_248z$2);
 
   function tidyBtnProp(btn, def) {
@@ -6117,7 +6269,7 @@
   function ivuFormCreate() {
     return FormCreateFactory({
       ui: "".concat("iview"),
-      version: "".concat("2.5.17"),
+      version: "".concat("2.5.18"),
       manager: manager,
       install: install,
       extendApi: extendApi,