@form-create/element-ui 3.2.15 → 3.2.16

package/dist/form-create.js

@@ -1,5 +1,5 @@
 /*!
- * @form-create/element-ui v3.2.15
+ * @form-create/element-ui v3.2.16
  * (c) 2018-2024 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
@@ -2882,6 +2882,21 @@
 
     return Object.keys(matches);
   }
+  function convertFieldToConditions(field) {
+    var parts = field.split('.');
+    var conditions = [];
+    var currentCondition = '';
+    parts.forEach(function (part, index) {
+      if (index === 0) {
+        currentCondition = part;
+      } else {
+        currentCondition += '.' + part;
+      }
+
+      conditions.push(currentCondition);
+    });
+    return conditions.join(' && ');
+  }
 
   function baseRule() {
     return {
@@ -3674,11 +3689,16 @@
           });
         });
       },
-      watchFetch: function watchFetch(opt, callback, error) {
+      watchFetch: function watchFetch(opt, callback, error, beforeFetch) {
         return h.fc.watchLoadData(function (get, change) {
           var _opt = deepCopy(opt);
 
           _opt = h.loadFetchVar(_opt, get);
+
+          if (beforeFetch && beforeFetch(_opt, change) === false) {
+            return;
+          }
+
           h.beforeFetch(_opt).then(function () {
             return asyncFetch(_opt, h.fc.create.fetch, api).then(function (res) {
               invoke(function () {
@@ -3692,7 +3712,7 @@
               error && error(e);
             });
           });
-        });
+        }, opt.wait == null ? 1000 : opt.wait);
       },
       getData: function getData(id, def) {
         return h.fc.getLoadData(id, def);
@@ -4909,8 +4929,8 @@
         var rule = ctx.rule;
         is.trueArray(rule.sync) && mergeProps([{
           on: rule.sync.reduce(function (pre, prop) {
-            pre["update:".concat(prop)] = function (val) {
-              rule.props[prop] = val;
+            pre[_typeof(prop) === 'object' && prop.event || "update:".concat(prop)] = function (val) {
+              rule.props[_typeof(prop) === 'object' && prop.prop || prop] = val;
 
               _this4.vm.emit('sync', prop, val, rule, _this4.fapi);
             };
@@ -5036,7 +5056,7 @@
                   return;
                 }
 
-                rules[index] = _rule = _rule._clone ? _rule._clone() : copyRule(_rule);
+                rules[index] = _rule = _rule._clone ? _rule._clone() : parseJson(toJson(_rule));
                 ctx = null;
                 isCopy = true;
               }
@@ -5564,6 +5584,7 @@
   };
 
   var noneKey = ['field', 'value', 'vm', 'template', 'name', 'config', 'control', 'inject', 'sync', 'payload', 'optionsTo', 'update', 'slotUpdate', 'computed', 'component', 'cache'];
+  var oldValueTag = Symbol('oldValue');
   function useContext(Handler) {
     extend(Handler.prototype, {
       getCtx: function getCtx(id) {
@@ -5833,7 +5854,7 @@
 
               var value = _this.compute(ctx, item);
 
-              if (item.linkage && value === undefined) {
+              if (item.linkage && value === oldValueTag) {
                 return oldValue;
               }
 
@@ -5888,10 +5909,22 @@
             var _loop = function _loop(i) {
               var one = item.group[i];
               var flag = void 0;
-              var field = one.field;
+              var field = null;
 
               if (one.variable) {
                 field = JSON.stringify(_this2.fc.getLoadData(one.variable) || '');
+              } else if (one.field) {
+                field = convertFieldToConditions(one.field || '');
+              } else {
+                return {
+                  v: true
+                };
+              }
+
+              var compare = one.compare;
+
+              if (compare) {
+                compare = convertFieldToConditions(compare || '');
               }
 
               if (one.mode) {
@@ -5903,7 +5936,7 @@
                   return one.handler(_this2.api, ctx.rule);
                 });
               } else {
-                flag = new Function('$condition', '$val', '$form', '$group', '$rule', "with($form){with(this){with($group){ return $condition['".concat(one.condition, "'](").concat(field, ", ").concat(one.compare ? one.compare : '$val', "); }}}")).call(_this2.api.form, condition, one.value, _this2.api.top.form, group ? _this2.subRuleData[group.id] || {} : {}, ctx.rule);
+                flag = new Function('$condition', '$val', '$form', '$group', '$rule', "with($form){with(this){with($group){ return $condition['".concat(one.condition, "'](").concat(field, ", ").concat(compare ? compare : '$val', "); }}}")).call(_this2.api.form, condition, one.value, _this2.api.top.form, group ? _this2.subRuleData[group.id] || {} : {}, ctx.rule);
               }
 
               if (or && flag) {
@@ -5932,7 +5965,7 @@
           if (item.linkage) {
             return val ? invoke(function () {
               return _this2.computeValue(item.linkage, ctx, group);
-            }, undefined) : undefined;
+            }, undefined) : oldValueTag;
           }
 
           return val;
@@ -6329,9 +6362,14 @@
     this.$manager = new fc.manager(this);
     this.$render = new Render(this);
     this.api = fc.extendApiFn.reduce(function (api, fn) {
-      extend(api, invoke(function () {
+      var extendApi = invoke(function () {
         return fn(api, _this);
-      }, {}));
+      });
+
+      if (extendApi && extendApi !== api) {
+        extend(api, extendApi);
+      }
+
       return api;
     }, Api(this));
   }
@@ -7034,7 +7072,8 @@
   }
 
   var id = 1;
-  var instance = {}; //todo 表单嵌套
+  var instance = {};
+  var defValueTag = Symbol('defValue'); //todo 表单嵌套
 
   function FormCreateFactory(config) {
     var components = _defineProperty({}, fragment.name, fragment);
@@ -7257,7 +7296,11 @@
       id = split.shift();
       var field = split.join('.');
 
-      if (hasProperty(loadData, id)) {
+      if (!hasProperty(loadData, id)) {
+        loadData[id] = defValueTag;
+      }
+
+      if (loadData[id] !== defValueTag) {
         var val = loadData[id];
 
         if (val && val._driver) {
@@ -7310,6 +7353,7 @@
         },
         drivers: drivers,
         renderDriver: null,
+        get: null,
         refreshData: refreshData,
         loadData: loadData,
         CreateNode: CreateNode,
@@ -7542,22 +7586,11 @@
           var handle = is.Function(option) ? option : option.handle;
 
           if (handle) {
-            var val;
-            var unwatch = this.watchLoadData(function (get, change) {
-              if (change) {
-                unwatch();
-
-                _this5.bus.$emit('$loadData.$var.' + key);
-
-                return val;
-              }
-
-              val = invoke(function () {
-                return handle(get, _this5.$handle.api);
-              });
-            });
-            this.unwatch.push(unwatch);
-            return val;
+            return deepGet(invoke(function () {
+              return handle(_this5.get || function () {
+                return _this5.getLoadData.apply(_this5, arguments);
+              }, _this5.$handle.api);
+            }), split);
           }
         }
       },
@@ -7596,7 +7629,12 @@
             split = [];
           } else {
             var tmpData = this.vm.setupState.top.setupState.fc.tmpData;
-            val = hasProperty(tmpData, key) ? deepGet(tmpData, id) : getData(id);
+
+            if (!hasProperty(tmpData, key)) {
+              tmpData[key] = defValueTag;
+            }
+
+            val = tmpData[key] !== defValueTag ? deepGet(tmpData, id) : getData(id);
             split = [];
           }
 
@@ -7607,15 +7645,23 @@
 
         return val == null || val === '' ? def : val;
       },
-      watchLoadData: function watchLoadData(fn) {
+      watchLoadData: function watchLoadData(fn, wait) {
         var _this6 = this;
 
         var unwatch = {};
 
         var run = function run(flag) {
+          if (!_this6.get) {
+            _this6.get = get;
+          }
+
           invoke(function () {
             fn(get, flag);
           });
+
+          if (_this6.get === get) {
+            _this6.get = undefined;
+          }
         };
 
         var get = function get(id, def) {
@@ -7638,7 +7684,7 @@
               unwatch[id].val = temp;
               run(true);
             }
-          }, 0);
+          }, wait || 0);
           var un = vue.watch(data, function (n) {
             callback();
           });
@@ -7698,7 +7744,7 @@
         this.updateOptions(options);
       },
       mergeOptions: function mergeOptions(target, opt, parent) {
-        opt = deepCopy(opt);
+        opt = _objectSpread2({}, opt || {});
         parent && ['page', 'onSubmit', 'onReset', 'onCreated', 'onChange', 'onMounted', 'mounted', 'onReload', 'reload', 'formData', 'el', 'globalClass', 'style'].forEach(function (n) {
           delete opt[n];
         });
@@ -8755,7 +8801,7 @@
   function elmFormCreate() {
     return FormCreateFactory({
       ui: 'element-ui',
-      version: '3.2.15',
+      version: '3.2.16',
       manager: manager,
       extendApi: extendApi,
       install: install,