@form-create/element-ui 3.2.8 → 3.2.9

package/dist/form-create.js

@@ -1,5 +1,5 @@
 /*!
- * @form-create/element-ui v3.2.8
+ * @form-create/element-ui v3.2.9
  * (c) 2018-2024 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
@@ -1290,7 +1290,7 @@
       return vue.createVNode(vue.resolveComponent("ElTree"), vue.mergeProps(this.$attrs, {
         "ref": "tree",
         "onCheck": this.updateValue,
-        "onNode-click": this.updateValue
+        "onNodeClick": this.updateValue
       }), this.$slots);
     },
     mounted: function mounted() {
@@ -1418,7 +1418,7 @@
       }, [vue.createVNode(vue.resolveComponent("ElUpload"), vue.mergeProps({
         "key": len
       }, this.$attrs, {
-        "list-type": this.listType || 'picture-card',
+        "listType": this.listType || 'picture-card',
         "class": {
           '_fc-exceed': this.$attrs.limit ? this.$attrs.limit <= len : false
         },
@@ -2153,6 +2153,15 @@
         var vm = vue.getCurrentInstance();
         vue.provide('parentFC', vm);
         var parent = vue.inject('parentFC', null);
+        var top = parent;
+
+        if (parent) {
+          while (top.setupState.parent) {
+            top = top.setupState.parent;
+          }
+        } else {
+          top = vm;
+        }
 
         var _toRefs = vue.toRefs(props),
             rule = _toRefs.rule,
@@ -2285,6 +2294,7 @@
           if (fc.$handle.isBreakWatch() || n.length === data.renderRule.length && n.every(function (v) {
             return data.renderRule.indexOf(v) > -1;
           })) return;
+          fc.$handle.updateAppendData();
           fc.$handle.reloadRule(rule.value);
           vm.setupState.renderRule();
         });
@@ -2310,12 +2320,14 @@
             fapi.setValue(n || {});
           }
         }, {
-          deep: true
+          deep: true,
+          flush: 'post'
         });
         vue.watch(function () {
           return props.index;
         }, function () {
           fapi.coverValue({});
+          fc.$handle.updateAppendData();
           vue.nextTick(function () {
             vue.nextTick(function () {
               fapi.clearValidateState();
@@ -2327,6 +2339,7 @@
         return _objectSpread2(_objectSpread2({
           fc: vue.markRaw(fc),
           parent: parent ? vue.markRaw(parent) : parent,
+          top: vue.markRaw(top),
           fapi: vue.markRaw(fapi)
         }, vue.toRefs(data)), {}, {
           getGroupInject: function getGroupInject() {
@@ -2453,6 +2466,16 @@
     console.error(e);
   }
 
+  function toCase(str) {
+    var to = str.replace(/(-[a-z])/g, function (v) {
+      return v.replace('-', '').toLocaleUpperCase();
+    });
+    return lower(to);
+  }
+  function lower(str) {
+    return str.replace(str[0], str[0].toLowerCase());
+  }
+
   var PREFIX = '[[FORM-CREATE-PREFIX-';
   var SUFFIX = '-FORM-CREATE-SUFFIX]]';
   var $T = '$FN:';
@@ -2680,6 +2703,10 @@
     var prop = _objectSpread2({}, rule.props || {});
 
     Object.keys(rule.on || {}).forEach(function (k) {
+      if (k.indexOf('-') > 0) {
+        k = toCase(k);
+      }
+
       var name = "on".concat(upper(k));
 
       if (Array.isArray(prop[name])) {
@@ -3369,7 +3396,7 @@
       },
       method: function method(id, name) {
         var el = api.el(id);
-        if (!el || !el[name]) throw new Error(format('err', "".concat(name, "\u65B9\u6CD5\u4E0D\u5B58\u5728")));
+        if (!el || !el[name]) throw new Error(format('err', "".concat(name, " \u65B9\u6CD5\u4E0D\u5B58\u5728")));
         return function () {
           return el[name].apply(el, arguments);
         };
@@ -3434,6 +3461,11 @@
         findRules(ctx ? ctx.loadChildrenPending() : rule.children);
         return rules;
       },
+      getParentRule: function getParentRule(id) {
+        var flag = _typeof(id) === 'object';
+        var ctx = flag ? byCtx(id) : h.getCtx(id);
+        return ctx.parent.rule;
+      },
       getParentSubRule: function getParentSubRule(id) {
         var flag = _typeof(id) === 'object';
         var ctx = flag ? byCtx(id) : h.getCtx(id);
@@ -3542,8 +3574,8 @@
       getData: function getData(id, def) {
         return h.fc.getLoadData(id, def);
       },
-      setData: function setData(id, data) {
-        return h.fc.setData(id, data);
+      setData: function setData(id, data, isGlobal) {
+        return h.fc.setData(id, data, isGlobal);
       },
       refreshData: function refreshData(id) {
         return h.fc.refreshData(id);
@@ -3616,16 +3648,6 @@
     });
   }
 
-  function toCase(str) {
-    var to = str.replace(/(-[a-z])/g, function (v) {
-      return v.replace('-', '').toLocaleUpperCase();
-    });
-    return lower(to);
-  }
-  function lower(str) {
-    return str.replace(str[0], str[0].toLowerCase());
-  }
-
   function toString(val) {
     return val == null ? '' : _typeof(val) === 'object' ? JSON.stringify(val, null, 2) : String(val);
   }
@@ -3784,7 +3806,7 @@
             this.setOptions(ctx);
             this.ctxProp(ctx);
             var prop = ctx.prop;
-            prop.preview = !!(prop.preview != null ? prop.preview : this.vm.props.preview !== undefined ? this.vm.props.preview : this.options.preview || false);
+            prop.preview = !!(prop.preview != null ? prop.preview : this.$handle.preview);
             prop.props.formCreateInject = this.injectProp(ctx);
             var cacheFlag = prop.cache !== false;
             var preview = prop.preview;
@@ -3937,7 +3959,10 @@
             id: ctx.id,
             field: ctx.field,
             rule: ctx.rule,
-            input: ctx.input
+            input: ctx.input,
+            updateValue: function updateValue(data) {
+              _this6.$handle.onUpdateValue(ctx, data);
+            }
           };
         }
 
@@ -5070,11 +5095,23 @@
             }
           });
         });
-        hideLst.length && vue.nextTick(function () {
-          hideLst.forEach(function (v) {
-            return v();
-          });
-        });
+
+        if (hideLst.length) {
+          if (this.loading) {
+            hideLst.length && this.bus.$once('load-end', function () {
+              hideLst.forEach(function (v) {
+                return v();
+              });
+            });
+          } else {
+            hideLst.length && vue.nextTick(function () {
+              hideLst.forEach(function (v) {
+                return v();
+              });
+            });
+          }
+        }
+
         this.vm.emit('control', ctx.origin, this.api);
         this.effect(ctx, 'control');
         return flag;
@@ -5253,7 +5290,10 @@
         this.syncValue();
       },
       appendValue: function appendValue(rule) {
-        if (!rule.field || !hasProperty(this.appendData, rule.field)) return;
+        if ((!rule.field || !hasProperty(this.appendData, rule.field)) && !this.options.forceCoverValue) {
+          return;
+        }
+
         rule.value = this.appendData[rule.field];
         delete this.appendData[rule.field];
       },
@@ -5540,123 +5580,135 @@
         }
 
         this.bus.$once('load-end', function () {
-          var computed = ctx.rule.computed;
+          var computedRule = ctx.rule.computed;
 
-          if (!computed) {
+          if (!computedRule) {
             return;
           }
 
-          if (_typeof(computed) !== 'object') {
-            computed = {
-              value: computed
+          if (_typeof(computedRule) !== 'object') {
+            computedRule = {
+              value: computedRule
             };
           }
 
-          Object.keys(computed).forEach(function (k) {
-            ctx.watch.push(vue.watch(function () {
-              var item = computed[k];
+          Object.keys(computedRule).forEach(function (k) {
+            var computedValue = vue.computed(function () {
+              var item = computedRule[k];
               if (!item) return undefined;
-              var fn;
-
-              if (_typeof(item) === 'object') {
-                var group = ctx.getParentGroup();
+              return _this.compute(ctx, item);
+            });
 
-                var checkCondition = function checkCondition(item) {
-                  item = Array.isArray(item) ? {
-                    mode: 'AND',
-                    group: item
-                  } : item;
+            var callback = function callback(n) {
+              if (k === 'value') {
+                _this.onInput(ctx, n);
+              } else if (k[0] === '$') {
+                _this.api.setEffect(ctx.id, k, n);
+              } else {
+                deepSet(ctx.rule, k, n);
+              }
+            };
 
-                  if (!is.trueArray(item.group)) {
-                    return true;
-                  }
+            if (k === 'value' ? [undefined, null, ''].indexOf(ctx.rule.value) > -1 : computedValue.value !== deepGet(ctx.rule, k)) {
+              callback(computedValue.value);
+            }
 
-                  var or = item.mode === 'OR';
-                  var valid = true;
+            ctx.watch.push(vue.watch(computedValue, function (n) {
+              setTimeout(function () {
+                callback(n);
+              });
+            }));
+          });
+        });
+        this.watchEffect(ctx);
+      },
+      compute: function compute(ctx, item) {
+        var _this2 = this;
 
-                  for (var i = 0; i < item.group.length; i++) {
-                    var one = item.group[i];
-                    var flag = void 0;
+        var fn;
 
-                    if (one.mode) {
-                      flag = checkCondition(one);
-                    } else if (!condition[one.condition]) {
-                      flag = false;
-                    } else {
-                      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 (_typeof(item) === 'object') {
+          var group = ctx.getParentGroup();
 
-                    if (or && flag) {
-                      return true;
-                    }
+          var checkCondition = function checkCondition(item) {
+            item = Array.isArray(item) ? {
+              mode: 'AND',
+              group: item
+            } : item;
 
-                    if (!or) {
-                      valid = valid && flag;
-                    }
-                  }
+            if (!is.trueArray(item.group)) {
+              return true;
+            }
 
-                  return or ? false : valid;
-                };
+            var or = item.mode === 'OR';
+            var valid = true;
 
-                var _val = checkCondition(item);
+            for (var i = 0; i < item.group.length; i++) {
+              var one = item.group[i];
+              var flag = void 0;
 
-                return item.invert === true ? !_val : _val;
-              } else if (is.Function(item)) {
-                fn = function fn() {
-                  return item(_this.api.form, _this.api);
-                };
+              if (one.mode) {
+                flag = checkCondition(one);
+              } else if (!condition[one.condition]) {
+                flag = false;
               } else {
-                var _group = ctx.getParentGroup();
+                flag = new Function('$condition', '$val', '$form', '$group', "with($form){with(this){with($group){ return $condition['".concat(one.condition, "'](").concat(one.field, ", ").concat(one.compare ? one.compare : '$val', "); }}}")).call(_this2.api.form, condition, one.value, _this2.api.top.form, group ? _this2.subRuleData[group.id] || {} : {});
+              }
 
-                fn = function fn() {
-                  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);
-                };
+              if (or && flag) {
+                return true;
               }
 
-              return invoke(fn, undefined);
-            }, function (n) {
-              setTimeout(function () {
-                if (k === 'value') {
-                  _this.onInput(ctx, n);
-                } else if (k[0] === '$') {
-                  _this.api.setEffect(ctx.id, k, n);
-                } else {
-                  deepSet(ctx.rule, k, n);
-                }
-              });
-            }, {
-              immediate: k === 'value' ? [undefined, null, ''].indexOf(ctx.rule.value) > -1 : true
-            }));
-          });
-        });
-        this.watchEffect(ctx);
+              if (!or) {
+                valid = valid && flag;
+              }
+            }
+
+            return or ? false : valid;
+          };
+
+          var val = checkCondition(item);
+          return item.invert === true ? !val : val;
+        } else if (is.Function(item)) {
+          fn = function fn() {
+            return item(_this2.api.form, _this2.api);
+          };
+        } else {
+          var _group = ctx.getParentGroup();
+
+          fn = function fn() {
+            return new Function('$formulas', '$form', '$group', '$rule', '$api', "with($form){with(this){with($group){with($formulas){ return ".concat(item, " }}}}")).call(_this2.api.form, _this2.fc.formulas, _this2.api.top.form, _group ? _this2.subRuleData[_group.id] || {} : {}, ctx.rule, _this2.api);
+          };
+        }
+
+        return invoke(fn, undefined);
       },
       updateChildren: function updateChildren(ctx, n, o) {
-        var _this2 = this;
+        var _this3 = this;
 
         this.deferSyncValue(function () {
           o && o.forEach(function (child) {
             if ((n || []).indexOf(child) === -1 && child && !is.String(child) && child.__fc__ && child.__fc__.parent === ctx) {
-              _this2.rmCtx(child.__fc__);
+              _this3.rmCtx(child.__fc__);
             }
           });
 
           if (is.trueArray(n)) {
-            _this2.loadChildren(n, ctx);
+            _this3.loadChildren(n, ctx);
 
-            _this2.bus.$emit('update', _this2.api);
+            _this3.bus.$emit('update', _this3.api);
           }
         });
       },
       rmSub: function rmSub(sub) {
-        var _this3 = this;
+        var _this4 = this;
 
         is.trueArray(sub) && sub.forEach(function (r) {
-          r && r.__fc__ && _this3.rmCtx(r.__fc__);
+          r && r.__fc__ && _this4.rmCtx(r.__fc__);
         });
       },
       rmCtx: function rmCtx(ctx) {
-        var _this4 = this;
+        var _this5 = this;
 
         if (ctx.deleted) return;
         var id = ctx.id,
@@ -5685,19 +5737,19 @@
         }
 
         this.deferSyncValue(function () {
-          if (!_this4.reloading) {
+          if (!_this5.reloading) {
             if (ctx.parser.loadChildren !== false) {
               var children = ctx.getPending('children', ctx.rule.children);
 
               if (is.trueArray(children)) {
                 children.forEach(function (h) {
-                  return h.__fc__ && _this4.rmCtx(h.__fc__);
+                  return h.__fc__ && _this5.rmCtx(h.__fc__);
                 });
               }
             }
 
-            if (ctx.root === _this4.rules) {
-              _this4.vm.setupState.renderRule();
+            if (ctx.root === _this5.rules) {
+              _this5.vm.setupState.renderRule();
             }
           }
         }, input);
@@ -5934,6 +5986,9 @@
       },
       bus: function bus() {
         return fc.bus;
+      },
+      preview: function preview() {
+        return fc.vm.props.preview != null ? fc.vm.props.preview : this.options.preview || false;
       }
     });
     extend(this, {
@@ -5981,7 +6036,7 @@
       });
     },
     init: function init() {
-      this.appendData = _objectSpread2(_objectSpread2(_objectSpread2({}, this.options.formData || {}), this.fc.vm.props.modelValue || {}), this.appendData);
+      this.updateAppendData();
       this.useProvider();
       this.usePage();
       this.loadRule();
@@ -5990,6 +6045,9 @@
 
       this.lifecycle('created');
     },
+    updateAppendData: function updateAppendData() {
+      this.appendData = _objectSpread2(_objectSpread2(_objectSpread2({}, this.options.formData || {}), this.fc.vm.props.modelValue || {}), this.appendData);
+    },
     isBreakWatch: function isBreakWatch() {
       return this.loading || this.noWatchFn || this.reloading;
     },
@@ -6270,13 +6328,21 @@
   var componentValidate = {
     name: 'componentValidate',
     load: function load(attr, rule, api) {
-      var method = attr.getValue();
+      var options = attr.getValue();
 
-      if (!method) {
+      if (!options || options.method === false) {
         attr.clearProp();
         api.clearValidateState([rule.field]);
       } else {
-        attr.getProp().validate = [{
+        if (!is.Object(options)) {
+          options = {
+            method: options
+          };
+        }
+
+        var method = options.method;
+        delete options.method;
+        attr.getProp().validate = [_objectSpread2(_objectSpread2({}, options), {}, {
           validator: function validator() {
             var ctx = byCtx(rule);
 
@@ -6285,14 +6351,14 @@
                 args[_key] = arguments[_key];
               }
 
-              return api.exec.apply(api, [ctx.id, method === true ? 'formCreateValidate' : method].concat(args, [{
+              return api.exec.apply(api, [ctx.id, is.String(method) ? method : 'formCreateValidate'].concat(args, [{
                 attr: attr,
                 rule: rule,
                 api: api
               }]));
             }
           }
-        }];
+        })];
       }
     },
     watch: function watch() {
@@ -6623,7 +6689,7 @@
 
     function register() {
       var data = nameProp.apply(void 0, arguments);
-      if (data.id && data.prop) providers[data.id] = _objectSpread2(_objectSpread2({}, data.prop), {}, {
+      if (data.id && data.prop) providers[data.id] = is.Function(data.prop) ? data.prop : _objectSpread2(_objectSpread2({}, data.prop), {}, {
         name: data.id
       });
     }
@@ -6769,8 +6835,8 @@
       }
     }
 
-    function setData(id, data) {
-      loadData[id] = data;
+    function _setData(id, data) {
+      deepSet(loadData, id, data);
       refreshData(id);
     }
 
@@ -6786,7 +6852,8 @@
       };
 
       callback._driver = true;
-      setData(id, callback);
+
+      _setData(id, callback);
     }
 
     function getData(id, def) {
@@ -6847,8 +6914,6 @@
         },
         drivers: drivers,
         renderDriver: null,
-        setData: setData,
-        getData: getData,
         refreshData: refreshData,
         loadData: loadData,
         CreateNode: CreateNode,
@@ -6856,7 +6921,8 @@
         unwatch: [],
         options: vue.ref({}),
         extendApiFn: extendApiFn,
-        fetchCache: new WeakMap()
+        fetchCache: new WeakMap(),
+        tmpData: {}
       });
       listener.forEach(function (item) {
         _this.bus.$on(item.name, item.callback);
@@ -7044,6 +7110,14 @@
           }
         }
       },
+      setData: function setData(id, data, isGlobal) {
+        if (!isGlobal) {
+          deepSet(this.vm.setupState.top.setupState.fc.tmpData, id, data);
+          this.bus.$emit('$loadData.' + id);
+        } else {
+          _setData(id, data);
+        }
+      },
       getLoadData: function getLoadData(id, def) {
         var val = null;
 
@@ -7064,11 +7138,12 @@
             val = this.globalVarDriver(split.join('.'));
             split = [];
           } else {
-            val = getData(id, def);
+            var tmpData = this.vm.setupState.top.setupState.fc.tmpData;
+            val = hasProperty(tmpData, key) ? deepGet(tmpData, id) : getData(key);
             split = [];
           }
 
-          if (split.length) {
+          if (val && split.length) {
             val = deepGet(val, split);
           }
         }
@@ -7204,6 +7279,7 @@
         listener.forEach(function (item) {
           _this7.bus.$off(item.name, item.callback);
         });
+        this.tmpData = {};
         this.unwatch.forEach(function (fn) {
           return fn();
         });
@@ -7226,7 +7302,7 @@
         extendApi: extendApi,
         getData: getData,
         setDataDriver: setDataDriver,
-        setData: setData,
+        setData: _setData,
         removeData: removeData,
         refreshData: refreshData,
         maker: maker,
@@ -7644,7 +7720,7 @@
             e.preventDefault();
           }
         },
-        "class": [form.className, form["class"], 'form-create', this.options.preview ? 'is-preview' : ''],
+        "class": [form.className, form["class"], 'form-create', this.$handle.preview ? 'is-preview' : ''],
         style: form.style,
         type: 'form'
       };
@@ -7664,7 +7740,7 @@
     render: function render(children) {
       var _this2 = this;
 
-      if (children.slotLen() && !this.options.preview) {
+      if (children.slotLen() && !this.$handle.preview) {
         children.setSlot(undefined, function () {
           return _this2.makeFormBtn();
         });
@@ -8207,7 +8283,7 @@
   function elmFormCreate() {
     return FormCreateFactory({
       ui: 'element-ui',
-      version: '3.2.8',
+      version: '3.2.9',
       manager: manager,
       extendApi: extendApi,
       install: install,