@form-create/element-ui 3.2.19 → 3.2.20

package/dist/form-create.js

@@ -1,5 +1,5 @@
 /*!
- * @form-create/element-ui v3.2.19
+ * @form-create/element-ui v3.2.20
  * (c) 2018-2025 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
@@ -2327,6 +2327,9 @@
         var emit$topForm = debounce(function () {
           fc.bus.$emit('$loadData.$topForm');
         }, 100);
+        var emit$scopeForm = debounce(function () {
+          fc.bus.$emit('$loadData.$scopeForm');
+        }, 100);
         var emit$form = debounce(function () {
           fc.bus.$emit('$loadData.$form');
         }, 100);
@@ -2341,6 +2344,10 @@
             fapi.top.bus.$on('change', emit$change);
           }
 
+          if (fapi !== fapi.scope) {
+            fapi.scope.bus.$on('$loadData.$scopeForm', emit$scopeForm);
+          }
+
           fc.mounted();
         });
         vue.onBeforeUnmount(function () {
@@ -2349,6 +2356,10 @@
             fapi.top.bus.$off('change', emit$change);
           }
 
+          if (fapi !== fapi.scope) {
+            fapi.scope.bus.$off('$loadData.$scopeForm', emit$scopeForm);
+          }
+
           styleEl && document.head.removeChild(styleEl);
           rmSubForm();
           data.destroyed = true;
@@ -2362,6 +2373,14 @@
         }, {
           immediate: true
         });
+        vue.watch(function () {
+          return props.option;
+        }, function () {
+          fc.initOptions();
+          fapi.refresh();
+        }, {
+          deep: true
+        });
         vue.watch(function () {
           return _toConsumableArray(rule.value);
         }, function (n) {
@@ -2372,14 +2391,6 @@
           fc.$handle.reloadRule(rule.value);
           vm.setupState.renderRule();
         });
-        vue.watch(function () {
-          return props.option;
-        }, function () {
-          fc.initOptions();
-          fapi.refresh();
-        }, {
-          deep: true
-        });
         vue.watch(function () {
           return [props.disabled, props.preview];
         }, function () {
@@ -2440,6 +2451,9 @@
 
               if (!parent) {
                 emit$topForm();
+                emit$scopeForm();
+              } else if (!subForm.value) {
+                emit$scopeForm();
               }
             });
           }
@@ -3166,6 +3180,20 @@
         return api;
       },
 
+      get scope() {
+        var parent = h.vm;
+
+        while (parent && parent.setupState.fapi) {
+          if (!parent.props.subForm) {
+            return parent.setupState.fapi;
+          } else {
+            parent = parent.setupState.parent;
+          }
+        }
+
+        return api.top;
+      },
+
       get children() {
         return allSubForm();
       },
@@ -3196,10 +3224,10 @@
       },
 
       formData: function formData(fields) {
-        if (fields == null) {
+        if (fields == null || typeof fields === 'boolean') {
           var data = {};
           Object.keys(h.form).forEach(function (k) {
-            if (h.ignoreFields.indexOf(k) === -1) {
+            if (fields === true || h.ignoreFields.indexOf(k) === -1) {
               data[k] = copy(h.form[k]);
             }
           });
@@ -3750,7 +3778,11 @@
         }, opt.wait == null ? 1000 : opt.wait);
       },
       getData: function getData(id, def) {
-        return h.fc.getLoadData(id, def);
+        if (h.fc.get) {
+          return h.fc.get(id, def);
+        } else {
+          return h.fc.getLoadData(id, def);
+        }
       },
       watchData: function watchData(fn) {
         return h.fc.watchLoadData(function (get, change) {
@@ -5308,7 +5340,7 @@
               hideLst[valid ? 'push' : 'unshift'](function () {
                 if (method === 'disabled' || method === 'enabled') {
                   _this7.api.disabled(!valid, rule);
-                } else if (method === 'display') {
+                } else if (method === 'display' || method === 'show') {
                   _this7.api.display(valid, rule);
                 } else if (method === 'required') {
                   rule.forEach(function (item) {
@@ -5318,6 +5350,8 @@
                   if (!valid) {
                     _this7.api.clearValidateState(rule);
                   }
+                } else if (method === 'if') {
+                  _this7.api.hidden(!valid, rule);
                 } else {
                   _this7.api.hidden(!valid, rule);
                 }
@@ -5908,8 +5942,10 @@
               var match = temp.message.match(/^\{\{\s*\$t\.(.+)\s*\}\}$/);
 
               if (match) {
+                var _ctx$refRule, _ctx$refRule$__$title;
+
                 temp.message = _this.api.t(match[1], {
-                  title: ctx.refRule.__$title.value
+                  title: (_ctx$refRule = ctx.refRule) === null || _ctx$refRule === void 0 ? void 0 : (_ctx$refRule$__$title = _ctx$refRule.__$title) === null || _ctx$refRule$__$title === void 0 ? void 0 : _ctx$refRule$__$title.value
                 });
               }
             }
@@ -6057,7 +6093,7 @@
                 });
               } else {
                 flag = invoke(function () {
-                  return 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);
+                  return new Function('$condition', '$val', '$form', '$scope', '$group', '$rule', "with($form){with($scope){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, _this2.api.top === _this2.api.scope ? {} : _this2.api.scope.form, group ? _this2.subRuleData[group.id] || {} : {}, ctx.rule);
                 });
               }
 
@@ -6125,7 +6161,7 @@
 
           return obj;
         }, {});
-        return new Function('$formulas', '$form', '$group', '$rule', '$api', "with($form){with(this){with($group){with($formulas){ return ".concat(str, " }}}}")).call(this.api.form, formulas, this.api.top.form, group ? this.subRuleData[group.id] || {} : {}, ctx.rule, this.api);
+        return new Function('$formulas', '$form', '$scope', '$group', '$rule', '$api', "with($form){with($scope){with(this){with($group){with($formulas){ return ".concat(str, " }}}}}")).call(this.api.form, formulas, this.api.top.form, this.api.top === this.api.scope ? {} : this.api.scope.form, group ? this.subRuleData[group.id] || {} : {}, ctx.rule, this.api);
       },
       updateChildren: function updateChildren(ctx, n, o) {
         var _this3 = this;
@@ -6266,8 +6302,11 @@
           hook.forEach(function (fn) {
             invoke(function () {
               return fn(_objectSpread2(_objectSpread2({}, args || {}), {}, {
+                self: ctx.rule,
                 rule: ctx.rule,
-                api: _this2.api
+                $f: _this2.api,
+                api: _this2.api,
+                option: _this2.vm.props.option
               }));
             });
           });
@@ -6521,10 +6560,10 @@
     isBreakWatch: function isBreakWatch() {
       return this.loading || this.noWatchFn || this.reloading;
     },
-    beforeFetch: function beforeFetch(opt) {
+    globalBeforeFetch: function globalBeforeFetch(opt) {
       var _this2 = this;
 
-      return new Promise(function (resolve) {
+      return new Promise(function (resolve, reject) {
         var source = _this2.options.beforeFetch && invoke(function () {
           return _this2.options.beforeFetch(opt, {
             api: _this2.api
@@ -6532,10 +6571,31 @@
         });
 
         if (source && is.Function(source.then)) {
-          source.then(resolve);
+          source.then(resolve)["catch"](reject);
+        } else {
+          resolve();
+        }
+      });
+    },
+    beforeFetch: function beforeFetch(opt) {
+      var _this3 = this;
+
+      return new Promise(function (resolve, reject) {
+        var res = opt && opt.beforeFetch && invoke(function () {
+          return opt.beforeFetch(opt, {
+            api: _this3.api
+          });
+        });
+
+        if (res && is.Function(res.then)) {
+          res.then(resolve)["catch"](reject);
+        } else if (res === false) {
+          reject();
         } else {
           resolve();
         }
+      }).then(function () {
+        return _this3.globalBeforeFetch(opt);
       });
     }
   });
@@ -6738,7 +6798,7 @@
     var loadData = {
       name: 'loadData',
       _fn: [],
-      loaded: function loaded(inject, rule, api) {
+      mounted: function mounted(inject, rule, api) {
         this.deleted(inject);
         var attrs = toArray(inject.getValue());
         var unwatchs = [];
@@ -7494,6 +7554,7 @@
           components: components,
           directives: directives
         },
+        get: null,
         drivers: drivers,
         renderDriver: null,
         refreshData: refreshData,
@@ -7751,9 +7812,11 @@
           var key = split.shift();
 
           if (key === '$topForm') {
-            val = this.$handle.api.top.formData();
+            val = this.$handle.api.top.formData(true);
+          } else if (key === '$scopeForm') {
+            val = this.$handle.api.scope.formData(true);
           } else if (key === '$form') {
-            val = this.$handle.api.formData();
+            val = this.$handle.api.formData(true);
           } else if (key === '$options') {
             val = this.options.value;
           } else if (key === '$globalData') {
@@ -7794,9 +7857,17 @@
         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) {
@@ -8441,7 +8512,9 @@
     },
     makeInfo: function makeInfo(rule, uni, ctx) {
       var _ctx$refRule,
+          _ctx$refRule$__$title,
           _ctx$refRule2,
+          _ctx$refRule2$__$titl,
           _this5 = this;
 
       var titleProp = _objectSpread2({}, rule.title);
@@ -8452,10 +8525,10 @@
       var form = this.options.form;
       var titleSlot = this.getSlot('title');
       var children = [titleSlot ? titleSlot({
-        title: (_ctx$refRule = ctx.refRule) === null || _ctx$refRule === void 0 ? void 0 : _ctx$refRule.__$title.value,
+        title: (_ctx$refRule = ctx.refRule) === null || _ctx$refRule === void 0 ? void 0 : (_ctx$refRule$__$title = _ctx$refRule.__$title) === null || _ctx$refRule$__$title === void 0 ? void 0 : _ctx$refRule$__$title.value,
         rule: ctx.rule,
         options: this.options
-      }) : ((_ctx$refRule2 = ctx.refRule) === null || _ctx$refRule2 === void 0 ? void 0 : _ctx$refRule2.__$title.value) + (form.labelSuffix || form['label-suffix'] || '')];
+      }) : ((_ctx$refRule2 = ctx.refRule) === null || _ctx$refRule2 === void 0 ? void 0 : (_ctx$refRule2$__$titl = _ctx$refRule2.__$title) === null || _ctx$refRule2$__$titl === void 0 ? void 0 : _ctx$refRule2$__$titl.value) + (form.labelSuffix || form['label-suffix'] || '')];
 
       if (!isFalse(infoProp.show) && (infoProp.info || infoProp["native"]) && !isFalse(infoProp.icon)) {
         var prop = {
@@ -8471,9 +8544,9 @@
         var field = 'content';
 
         if (infoProp.info && !hasProperty(prop.props, field)) {
-          var _ctx$refRule3;
+          var _ctx$refRule3, _ctx$refRule3$__$info;
 
-          prop.props[field] = (_ctx$refRule3 = ctx.refRule) === null || _ctx$refRule3 === void 0 ? void 0 : _ctx$refRule3.__$info.value;
+          prop.props[field] = (_ctx$refRule3 = ctx.refRule) === null || _ctx$refRule3 === void 0 ? void 0 : (_ctx$refRule3$__$info = _ctx$refRule3.__$info) === null || _ctx$refRule3$__$info === void 0 ? void 0 : _ctx$refRule3$__$info.value;
         }
 
         children[infoProp.align !== 'left' ? 'unshift' : 'push'](this.$r(mergeProps([infoProp, prop]), _defineProperty({}, titleProp.slot || (isTip ? 'default' : 'reference'), function () {
@@ -8872,6 +8945,8 @@
         inject.clearProp();
         api.clearValidateState([rule.field]);
       } else {
+        var _rule$__fc__$refRule$;
+
         var validate = _objectSpread2({
           required: true,
           validator: function validator(_, v, call) {
@@ -8879,7 +8954,7 @@
           }
         }, val);
 
-        var title = rule.__fc__.refRule.__$title.value;
+        var title = (_rule$__fc__$refRule$ = rule.__fc__.refRule.__$title) === null || _rule$__fc__$refRule$ === void 0 ? void 0 : _rule$__fc__$refRule$.value;
 
         if (!validate.message) {
           validate.message = api.t('required', {
@@ -8952,7 +9027,7 @@
   function elmFormCreate() {
     return FormCreateFactory({
       ui: 'element-ui',
-      version: '3.2.19',
+      version: '3.2.20',
       manager: manager,
       extendApi: extendApi,
       install: install,