@form-create/element-ui 3.2.27 → 3.2.29

package/dist/form-create.esm.js

@@ -1,5 +1,5 @@
 /*!
- * @form-create/element-ui v3.2.27
+ * @form-create/element-ui v3.2.29
  * (c) 2018-2025 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
@@ -2923,7 +2923,8 @@ function $FormCreate(FormCreate, components, directives) {
         fc.initOptions();
         fapi.refresh();
       }, {
-        deep: true
+        deep: true,
+        flush: 'sync'
       });
       watch(function () {
         return _toConsumableArray(rule.value);
@@ -3592,6 +3593,28 @@ function Api(h) {
         return origin ? ctx.origin : ctx.rule;
       }
     },
+    findType: function findType(type, origin) {
+      var rule = undefined;
+      Object.keys(h.ctxs).forEach(function (k) {
+        var ctx = h.ctxs[k];
+
+        if (ctx.rule.type === type) {
+          rule = origin ? ctx.origin : ctx.rule;
+        }
+      });
+      return rule;
+    },
+    findTypes: function findTypes(type, origin) {
+      var rules = [];
+      Object.keys(h.ctxs).forEach(function (k) {
+        var ctx = h.ctxs[k];
+
+        if (ctx.rule.type === type) {
+          rules.push(origin ? ctx.origin : ctx.rule);
+        }
+      });
+      return rules;
+    },
     getRenderRule: function getRenderRule(id) {
       var ctx = h.getCtx(id);
 
@@ -3850,6 +3873,11 @@ function Api(h) {
       (_h$vm = h.vm).emit.apply(_h$vm, [name].concat(args));
     },
     bus: h.bus,
+    getCurrentFormRule: function getCurrentFormRule() {
+      var _h$vm$setupState$getG;
+
+      return (_h$vm$setupState$getG = h.vm.setupState.getGroupInject()) === null || _h$vm$setupState$getG === void 0 ? void 0 : _h$vm$setupState$getG.rule;
+    },
     fetch: function fetch(opt) {
       return new Promise(function (resolve, reject) {
         opt = deepCopy(opt);
@@ -4527,7 +4555,7 @@ function Render(handle) {
     fc: handle.fc,
     vm: handle.vm,
     $manager: handle.$manager,
-    vNode: new handle.fc.CreateNode(handle.vm),
+    vNode: new handle.fc.CreateNode(handle),
     force: false,
     tmpInput: null,
     id: id$1++
@@ -6190,7 +6218,7 @@ function useContext(Handler) {
 
             var value = _this.compute(ctx, item);
 
-            if (item.linkage && value === oldValueTag) {
+            if ((item.linkage || item.linkageVariable) && value === oldValueTag) {
               return oldValueTag;
             }
 
@@ -6537,7 +6565,7 @@ function useContext(Handler) {
             var field = null;
 
             if (one.variable) {
-              field = JSON.stringify(_this4.fc.getLoadData(one.variable) || '');
+              field = JSON.stringify(_this4.fc.getLoadData(one.variable)) || '';
             } else if (one.field) {
               field = convertFieldToConditions(one.field || '');
             } else if (!one.mode) {
@@ -6593,6 +6621,10 @@ function useContext(Handler) {
           return val ? invoke(function () {
             return _this4.computeValue(item.linkage, ctx, group);
           }, undefined) : oldValueTag;
+        } else if (item.linkageVariable) {
+          return val ? invoke(function () {
+            return _this4.fc.getLoadData(item.linkageVariable);
+          }, undefined) : oldValueTag;
         }
 
         return val;
@@ -6818,12 +6850,12 @@ function useEffect(Handler) {
 
         prop._c = getComponent(prop);
 
-        _this.onEffect(prop);
+        _this.onEffect(prop, k);
 
         _this.providers[k] = prop;
       });
     },
-    onEffect: function onEffect(provider) {
+    onEffect: function onEffect(provider, key) {
       var _this2 = this;
 
       var used = [];
@@ -6832,7 +6864,7 @@ function useEffect(Handler) {
         if (used.indexOf(type) > -1) return;
         used.push(type);
 
-        _this2.bus.$on("p:".concat(provider.name, ":").concat(type, ":").concat(provider.input ? 1 : 0), function (event, args) {
+        _this2.bus.$on("p:".concat(key || provider.name, ":").concat(type, ":").concat(provider.input ? 1 : 0), function (event, args) {
           provider[event] && provider[event].apply(provider, _toConsumableArray(args));
         });
       });
@@ -7158,8 +7190,9 @@ function makeDirective(data, vn) {
 function CreateNodeFactory() {
   var aliasMap = {};
 
-  function CreateNode(vm) {
-    this.vm = vm;
+  function CreateNode(handle) {
+    this.vm = handle.vm;
+    this.handle = handle;
   }
 
   extend(CreateNode.prototype, {
@@ -7177,13 +7210,14 @@ function CreateNodeFactory() {
     h: function h(tag, data, children) {
       var vm = this.vm || getCurrentInstance();
       var isNativeTag = vm.appContext.config.isNativeTag(tag);
+      var component = this.handle.fc.prop.components[tag];
 
-      if (isNativeTag) {
+      if (!component && isNativeTag) {
         delete data.formCreateInject;
       }
 
       try {
-        return createVNode(isNativeTag ? tag : resolveComponent(tag), data, children);
+        return createVNode(component || (isNativeTag ? tag : resolveComponent(tag)), data, children);
       } catch (e) {
         console.error(e);
         return createVNode('');
@@ -7201,11 +7235,10 @@ function CreateNodeFactory() {
         var line = toLine(k);
         var lower = toString(k).toLocaleLowerCase();
         var v = nodes[k];
+        CreateNode.alias(k, v);
         [k, line, lower].forEach(function (n) {
-          CreateNode.alias(k, v);
-
           CreateNode.prototype[n] = function (data, children) {
-            return this.make(v, data, children);
+            return this.make(aliasMap[k] || n, data, children);
           };
         });
       });
@@ -7568,22 +7601,6 @@ var fetch = function fetch(fc) {
       option.to = 'options';
     }
 
-    if (option.key) {
-      var item = fc.$handle.options.globalData[option.key];
-
-      if (!item) {
-        set(undefined);
-        return;
-      }
-
-      if (item.type === 'static') {
-        set(item.data);
-        return;
-      } else {
-        option = _objectSpread2(_objectSpread2({}, option), item);
-      }
-    }
-
     var _onError = option.onError;
 
     var check = function check() {
@@ -7599,6 +7616,17 @@ var fetch = function fetch(fc) {
         return fetchAttr._fn[inject.id]();
       }
 
+      if (option.key) {
+        var res = get('$globalData.' + option.key);
+
+        if (res) {
+          if (check()) return;
+          set(res);
+        }
+
+        return;
+      }
+
       var _option = fc.$handle.loadFetchVar(deepCopy(option), get, rule);
 
       var config = _objectSpread2(_objectSpread2({
@@ -8203,7 +8231,8 @@ function FormCreateFactory(config) {
 
           _this2.$handle.api.refresh();
         }, {
-          deep: true
+          deep: true,
+          flush: 'sync'
         }));
       }
 
@@ -8223,12 +8252,15 @@ function FormCreateFactory(config) {
       this.$handle.init();
     },
     targetFormDriver: function targetFormDriver(method) {
-      var _this3 = this;
+      var _this$bus,
+          _this3 = this;
 
       for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
         args[_key2 - 1] = arguments[_key2];
       }
 
+      (_this$bus = this.bus).$emit.apply(_this$bus, [method].concat(args));
+
       if (this.renderDriver && this.renderDriver[method]) {
         return invoke(function () {
           var _this3$renderDriver;
@@ -8331,6 +8363,11 @@ function FormCreateFactory(config) {
           };
 
           var unwatch = this.watchLoadData(callback);
+
+          if (option.watch === false) {
+            unwatch();
+          }
+
           this.unwatch.push(unwatch);
           return val;
         }
@@ -8389,17 +8426,11 @@ function FormCreateFactory(config) {
         var handle = is.Function(option) ? option : parseFn(option.handle);
 
         if (handle) {
-          var val;
-          var unwatch = this.watchLoadData(function (get, flag) {
-            if (flag) {
-              _this5.bus.$emit('$loadData.$var.' + key);
+          var val = handle(function () {
+            var _this5$$handle$api;
 
-              unwatch();
-            } else {
-              val = handle(get, _this5.$handle.api);
-            }
-          });
-          this.unwatch.push(unwatch);
+            return (_this5$$handle$api = _this5.$handle.api).getData.apply(_this5$$handle$api, arguments);
+          }, this.$handle.api);
           return deepGet(val, split);
         }
       }
@@ -8554,11 +8585,18 @@ function FormCreateFactory(config) {
         globalData: {}
       }, deepCopy(globalConfig));
 
-      if (this.isSub()) {
+      var isSubForm = this.isSub();
+
+      if (isSubForm) {
         options = this.mergeOptions(options, this.vm.setupState.parent.setupState.fc.options.value || {}, true);
       }
 
       options = this.mergeOptions(options, this.vm.props.option);
+      var api = this.api();
+      this.targetFormDriver('initOptions', options, {
+        api: api,
+        isSubForm: isSubForm
+      });
       this.updateOptions(options);
     },
     mergeOptions: function mergeOptions(target, opt, parent) {
@@ -9416,6 +9454,9 @@ function extendApi(api, h) {
           h.vm.emit('validate-fail', e, {
             api: api
           });
+          h.emitEvent('validate-fail', e, {
+            api: api
+          });
         });
       });
     },
@@ -9649,7 +9690,7 @@ function install(FormCreate) {
 function elmFormCreate() {
   return FormCreateFactory({
     ui: 'element-ui',
-    version: '3.2.27',
+    version: '3.2.29',
     manager: manager,
     extendApi: extendApi,
     install: install,