@form-create/element-ui 3.1.2 → 3.1.3

package/dist/form-create.js

@@ -1,5 +1,5 @@
 /*!
- * @form-create/element-ui v3.1.2
+ * @form-create/element-ui v3.1.3
  * (c) 2018-2022 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
@@ -799,6 +799,7 @@
         try {
           if (this.helper === true) {
             iframe['form_create_helper'] = {
+              api: this.formCreateInject.api,
               close: function close(field) {
                 _this7.valid(field);
 
@@ -1271,9 +1272,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);
     };
@@ -1341,6 +1361,81 @@
 
   script$1.render = render$1;
 
+  function $set(target, field, value) {
+    target[field] = value;
+  }
+  function $del(target, field) {
+    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 = 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.apply(this, arguments);
+  }
+
   function _isSlot(s) {
     return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !vue.isVNode(s);
   }
@@ -1371,6 +1466,7 @@
           return [];
         }
       },
+      defaultValue: Object,
       disabled: {
         type: Boolean,
         "default": false
@@ -1507,6 +1603,13 @@
           submitBtn: false,
           resetBtn: false
         };
+
+        if (this.defaultValue) {
+          if (!options.formData) options.formData = {};
+          var defVal = deepCopy(this.defaultValue);
+          extend(options.formData, this.field ? _defineProperty({}, this.field, defVal) : defVal);
+        }
+
         this.cacheRule[++this.len] = {
           rule: rule,
           options: options
@@ -1523,6 +1626,7 @@
 
         this.cacheRule[key].$f = $f;
         this.subForm();
+        this.formData(key, $f.formData());
         vue.nextTick(function () {
           if (_this4.syncDisabled) {
             $f.disabled(_this4.disabled);
@@ -1929,27 +2033,6 @@
     });
   }
 
-  function $set(target, field, value) {
-    target[field] = value;
-  }
-  function $del(target, field) {
-    delete target[field];
-  }
-
-  var _extends = 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.apply(this, arguments);
-  }
-
   var normalMerge = ['props'];
   var toArrayMerge = ['class', 'style', 'directives'];
   var functionalMerge = ['on'];
@@ -2019,67 +2102,13 @@
     };
   };
 
-  var keyAttrs = ['type', 'slot', 'emitPrefix', 'value', 'name', 'native', 'hidden', 'display', 'inject', 'options', 'emit', 'link', 'prefix', 'suffix', 'update', 'sync', 'optionsTo', 'key'];
+  var keyAttrs = ['type', 'slot', 'emitPrefix', 'value', 'name', 'native', 'hidden', 'display', 'inject', 'options', 'emit', 'link', 'prefix', 'suffix', 'update', 'sync', 'optionsTo', 'key', 'slotUpdate'];
   var arrayAttrs = ['validate', 'children', 'control'];
   var normalAttrs = ['effect'];
   function attrs() {
     return [].concat(keyAttrs, _toConsumableArray(normalMerge), _toConsumableArray(toArrayMerge), _toConsumableArray(functionalMerge), arrayAttrs, normalAttrs);
   }
 
-  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;
-  }
-
   function format(type, msg, rule) {
     return "[form-create ".concat(type, "]: ").concat(msg) + (rule ? '\n\nrule: ' + JSON.stringify(rule.getRule ? rule.getRule() : rule) : '');
   }
@@ -2237,14 +2266,14 @@
         if (!slotBag[slot]) slotBag[slot] = [];
         slotBag[slot].push(vnFn);
       },
-      getSlot: function getSlot(slot) {
+      getSlot: function getSlot(slot, val) {
         slot = slotName(slot);
         var children = [];
         (slotBag[slot] || []).forEach(function (fn) {
           if (Array.isArray(fn)) {
             children.push.apply(children, _toConsumableArray(fn));
           } else if (is.Function(fn)) {
-            var res = fn();
+            var res = fn.apply(void 0, _toConsumableArray(val || []));
 
             if (Array.isArray(res)) {
               children.push.apply(children, _toConsumableArray(res));
@@ -2263,7 +2292,11 @@
         var slots = {};
         Object.keys(slotBag).forEach(function (k) {
           slots[k] = function () {
-            return _this.getSlot(k);
+            for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+              args[_key] = arguments[_key];
+            }
+
+            return _this.getSlot(k, args);
           };
         });
         return slots;
@@ -2989,6 +3022,25 @@
             }
 
             vn = function vn() {
+              for (var _len = arguments.length, slotValue = new Array(_len), _key = 0; _key < _len; _key++) {
+                slotValue[_key] = arguments[_key];
+              }
+
+              var inject = {
+                rule: rule,
+                prop: prop,
+                preview: preview,
+                api: _this4.$handle.api,
+                model: prop.model || {},
+                slotValue: slotValue
+              };
+
+              if (slotValue.length && rule.slotUpdate) {
+                invoke(function () {
+                  return rule.slotUpdate(inject);
+                });
+              }
+
               var children = {};
 
               var _load = ctx.loadChildrenPending();
@@ -3004,14 +3056,8 @@
               var _vn;
 
               if (slot) {
-                _vn = slot({
-                  rule: rule,
-                  prop: prop,
-                  preview: preview,
-                  children: children,
-                  api: _this4.$handle.api,
-                  model: prop.model || {}
-                });
+                inject.children = children;
+                _vn = slot(inject);
               } else {
                 _vn = preview ? ctx.parser.preview(children, ctx) : ctx.parser.render(children, ctx);
               }
@@ -3129,12 +3175,17 @@
 
         if (!custom && ctx.input) {
           var field = this.getModelField(ctx);
-          props.push({
-            on: _defineProperty({}, "update:".concat(field), function update(value) {
+          var model = {
+            callback: function callback(value) {
               _this7.onInput(ctx, value);
-            }),
-            props: _defineProperty({}, field, this.$handle.getFormData(ctx))
+            },
+            value: this.$handle.getFormData(ctx)
+          };
+          props.push({
+            on: _defineProperty({}, "update:".concat(field), model.callback),
+            props: _defineProperty({}, field, model.value)
           });
+          ctx.prop.model = model;
         }
 
         mergeProps(props, ctx.prop);
@@ -4368,10 +4419,10 @@
       watchCtx: function watchCtx(ctx) {
         var _this = this;
 
-        var none = ['field', 'value', 'vm', 'template', 'name', 'config', 'control', 'inject', 'sync', 'payload', 'optionsTo', 'update'];
+        var none = ['field', 'value', 'vm', 'template', 'name', 'config', 'control', 'inject', 'sync', 'payload', 'optionsTo', 'update', 'slotUpdate'];
         var all = attrs();
         all.filter(function (k) {
-          return k[0] !== '_' && none.indexOf(k) === -1;
+          return k[0] !== '_' && k[0] !== '$' && none.indexOf(k) === -1;
         }).forEach(function (key) {
           var ref = vue.toRef(ctx.rule, key);
           var flag = key === 'children';
@@ -4576,10 +4627,21 @@
       watchEffect: function watchEffect(ctx) {
         var _this3 = this;
 
+        var effect = {};
         Object.keys(ctx.rule.effect || {}).forEach(function (k) {
-          ctx.watch.push(vue.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(vue.watch(effect[k], function (n) {
             _this3.effect(ctx, 'watch', _defineProperty({}, k, n));
           }, {
             deep: true
@@ -4603,7 +4665,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;
@@ -4614,7 +4681,13 @@
             type = _ref.type,
             custom = _ref.custom;
         if (!type || ['fcFragment', 'fragment'].indexOf(type) > -1) 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;
@@ -4979,6 +5052,44 @@
       }
     }
   };
+  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) {
+          return new Promise(function (resolve, reject) {
+            is.empty(v) ? reject(validate.message) : resolve();
+          });
+        }
+      });
+
+      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)) {
@@ -5049,6 +5160,11 @@
     return true;
   }
 
+  var $provider = {
+    fetch: $fetch,
+    required: $required
+  };
+
   var name$6 = 'html';
   var html = {
     name: name$6,
@@ -5108,9 +5224,9 @@
     var directives = {};
     var modelFields = {};
     var useApps = [];
-    var providers = {
-      fetch: $fetch
-    };
+
+    var providers = _objectSpread2({}, $provider);
+
     var maker = makerFactory();
     var globalConfig = {
       global: {}
@@ -5217,8 +5333,25 @@
       return vm.$refs.fc.fapi;
     }
 
-    function factory() {
-      return FormCreateFactory(config);
+    function factory(inherit) {
+      var _config = _objectSpread2({}, config);
+
+      if (inherit) {
+        _config.inherit = {
+          components: components,
+          parsers: parsers,
+          directives: directives,
+          modelFields: modelFields,
+          providers: providers,
+          useApps: useApps,
+          maker: maker,
+          data: data
+        };
+      } else {
+        delete _config.inherit;
+      }
+
+      return FormCreateFactory(_config);
     }
 
     function setModelField(name, field) {
@@ -5411,6 +5544,19 @@
       });
     });
     parser(html);
+
+    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.modelFields && extend(modelFields, inherit.modelFields);
+      inherit.providers && extend(providers, inherit.providers);
+      inherit.useApps && extend(useApps, inherit.useApps);
+      inherit.maker && extend(maker, inherit.maker);
+      inherit.data && extend(data, inherit.data);
+    }
+
     return create;
   }
 
@@ -6194,7 +6340,7 @@
   function elmFormCreate() {
     return FormCreateFactory({
       ui: 'element-ui',
-      version: '3.1.2',
+      version: '3.1.3',
       manager: manager,
       extendApi: extendApi,
       install: install,