@form-create/element-ui 3.2.3 → 3.2.4

package/dist/form-create.js

@@ -1,5 +1,5 @@
 /*!
- * @form-create/element-ui v3.2.3
+ * @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;
@@ -4552,7 +4559,6 @@
       this.$handle.watchCtx(this);
     },
     "delete": function _delete() {
-      var undef = void 0;
       this.unwatch();
       this.unlink();
       this.rmCtrl();
@@ -4563,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,
@@ -4796,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;
                 }
@@ -5479,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;
@@ -5509,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) {
@@ -5533,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);
                 };
               }
 
@@ -5549,7 +5548,7 @@
                 }
               });
             }, {
-              immediate: true
+              immediate: _val == null || _val === ''
             }));
           });
         });
@@ -8109,7 +8108,7 @@
   function elmFormCreate() {
     return FormCreateFactory({
       ui: 'element-ui',
-      version: '3.2.3',
+      version: '3.2.4',
       manager: manager,
       extendApi: extendApi,
       install: install,