@form-create/element-ui 3.2.2 → 3.2.4

package/dist/form-create.esm.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.
@@ -1624,7 +1624,7 @@ var Group = defineComponent({
         var _this2 = this;
 
         n = n || [];
-        var keys = Object.keys(this.sort),
+        var keys = this.sort,
             total = keys.length,
             len = total - n.length;
 
@@ -2274,7 +2274,13 @@ function $FormCreate(FormCreate, components, directives) {
       });
       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
       });
@@ -2644,6 +2650,7 @@ function toProps(rule) {
   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;
@@ -2876,9 +2883,9 @@ function fetch$1(option) {
   });
   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;
@@ -3439,8 +3446,24 @@ function Api(h) {
     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);
+          });
         });
       });
     },
@@ -4532,7 +4555,6 @@ extend(RuleContext.prototype, {
     this.$handle.watchCtx(this);
   },
   "delete": function _delete() {
-    var undef = void 0;
     this.unwatch();
     this.unlink();
     this.rmCtrl();
@@ -4543,13 +4565,7 @@ extend(RuleContext.prototype, {
 
     extend(this, {
       deleted: true,
-      prop: _objectSpread2({}, this.rule),
       computed: {},
-      el: undef,
-      $handle: undef,
-      $api: undef,
-      vm: undef,
-      vNode: undef,
       parent: null,
       children: [],
       cacheConfig: null,
@@ -4776,18 +4792,15 @@ function useLoader(Handler) {
         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;
               }
@@ -5459,6 +5472,8 @@ function useContext(Handler) {
         }
 
         Object.keys(computed).forEach(function (k) {
+          var _val = deepGet(ctx.rule, k);
+
           ctx.watch.push(watch(function () {
             var item = computed[k];
             if (!item) return undefined;
@@ -5489,7 +5504,7 @@ function useContext(Handler) {
                   } 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) {
@@ -5513,7 +5528,7 @@ function useContext(Handler) {
               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);
               };
             }
 
@@ -5529,7 +5544,7 @@ function useContext(Handler) {
               }
             });
           }, {
-            immediate: true
+            immediate: _val == null || _val === ''
           }));
         });
       });
@@ -6653,14 +6668,19 @@ function FormCreateFactory(config) {
   }
 
   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) {
@@ -7190,6 +7210,16 @@ function FormCreateFactory(config) {
 
   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;
 }
@@ -8074,7 +8104,7 @@ function install(FormCreate) {
 function elmFormCreate() {
   return FormCreateFactory({
     ui: 'element-ui',
-    version: '3.2.2',
+    version: '3.2.4',
     manager: manager,
     extendApi: extendApi,
     install: install,