@form-create/element-ui 3.2.2 → 3.2.4

package/dist/form-create.js

@@ -1,5 +1,5 @@
 /*!
- * @form-create/element-ui v3.2.2
+ * @form-create/element-ui v3.2.4
  * (c) 2018-2024 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
@@ -1628,7 +1628,7 @@
           var _this2 = this;
 
           n = n || [];
-          var keys = Object.keys(this.sort),
+          var keys = this.sort,
               total = keys.length,
               len = total - n.length;
 
@@ -2278,7 +2278,13 @@
         });
         vue.watch(modelValue, function (n) {
           if (JSON.stringify(n || {}) === data.updateValue) return;
-          fapi.config.forceCoverValue ? fapi.coverValue(n || {}) : fapi.setValue(n || {});
+
+          if (fapi.config.forceCoverValue) {
+            fc.$handle.appendData = {};
+            fapi.coverValue(n || {});
+          } else {
+            fapi.setValue(n || {});
+          }
         }, {
           deep: true
         });
@@ -2648,6 +2654,7 @@
     prop.key = rule.key;
     prop.ref = rule.ref;
     prop["class"] = rule["class"];
+    prop.id = rule.id;
     prop.style = rule.style;
     if (prop.slot) delete prop.slot;
     return prop;
@@ -2880,9 +2887,9 @@
     });
     xhr.send(formData);
   }
-  function asyncFetch(config) {
+  function asyncFetch(config, _fetch) {
     return new Promise(function (resolve, reject) {
-      fetch$1(_objectSpread2(_objectSpread2({}, config), {}, {
+      (_fetch || fetch$1)(_objectSpread2(_objectSpread2({}, config), {}, {
         onSuccess: function onSuccess(res) {
           var fn = function fn(v) {
             return v;
@@ -3443,8 +3450,24 @@
       bus: h.bus,
       fetch: function fetch(opt) {
         return new Promise(function (resolve, reject) {
+          opt = deepCopy(opt);
+          opt = h.loadFetchVar(opt);
           h.beforeFetch(opt).then(function () {
-            return asyncFetch(opt).then(resolve)["catch"](reject);
+            return asyncFetch(opt, h.fc.create.fetch).then(resolve)["catch"](reject);
+          });
+        });
+      },
+      watchFetch: function watchFetch(opt, callback, error) {
+        return h.fc.watchLoadData(function (get, change) {
+          var _opt = deepCopy(opt);
+
+          _opt = h.loadFetchVar(_opt, get);
+          h.beforeFetch(_opt).then(function () {
+            return asyncFetch(_opt, h.fc.create.fetch).then(function (res) {
+              callback && callback(res, change);
+            })["catch"](function (e) {
+              error && error(e);
+            });
           });
         });
       },
@@ -4536,7 +4559,6 @@
       this.$handle.watchCtx(this);
     },
     "delete": function _delete() {
-      var undef = void 0;
       this.unwatch();
       this.unlink();
       this.rmCtrl();
@@ -4547,13 +4569,7 @@
 
       extend(this, {
         deleted: true,
-        prop: _objectSpread2({}, this.rule),
         computed: {},
-        el: undef,
-        $handle: undef,
-        $api: undef,
-        vm: undef,
-        vNode: undef,
         parent: null,
         children: [],
         cacheConfig: null,
@@ -4780,18 +4796,15 @@
           if (isInit) {
             ctx = _rule.__fc__;
             defaultValue = ctx.defaultValue;
-            var check = !ctx.check(_this6);
 
             if (ctx.deleted) {
-              if (check) {
-                if (isCtrl(ctx)) {
-                  return;
-                }
-
-                ctx.update(_this6);
+              if (isCtrl(ctx)) {
+                return;
               }
+
+              ctx.update(_this6);
             } else {
-              if (check) {
+              if (!ctx.check(_this6)) {
                 if (isCtrl(ctx)) {
                   return;
                 }
@@ -5463,6 +5476,8 @@
           }
 
           Object.keys(computed).forEach(function (k) {
+            var _val = deepGet(ctx.rule, k);
+
             ctx.watch.push(vue.watch(function () {
               var item = computed[k];
               if (!item) return undefined;
@@ -5493,7 +5508,7 @@
                     } else if (!condition[one.condition]) {
                       flag = false;
                     } else {
-                      flag = new Function('_$', '_$val', 'top', 'group', "with(top){with(this){with(group){ return _$['".concat(one.condition, "'](").concat(one.field, ", ").concat(one.compare ? one.compare : '_$val', "); }}}")).call(_this.api.form, condition, one.value, _this.api.top.form, group ? _this.subRuleData[group.id] || {} : {});
+                      flag = new Function('_$', '_$val', '$form', '_group', "with($form){with(this){with(_group){ return _$['".concat(one.condition, "'](").concat(one.field, ", ").concat(one.compare ? one.compare : '_$val', "); }}}")).call(_this.api.form, condition, one.value, _this.api.top.form, group ? _this.subRuleData[group.id] || {} : {});
                     }
 
                     if (or && flag) {
@@ -5517,7 +5532,7 @@
                 var _group = ctx.getParentGroup();
 
                 fn = function fn() {
-                  return new Function('formulas', 'top', 'group', '$rule', '$api', "with(top){with(this){with(group){with(formulas){ return ".concat(item, " }}}}")).call(_this.api.form, _this.fc.formulas, _this.api.top.form, _group ? _this.subRuleData[_group.id] || {} : {}, ctx.rule, _this.api);
+                  return new Function('_formulas', '$form', '_group', '$rule', '$api', "with($form){with(this){with(_group){with(_formulas){ return ".concat(item, " }}}}")).call(_this.api.form, _this.fc.formulas, _this.api.top.form, _group ? _this.subRuleData[_group.id] || {} : {}, ctx.rule, _this.api);
                 };
               }
 
@@ -5533,7 +5548,7 @@
                 }
               });
             }, {
-              immediate: true
+              immediate: _val == null || _val === ''
             }));
           });
         });
@@ -6657,14 +6672,19 @@
     }
 
     function setDriver(name, driver) {
+      var parent = drivers[name] || {};
+      var parsers = parent.parsers || {};
+
       if (driver.parsers) {
         Object.keys(driver.parsers).forEach(function (k) {
-          driver.parsers[k] = setPrototypeOf(driver.parsers[k], BaseParser);
+          parsers[k] = setPrototypeOf(driver.parsers[k], BaseParser);
         });
       }
 
       driver.name = name;
-      drivers[name] = driver;
+      drivers[name] = _objectSpread2(_objectSpread2(_objectSpread2({}, parent), driver), {}, {
+        parsers: parsers
+      });
     }
 
     function refreshData(id) {
@@ -7194,6 +7214,16 @@
 
     var FcComponent = $form();
     setPrototypeOf(FcComponent, create);
+    Object.defineProperties(FcComponent, {
+      fetch: {
+        get: function get() {
+          return create.fetch;
+        },
+        set: function set(val) {
+          create.fetch = val;
+        }
+      }
+    });
     FcComponent.util = create;
     return FcComponent;
   }
@@ -8078,7 +8108,7 @@
   function elmFormCreate() {
     return FormCreateFactory({
       ui: 'element-ui',
-      version: '3.2.2',
+      version: '3.2.4',
       manager: manager,
       extendApi: extendApi,
       install: install,