@form-create/element-ui 2.5.25 → 2.5.27

package/dist/form-create.js

@@ -1,5 +1,5 @@
 /*!
- * @form-create/element-ui v2.5.25
+ * @form-create/element-ui v2.5.27
  * (c) 2018-2022 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
@@ -1676,7 +1676,7 @@
           "attrs": {
             "span": button ? 20 : 24
           }
-        }, [h("ElFormItem", [h(Type, helper([{
+        }, [h(Type, helper([{
           "key": key
         }, {
           "on": {
@@ -1701,7 +1701,7 @@
             extendOption: true,
             inFor: true
           }
-        }]))])]), button ? h("ElCol", helper([{}, {
+        }]))]), button ? h("ElCol", helper([{}, {
           "props": {
             span: 2,
             pull: 1,
@@ -1904,7 +1904,7 @@
         value: {
           handler: function handler(n) {
             if (JSON.stringify(n || {}) === this.updateValue) return;
-            this.$f.setValue(n || {});
+            this.$f.config.forceCoverValue ? this.$f.coverValue(n || {}) : this.$f.setValue(n || {});
           },
           deep: true
         },
@@ -2144,7 +2144,11 @@
     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;
@@ -2314,15 +2318,19 @@
         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(data, key);
+              ctxs.forEach(function (ctx) {
+                ctx.rule.value = flag ? data[key] : undefined;
+              });
+              delete data[key];
+            }
           });
+          extend(h.appendData, data);
         });
       },
       setValue: function setValue(field) {
@@ -2542,6 +2550,16 @@
           $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, {
@@ -2699,7 +2717,7 @@
 
   var id = 0;
   function uniqueId() {
-    return Math.random().toString(36).substr(3, 3) + Number("".concat(Date.now()).concat(++id)).toString(36);
+    return 'F' + Math.random().toString(36).substr(3, 3) + Number("".concat(Date.now()).concat(++id)).toString(36);
   }
 
   function deepSet(data, idx, val) {
@@ -3338,7 +3356,7 @@
       __fc__: enumerable(ctx, true)
     });
   }
-  function RuleContext(handle, rule) {
+  function RuleContext(handle, rule, defaultValue) {
     var id = uniqueId();
     extend(this, {
       id: id,
@@ -3358,7 +3376,7 @@
       payload: {},
       input: !!rule.field,
       el: undefined,
-      defaultValue: rule.field ? deepCopy(rule.value) : undefined,
+      defaultValue: rule.field ? deepCopy(defaultValue) : undefined,
       field: rule.field || undefined
     });
     this.updateType();
@@ -3374,7 +3392,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();
@@ -3593,7 +3615,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__.rule.children, _rule.__fc__);
             return _rule.__fc__;
@@ -3611,8 +3632,10 @@
           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) {
               if (check) {
@@ -3633,7 +3656,8 @@
             }
           }
           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 {
             if (ctx.originType !== ctx.rule.type) {
@@ -3923,7 +3947,7 @@
         if (this.deferSyncFn) {
           return this.deferSyncFn.sync = true;
         }
-        this.vm._updateValue(_objectSpread2({}, this.form));
+        this.vm._updateValue(_objectSpread2(_objectSpread2({}, this.options.appendValue ? this.appendData : {}), this.form));
       },
       isChange: function isChange(ctx, value) {
         return JSON.stringify(ctx.rule.value, strFn) !== JSON.stringify(value === null ? undefined : value, strFn);
@@ -4099,7 +4123,7 @@
               var _flag = is.trueArray(n);
               _this.deferSyncValue(function () {
                 if (n !== o) {
-                  _this.rmSub(o);
+                  _this.rmSub(o, ctx);
                   _this.$render.initOrgChildren();
                 }
                 _flag && _this.loadChildren(n, ctx);
@@ -4107,6 +4131,7 @@
               });
             }
             _this.$render.clearCache(ctx);
+            _this.refresh();
             _this.watching = false;
           }, {
             deep: !flag,
@@ -4115,10 +4140,10 @@
         });
         this.watchEffect(ctx);
       },
-      rmSub: function rmSub(sub) {
+      rmSub: function rmSub(sub, ctx) {
         var _this2 = this;
         is.trueArray(sub) && sub.forEach(function (r) {
-          r && r.__fc__ && _this2.rmCtx(r.__fc__);
+          r && r.__fc__ && r.__fc__.parent === ctx && _this2.rmCtx(r.__fc__);
         });
       },
       rmCtx: function rmCtx(ctx) {
@@ -4206,6 +4231,9 @@
         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);
           _this.providers[k] = prop;
@@ -4580,17 +4608,84 @@
     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$1 = function fetch(fc) {
+    function parseOpt(option) {
+      if (is.String(option)) {
+        option = {
+          action: option,
+          to: 'options'
+        };
+      }
+      return option;
+    }
+    function run(inject, rule, api) {
+      var option = inject.value;
+      if (is.Function(option)) {
+        option = option(rule, api);
       }
+      option = parseOpt(option);
+      if (!option || !option.action) {
+        return false;
+      }
+      if (!option.to) {
+        option.to = 'options';
+      }
+      var _onError = option.onError;
+      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);
+        }
+      };
+      invoke(function () {
+        return fc.create.fetch(_objectSpread2(_objectSpread2({}, option), {}, {
+          onSuccess: function onSuccess(body) {
+            if (check()) return;
+            var fn = function fn(v) {
+              return v.data;
+            };
+            if (is.Function(option.parse)) {
+              fn = option.parse;
+            }
+            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);
+        }
+      }
+    };
   };
   var $required = {
     name: 'required',
@@ -4636,69 +4731,8 @@
       return val;
     }
   }
-  function parseOpt(option) {
-    if (is.String(option)) {
-      option = {
-        action: option,
-        to: 'options'
-      };
-    }
-    return option;
-  }
-  function run(inject, rule, api) {
-    var option = inject.value;
-    if (is.Function(option)) {
-      option = option(rule, api);
-    }
-    option = parseOpt(option);
-    if (!option || !option.action) {
-      return false;
-    }
-    if (!option.to) {
-      option.to = 'options';
-    }
-    var _onError = option.onError;
-    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);
-      }
-    };
-    invoke(function () {
-      return fetch(_objectSpread2(_objectSpread2({}, option), {}, {
-        onSuccess: function onSuccess(body) {
-          if (check()) return;
-          var fn = function fn(v) {
-            return v.data;
-          };
-          if (is.Function(option.parse)) {
-            fn = option.parse;
-          }
-          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);
-        }
-      }));
-    });
-    return true;
-  }
   var $provider = {
-    fetch: $fetch,
+    fetch: fetch$1,
     required: $required
   };
 
@@ -5807,7 +5841,7 @@
   function elmFormCreate() {
     return FormCreateFactory({
       ui: "".concat("element-ui"),
-      version: "".concat("2.5.25"),
+      version: "".concat("2.5.27"),
       manager: manager,
       extendApi: extendApi,
       install: install,