@form-create/element-ui 3.1.11 → 3.1.14

package/dist/form-create.js

@@ -1,5 +1,5 @@
 /*!
- * @form-create/element-ui v3.1.11
+ * @form-create/element-ui v3.1.14
  * (c) 2018-2022 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
@@ -1497,7 +1497,7 @@
         form: vue.markRaw(this.formCreateInject.form.$form())
       };
     },
-    emits: ['update:modelValue', 'change', 'itemMounted', 'remove'],
+    emits: ['update:modelValue', 'change', 'itemMounted', 'remove', 'add'],
     watch: {
       rule: {
         handler: function handler(n, o) {
@@ -1553,7 +1553,7 @@
 
           if (len < 0) {
             for (var i = len; i < 0; i++) {
-              this.addRule(n.length + i);
+              this.addRule(n.length + i, true);
             }
 
             for (var _i = 0; _i < total; _i++) {
@@ -1796,31 +1796,27 @@
               "span": button ? 20 : 24
             }, {
               "default": function _default() {
-                return [vue.createVNode(vue.resolveComponent("ElFormItem"), null, {
-                  "default": function _default() {
-                    return [vue.createVNode(Type, {
-                      "key": key,
-                      "inFor": true,
-                      "onUpdate:modelValue": function onUpdateModelValue(formData) {
-                        return _this9.formData(key, formData);
-                      },
-                      "modelValue": _this9.field ? _defineProperty({}, _this9.field, _this9._value(_this9.modelValue[index])) : _this9.modelValue[index],
-                      "onEmit-event": function onEmitEvent(name) {
-                        for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-                          args[_key - 1] = arguments[_key];
-                        }
-
-                        return _this9.emitEvent(name, args, index, key);
-                      },
-                      "onUpdate:api": function onUpdateApi($f) {
-                        return _this9.add$f(index, key, $f);
-                      },
-                      "rule": rule,
-                      "option": options,
-                      "extendOption": true
-                    }, null)];
-                  }
-                })];
+                return [vue.createVNode(Type, {
+                  "key": key,
+                  "inFor": true,
+                  "onUpdate:modelValue": function onUpdateModelValue(formData) {
+                    return _this9.formData(key, formData);
+                  },
+                  "modelValue": _this9.field ? _defineProperty({}, _this9.field, _this9._value(_this9.modelValue[index])) : _this9.modelValue[index],
+                  "onEmit-event": function onEmitEvent(name) {
+                    for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+                      args[_key - 1] = arguments[_key];
+                    }
+
+                    return _this9.emitEvent(name, args, index, key);
+                  },
+                  "onUpdate:api": function onUpdateApi($f) {
+                    return _this9.add$f(index, key, $f);
+                  },
+                  "rule": rule,
+                  "option": options,
+                  "extendOption": true
+                }, null)];
               }
             }), button ? vue.createVNode(vue.resolveComponent("ElCol"), {
               "span": 2,
@@ -2079,13 +2075,17 @@
           fc.$handle.reloadRule(rule.value);
           vm.setupState.renderRule();
         });
-        vue.watch(props.option, function (n) {
+        vue.watch(function () {
+          return props.option;
+        }, function (n) {
           fc.initOptions(n);
           fapi.refresh();
+        }, {
+          deep: true
         });
         vue.watch(modelValue, function (n) {
           if (JSON.stringify(n || {}) === data.updateValue) return;
-          fapi.setValue(n || {});
+          fapi.config.forceCoverValue ? fapi.coverValue(n || {}) : fapi.setValue(n || {});
         }, {
           deep: true
         });
@@ -2301,7 +2301,13 @@
     return rule;
   }
   function getRule(rule) {
-    return is.Function(rule.getRule) ? rule.getRule() : rule;
+    var r = is.Function(rule.getRule) ? rule.getRule() : rule;
+
+    if (!r.type) {
+      r.type = 'input';
+    }
+
+    return r;
   }
   function mergeGlobal(target, merge) {
     if (!target) return merge;
@@ -2580,15 +2586,21 @@
         return copy(ctx.rule.value);
       },
       coverValue: function coverValue(formData) {
+        var data = _objectSpread2({}, formData || {});
+
         h.deferSyncValue(function () {
           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;
-            });
+
+            if (ctxs) {
+              var flag = hasProperty(formData, key);
+              ctxs.forEach(function (ctx) {
+                ctx.rule.value = flag ? formData[key] : undefined;
+              });
+              delete data[key];
+            }
           });
+          extend(h.appendData, data);
         });
       },
       setValue: function setValue(field) {
@@ -2821,6 +2833,18 @@
           $set(ctx.rule.effect, attr, value);
         }
       },
+      clearEffectData: function clearEffectData(id, attr) {
+        var ctx = h.getCtx(id);
+
+        if (ctx) {
+          if (attr && attr[0] === '$') {
+            attr = attr.substr(1);
+          }
+
+          ctx.clearEffectData(attr);
+          api.sync(id);
+        }
+      },
       updateValidate: function updateValidate(id, validate, merge) {
         if (merge) {
           api.mergeRule(id, {
@@ -2953,8 +2977,13 @@
       },
       getCache: function getCache(ctx) {
         var cache = this.cache[ctx.id];
-        cache.use = true;
-        return cache.vnode;
+
+        if (cache) {
+          cache.use = true;
+          return cache.vnode;
+        }
+
+        return undefined;
       }
     });
   }
@@ -3625,7 +3654,7 @@
     });
   }
 
-  function RuleContext(handle, rule) {
+  function RuleContext(handle, rule, defaultValue) {
     var id = uniqueId();
     var isInput = !!rule.field;
     extend(this, {
@@ -3649,7 +3678,7 @@
       refRule: {},
       input: isInput,
       el: undefined,
-      defaultValue: isInput ? deepCopy(rule.value) : undefined,
+      defaultValue: isInput ? deepCopy(defaultValue) : undefined,
       field: rule.field || undefined
     });
     this.updateType();
@@ -3762,7 +3791,11 @@
       return this.payload[name];
     },
     clearEffectData: function clearEffectData(name) {
-      delete this.payload[name];
+      if (name === undefined) {
+        this.payload = {};
+      } else {
+        delete this.payload[name];
+      }
     },
     updateKey: function updateKey(flag) {
       this.key = uniqueId();
@@ -4023,7 +4056,6 @@
         rules.map(function (_rule, index) {
           if (parent && (is.String(_rule) || is.Undef(_rule))) return;
           if (!_this6.pageEnd && !parent && index >= _this6.first) return;
-          if (!is.Object(_rule) || !getRule(_rule).type) return err('未定义生成规则的 type 字段', _rule);
 
           if (_rule.__fc__ && _rule.__fc__.root === rules && _this6.ctxs[_rule.__fc__.id]) {
             loadChildren(_rule.__fc__.loadChildrenPending(), _rule.__fc__);
@@ -4047,9 +4079,11 @@
           var ctx;
           var isCopy = false;
           var isInit = !!_rule.__fc__;
+          var defaultValue = rule.value;
 
           if (isInit) {
             ctx = _rule.__fc__;
+            defaultValue = ctx.defaultValue;
             var check = !ctx.check(_this6);
 
             if (ctx.deleted) {
@@ -4074,7 +4108,9 @@
           }
 
           if (!ctx) {
-            ctx = new RuleContext(_this6, _this6.parseRule(_rule));
+            var _rule2 = _this6.parseRule(_rule);
+
+            ctx = new RuleContext(_this6, _rule2, isInit ? defaultValue : _rule2.value);
 
             _this6.bindParser(ctx);
           } else {
@@ -4322,7 +4358,7 @@
         }
       },
       setFormData: function setFormData(ctx, value) {
-        $set(this.formData, ctx.id, value === null ? undefined : value);
+        $set(this.formData, ctx.id, value);
       },
       getFormData: function getFormData(ctx) {
         return this.formData[ctx.id];
@@ -4625,7 +4661,6 @@
             return val.value;
           }, function () {
             var formValue = ctx.parser.toFormValue(val.value, ctx);
-            formValue = formValue === null ? undefined : formValue;
 
             if (_this.isChange(ctx, formValue)) {
               _this.setValue(ctx, val.value, formValue, true);
@@ -4772,6 +4807,11 @@
         var ps = this.fc.providers;
         Object.keys(ps).forEach(function (k) {
           var prop = ps[k];
+
+          if (is.Function(prop)) {
+            prop = prop(_this.fc);
+          }
+
           prop._c = getComponent(prop);
 
           _this.onEffect(prop);
@@ -5005,7 +5045,7 @@
     }
   }
 
-  function fetch(option) {
+  function fetch$1(option) {
     if (typeof XMLHttpRequest === 'undefined') {
       return;
     }
@@ -5218,90 +5258,103 @@
     render: function render(children) {}
   });
 
-  var $fetch = {
-    name: 'fetch',
-    loaded: function loaded() {
-      run.apply(void 0, arguments);
-    },
-    watch: function watch(inject, rule, api) {
-      if (!run(inject, rule, api)) {
-        inject.clearProp();
-        api.sync(rule);
+  var fetch = function fetch(fc) {
+    function parseOpt(option) {
+      if (is.String(option)) {
+        option = {
+          action: option,
+          to: 'options'
+        };
       }
-    }
-  };
 
-  function parseOpt(option) {
-    if (is.String(option)) {
-      option = {
-        action: option,
-        to: 'options'
-      };
+      return option;
     }
 
-    return option;
-  }
+    function run(inject, rule, api) {
+      var option = inject.value;
 
-  function run(inject, rule, api) {
-    var option = inject.value;
+      if (is.Function(option)) {
+        option = option(rule, api);
+      }
 
-    if (is.Function(option)) {
-      option = option(rule, api);
-    }
+      option = parseOpt(option);
 
-    option = parseOpt(option);
+      if (!option || !option.action) {
+        return false;
+      }
 
-    if (!option || !option.action) {
-      return false;
-    }
+      if (!option.to) {
+        option.to = 'options';
+      }
 
-    if (!option.to) {
-      option.to = 'options';
-    }
+      var _onError = option.onError;
 
-    var _onError = option.onError;
+      var check = function check() {
+        if (!inject.getValue()) {
+          inject.clearProp();
+          api.sync(rule);
+          return true;
+        }
+      };
 
-    var check = function check() {
-      if (!inject.getValue()) {
-        inject.clearProp();
-        api.sync(rule);
-        return true;
-      }
-    };
+      var set = function set(val) {
+        if (val === undefined) {
+          inject.clearProp();
+          api.sync(rule);
+        } else {
+          deepSet(inject.getProp(), option.to, val);
+        }
+      };
 
-    var set = function set(val) {
-      if (val === undefined) {
-        inject.clearProp();
-        api.sync(rule);
-      } else {
-        deepSet(inject.getProp(), option.to, val);
-      }
-    };
+      invoke(function () {
+        return fc.create.fetch(_objectSpread2(_objectSpread2({}, option), {}, {
+          onSuccess: function onSuccess(body) {
+            if (check()) return;
 
-    invoke(function () {
-      return fetch(_objectSpread2(_objectSpread2({}, option), {}, {
-        onSuccess: function onSuccess(body) {
-          if (check()) return;
-          set((option.parse || function (v) {
-            return v.data;
-          })(body, rule, api));
-          api.sync(rule);
-        },
-        onError: function onError(e) {
-          set(undefined);
-          if (check()) return;
+            var fn = function fn(v) {
+              return v.data;
+            };
+
+            if (is.Function(option.parse)) {
+              fn = option.parse;
+            }
 
-          (_onError || function (e) {
-            return err(e.message || 'fetch fail ' + option.action);
-          })(e, rule, api);
+            set(fn(body, rule, api));
+            api.sync(rule);
+          },
+          onError: function onError(e) {
+            set(undefined);
+            if (check()) return;
+
+            (_onError || function (e) {
+              return err(e.message || 'fetch fail ' + option.action);
+            })(e, rule, api);
+          }
+        }), {
+          inject: inject,
+          rule: rule,
+          api: api
+        });
+      });
+      return true;
+    }
+
+    return {
+      name: 'fetch',
+      loaded: function loaded() {
+        run.apply(void 0, arguments);
+      },
+      watch: function watch(inject, rule, api) {
+        if (!run(inject, rule, api)) {
+          inject.clearProp();
+          api.sync(rule);
         }
-      }));
-    });
-    return true;
-  }
+      }
+    };
+  };
 
   var $provider = {
-    fetch: $fetch
+    fetch: fetch
   };
 
   var name$6 = 'html';
@@ -5649,7 +5702,7 @@
         componentAlias: componentAlias,
         copyRule: copyRule,
         copyRules: copyRules,
-        fetch: fetch,
+        fetch: fetch$1,
         $form: $form,
         parseFn: parseFn,
         parseJson: parseJson,
@@ -5944,6 +5997,13 @@
     }
   }
 
+  function tidyRule(rule) {
+    var _rule = _objectSpread2({}, rule);
+
+    delete _rule.children;
+    return _rule;
+  }
+
   var manager = {
     validate: function validate() {
       var form = this.form();
@@ -6103,7 +6163,7 @@
       if (!isFalse(infoProp.show) && (infoProp.info || infoProp["native"]) && !isFalse(infoProp.icon)) {
         var prop = {
           type: infoProp.type || 'popover',
-          props: _objectSpread2({}, infoProp),
+          props: tidyRule(infoProp),
           key: "".concat(uni, "pop")
         };
         delete prop.props.icon;
@@ -6133,7 +6193,7 @@
       }
 
       var _prop = mergeProps([titleProp, {
-        props: titleProp,
+        props: tidyRule(titleProp),
         key: "".concat(uni, "tit"),
         type: titleProp.type || 'span'
       }]);
@@ -6501,7 +6561,8 @@
         }, val);
 
         if (!validate.message) {
-          validate.message = rule.title + '不能为空';
+          var title = rule.title || '';
+          validate.message = ((_typeof(title) === 'object' ? title.title : title) || '') + '不能为空';
         }
 
         inject.getProp().validate = [validate];
@@ -6557,7 +6618,7 @@
   function elmFormCreate() {
     return FormCreateFactory({
       ui: 'element-ui',
-      version: '3.1.11',
+      version: '3.1.14',
       manager: manager,
       extendApi: extendApi,
       install: install,