@form-create/element-ui 3.2.28 → 3.2.30

package/dist/form-create.esm.js

@@ -1,5 +1,5 @@
 /*!
- * @form-create/element-ui v3.2.28
+ * @form-create/element-ui v3.2.30
  * (c) 2018-2025 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
@@ -3197,7 +3197,7 @@ function asyncFetch(config, _fetch, api) {
           };
         }
 
-        resolve(fn(res, undefined, api));
+        resolve(fn(res, config.targetRule, api));
       },
       onError: function onError(err) {
         reject(err);
@@ -3873,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);
@@ -4550,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++
@@ -6213,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;
             }
 
@@ -6560,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) {
@@ -6616,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;
@@ -6841,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 = [];
@@ -6855,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));
         });
       });
@@ -7181,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, {
@@ -7200,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('');
@@ -7224,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);
           };
         });
       });
@@ -7591,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() {
@@ -7622,6 +7616,19 @@ var fetch = function fetch(fc) {
         return fetchAttr._fn[inject.id]();
       }
 
+      if (option.key) {
+        fc.targetRule = rule;
+        var res = get('$globalData.' + option.key);
+        delete fc.targetRule;
+
+        if (res) {
+          if (check()) return;
+          set(res);
+        }
+
+        return;
+      }
+
       var _option = fc.$handle.loadFetchVar(deepCopy(option), get, rule);
 
       var config = _objectSpread2(_objectSpread2({
@@ -8247,12 +8254,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;
@@ -8347,6 +8357,8 @@ function FormCreateFactory(config) {
 
             var options = _this4.$handle.loadFetchVar(copy$1(option), get);
 
+            options.targetRule = _this4.targetRule;
+
             _this4.$handle.api.fetch(options).then(function (res) {
               _emit(res);
             })["catch"](function (e) {
@@ -8355,6 +8367,11 @@ function FormCreateFactory(config) {
           };
 
           var unwatch = this.watchLoadData(callback);
+
+          if (option.watch === false) {
+            unwatch();
+          }
+
           this.unwatch.push(unwatch);
           return val;
         }
@@ -8572,11 +8589,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) {
@@ -9670,7 +9694,7 @@ function install(FormCreate) {
 function elmFormCreate() {
   return FormCreateFactory({
     ui: 'element-ui',
-    version: '3.2.28',
+    version: '3.2.30',
     manager: manager,
     extendApi: extendApi,
     install: install,