@form-create/element-ui 3.2.18 → 3.2.19

package/dist/form-create.js

@@ -1,5 +1,5 @@
 /*!
- * @form-create/element-ui v3.2.18
+ * @form-create/element-ui v3.2.19
  * (c) 2018-2025 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
@@ -1787,7 +1787,7 @@
           return;
         }
 
-        this.cacheRule[key].$f && this.cacheRule[key].$f.setValue(value);
+        this.cacheRule[key].$f && this.cacheRule[key].$f.coverValue(value);
         this.cache(key, value);
       },
       addRule: function addRule(i, emit) {
@@ -3021,10 +3021,12 @@
     if (option.query) {
       var queryString = new URLSearchParams(option.query).toString();
 
-      if (action.includes('?')) {
-        action += "&".concat(queryString);
-      } else {
-        action += "?".concat(queryString);
+      if (queryString) {
+        if (action.includes('?')) {
+          action += "&".concat(queryString);
+        } else {
+          action += "?".concat(queryString);
+        }
       }
     }
 
@@ -3672,6 +3674,16 @@
           }
         });
       },
+      renderRule: function renderRule(id, onInput, force) {
+        var flag = _typeof(id) === 'object';
+        var ctx = flag ? byCtx(id) : h.getCtx(id);
+        return ctx ? h.$render.createRuleVnode(ctx, onInput, force) : undefined;
+      },
+      renderChildren: function renderChildren(id, onInput, force) {
+        var flag = _typeof(id) === 'object';
+        var ctx = flag ? byCtx(id) : h.getCtx(id);
+        return ctx ? h.$render.createChildrenVnodes(ctx, onInput, force) : undefined;
+      },
       nextTick: function nextTick(fn) {
         h.bus.$once('next-tick', fn);
         h.refresh();
@@ -3975,7 +3987,7 @@
           if (ctx.type === 'hidden') return;
           var rule = ctx.rule;
 
-          if (!this.cache[ctx.id] || this.cache[ctx.id].slot !== rule.slot) {
+          if (this.force || !this.cache[ctx.id] || this.cache[ctx.id].slot !== rule.slot) {
             var vn;
             ctx.initProp();
             this.mergeGlobal(ctx);
@@ -4027,6 +4039,18 @@
 
               Object.keys(prop.renderSlots || {}).forEach(function (key) {
                 children[key] = function () {
+                  for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+                    args[_key2] = arguments[_key2];
+                  }
+
+                  if (is.Function(prop.renderSlots[key])) {
+                    return invoke(function () {
+                      var _prop$renderSlots;
+
+                      return (_prop$renderSlots = prop.renderSlots)[key].apply(_prop$renderSlots, args);
+                    });
+                  }
+
                   var rule = _this4.parseSide(prop.renderSlots[key], ctx);
 
                   return _this4.renderRule(rule);
@@ -4205,6 +4229,8 @@
         }];
 
         if (ctx.input) {
+          var tmpInput = this.tmpInput;
+
           if (this.vm.props.disabled === true) {
             ctx.prop.props.disabled = true;
           }
@@ -4212,6 +4238,8 @@
           var field = this.getModelField(ctx);
           var model = {
             callback: function callback(value) {
+              tmpInput && tmpInput(ctx.field, value, ctx.rule);
+
               _this7.onInput(ctx, value);
             },
             modelField: field,
@@ -4284,6 +4312,23 @@
         if (this.vNode[ctx.originType]) return this.vNode[ctx.originType](prop, children);
         return this.vNode.make(lower(prop.type), prop, children);
       },
+      createChildrenVnodes: function createChildrenVnodes(ctx, onInput, force) {
+        this.force = force !== false;
+        this.tmpInput = onInput;
+        var res = this.renderChildren(ctx.rule.children, ctx);
+        this.force = false;
+        this.tmpInput = null;
+        return res;
+      },
+      createRuleVnode: function createRuleVnode(ctx, onInput, force) {
+        this.force = force !== false;
+        this.tmpInput = onInput;
+        var slotBag = makeSlotBag();
+        this.renderSlot(slotBag, ctx, ctx.parent);
+        this.force = false;
+        this.tmpInput = null;
+        return slotBag.getSlots();
+      },
       renderRule: function renderRule(rule, children, origin) {
         var _this9 = this;
 
@@ -4331,6 +4376,8 @@
       vm: handle.vm,
       $manager: handle.$manager,
       vNode: new handle.fc.CreateNode(handle.vm),
+      force: false,
+      tmpInput: null,
       id: id$1++
     });
     funcProxy(this, {
@@ -4477,7 +4524,7 @@
         fn.__json = _fn.__json;
         return fn;
       },
-      loadStrVar: function loadStrVar(str, get) {
+      loadStrVar: function loadStrVar(str, get, group) {
         var _this3 = this;
 
         if (str && typeof str === 'string' && str.indexOf('{{') > -1 && str.indexOf('}}') > -1) {
@@ -4490,7 +4537,29 @@
 
             if (field) {
               var def = (split[1] || '').trim();
-              var val = get ? get(field, def) : _this3.fc.getLoadData(field, def);
+              var val;
+              var flag = false;
+
+              if (group && field.indexOf('$form.') === 0) {
+                var _split = field.split('.');
+
+                _split.shift();
+
+                if (hasProperty(group.value, _split[0])) {
+                  flag = true;
+                  val = get ? get({
+                    id: '$form.' + _split[0] + '_' + group.rule.__fc__.id,
+                    getValue: function getValue() {
+                      return deepGet(group.value, _split);
+                    }
+                  }) : deepGet(group.value, _split);
+                }
+              }
+
+              if (!flag) {
+                val = get ? get(field, def) : _this3.fc.getLoadData(field, def);
+              }
+
               lastVal = val;
               str = str.replaceAll("{{".concat(v, "}}"), val == null ? '' : val);
             }
@@ -4503,11 +4572,20 @@
 
         return str;
       },
-      loadFetchVar: function loadFetchVar(options, get) {
+      loadFetchVar: function loadFetchVar(options, get, rule) {
         var _this4 = this;
 
+        var group;
+
+        if (rule && rule.__fc__) {
+          group = rule.__fc__.getParentGroup();
+        }
+
         var loadVal = function loadVal(str) {
-          return _this4.loadStrVar(str, get);
+          return _this4.loadStrVar(str, get, group ? {
+            rule: rule,
+            value: _this4.subRuleData[group.id] || {}
+          } : null);
         };
 
         options.action = loadVal(options.action || '');
@@ -5978,7 +6056,9 @@
                   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(compare ? compare : '$val', "); }}}")).call(_this2.api.form, condition, one.value, _this2.api.top.form, group ? _this2.subRuleData[group.id] || {} : {}, ctx.rule);
+                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);
+                });
               }
 
               if (or && flag) {
@@ -6912,7 +6992,7 @@
           return fetchAttr._fn[inject.id]();
         }
 
-        var _option = fc.$handle.loadFetchVar(deepCopy(option), get);
+        var _option = fc.$handle.loadFetchVar(deepCopy(option), get, rule);
 
         var config = _objectSpread2(_objectSpread2({
           headers: {}
@@ -7153,10 +7233,12 @@
     var globalConfig = {
       global: {}
     };
-    var loadData = vue.reactive({});
+    var isMobile = config.isMobile === true;
+    var loadData = vue.reactive({
+      $mobile: isMobile
+    });
     var CreateNode = CreateNodeFactory();
     var formulas = {};
-    var isMobile = config.isMobile === true;
     var prototype = {};
     exportAttrs(config.attrs || {});
 
@@ -7414,7 +7496,6 @@
         },
         drivers: drivers,
         renderDriver: null,
-        get: null,
         refreshData: refreshData,
         loadData: loadData,
         CreateNode: CreateNode,
@@ -7639,11 +7720,18 @@
           var handle = is.Function(option) ? option : parseFn(option.handle);
 
           if (handle) {
-            return deepGet(invoke(function () {
-              return handle(_this5.get || function () {
-                return _this5.getLoadData.apply(_this5, arguments);
-              }, _this5.$handle.api);
-            }), split);
+            var val;
+            var unwatch = this.watchLoadData(function (get, flag) {
+              if (flag) {
+                _this5.bus.$emit('$loadData.$var.' + key);
+
+                unwatch();
+              } else {
+                val = handle(get, _this5.$handle.api);
+              }
+            });
+            this.unwatch.push(unwatch);
+            return val;
           }
         }
       },
@@ -7680,6 +7768,8 @@
           } else if (key === '$t') {
             val = this.globalLanguageDriver(split.join('.'));
             split = [];
+          } else if (key === '$preview') {
+            return this.$handle.preview;
           } else {
             var tmpData = this.vm.setupState.top.setupState.fc.tmpData;
 
@@ -7704,32 +7794,31 @@
         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) {
+          var getValue;
+
+          if (_typeof(id) === 'object') {
+            getValue = id.getValue;
+            id = id.id;
+          }
+
           if (unwatch[id]) {
             return unwatch[id].val;
           }
 
           var data = vue.computed(function () {
-            return _this6.getLoadData(id, def);
+            return getValue ? getValue() : _this6.getLoadData(id, def);
           });
           var split = id.split('.');
           var key = split.shift();
           var key2 = split.shift() || '';
           var callback = debounce(function () {
-            var temp = _this6.getLoadData(id, def);
+            var temp = getValue ? getValue() : _this6.getLoadData(id, def);
 
             if (!unwatch[id]) {
               return;
@@ -8863,7 +8952,7 @@
   function elmFormCreate() {
     return FormCreateFactory({
       ui: 'element-ui',
-      version: '3.2.18',
+      version: '3.2.19',
       manager: manager,
       extendApi: extendApi,
       install: install,