@form-create/element-ui 3.2.16 → 3.2.18

package/dist/form-create.js

@@ -1,6 +1,6 @@
 /*!
- * @form-create/element-ui v3.2.16
- * (c) 2018-2024 xaboy
+ * @form-create/element-ui v3.2.18
+ * (c) 2018-2025 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
  */
@@ -202,11 +202,11 @@
   function getSlot(slots, exclude) {
     return Object.keys(slots).reduce(function (lst, name) {
       if (!exclude || exclude.indexOf(name) === -1) {
-        lst.push(slots[name]);
+        lst[name] = slots[name];
       }
 
       return lst;
-    }, []);
+    }, {});
   }
 
   function toArray(value) {
@@ -552,10 +552,6 @@
 
   script$2.render = render$2;
 
-  function _isSlot(s) {
-    return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !vue.isVNode(s);
-  }
-
   var NAME$7 = 'fcFrame';
   var Frame = vue.defineComponent({
     name: NAME$7,
@@ -595,11 +591,11 @@
       },
       okBtnText: {
         type: String,
-        "default": '确定'
+        "default": ''
       },
       closeBtnText: {
         type: String,
-        "default": '关闭'
+        "default": ''
       },
       modalTitle: String,
       handleIcon: {
@@ -933,18 +929,18 @@
           "onClick": function onClick() {
             return _this8.onCancel() !== false && (_this8.frameVisible = false);
           }
-        }, _isSlot(closeBtnText) ? closeBtnText : {
+        }, {
           "default": function _default() {
-            return [closeBtnText];
+            return [closeBtnText || _this8.formCreateInject.t('close') || '关闭'];
           }
         }) : null, okBtn ? vue.createVNode(vue.resolveComponent("ElButton"), {
           "type": "primary",
           "onClick": function onClick() {
             return _this8.onOk() !== false && _this8.closeModel();
           }
-        }, _isSlot(okBtnText) ? okBtnText : {
+        }, {
           "default": function _default() {
-            return [okBtnText];
+            return [okBtnText || _this8.formCreateInject.t('ok') || '确定'];
           }
         }) : null]);
       }
@@ -1416,8 +1412,10 @@
     props: {
       previewMask: undefined,
       onPreview: Function,
+      httpRequest: Function,
       modalTitle: String,
       listType: String,
+      formCreateInject: Object,
       modelValue: [Array, String, Object]
     },
     emits: ['update:modelValue', 'change', 'remove', 'fc.el'],
@@ -1470,6 +1468,14 @@
       handleRemove: function handleRemove(file, fileList) {
         this.$emit.apply(this, ['remove'].concat(Array.prototype.slice.call(arguments)));
         this.update(fileList);
+      },
+      doHttpRequest: function doHttpRequest(option) {
+        if (this.httpRequest) {
+          return this.httpRequest(option);
+        } else {
+          option.source = 'upload';
+          this.formCreateInject.api.fetch(option);
+        }
       }
     },
     render: function render() {
@@ -1490,6 +1496,7 @@
         "onPreview": this.handlePreview,
         "onChange": this.handleChange,
         "onRemove": this.handleRemove,
+        "httpRequest": this.doHttpRequest,
         "fileList": this.fileList,
         "ref": "upload"
       }), _objectSpread2({
@@ -1502,7 +1509,7 @@
             "type": "primary"
           }, {
             "default": function _default() {
-              return [vue.createTextVNode("\u70B9\u51FB\u4E0A\u4F20")];
+              return [_this.formCreateInject.t('clickToUpload') || '点击上传'];
             }
           }))];
         }
@@ -1780,6 +1787,7 @@
           return;
         }
 
+        this.cacheRule[key].$f && this.cacheRule[key].$f.setValue(value);
         this.cache(key, value);
       },
       addRule: function addRule(i, emit) {
@@ -2516,7 +2524,7 @@
 
   var keyAttrs = ['type', 'slot', 'ignore', 'emitPrefix', 'value', 'name', 'native', 'hidden', 'display', 'inject', 'options', 'emit', 'link', 'prefix', 'suffix', 'update', 'sync', 'optionsTo', 'key', 'slotUpdate', 'computed', 'preview', 'component', 'cache', 'modelEmit'];
   var arrayAttrs = ['validate', 'children', 'control'];
-  var normalAttrs = ['effect', 'deep'];
+  var normalAttrs = ['effect', 'deep', 'renderSlots'];
   function attrs() {
     return [].concat(keyAttrs, _toConsumableArray(normalMerge), _toConsumableArray(toArrayMerge), _toConsumableArray(functionalMerge), arrayAttrs, normalAttrs);
   }
@@ -3003,6 +3011,13 @@
     var xhr = new XMLHttpRequest();
     var action = option.action || '';
 
+    if (xhr.upload && option.onProgress) {
+      xhr.upload.addEventListener('progress', function (evt) {
+        evt.percent = evt.total > 0 ? evt.loaded / evt.total * 100 : 0;
+        option.onProgress(evt);
+      });
+    }
+
     if (option.query) {
       var queryString = new URLSearchParams(option.query).toString();
 
@@ -3028,18 +3043,22 @@
     xhr.open(option.method || 'get', action, true);
     var formData;
 
-    if (option.data) {
-      if ((option.dataType || '').toLowerCase() !== 'json') {
+    if (option.data || option.file) {
+      if (option.file || (option.dataType || '').toLowerCase() !== 'json') {
         formData = new FormData();
-        Object.keys(option.data).map(function (key) {
+        Object.keys(option.data || {}).map(function (key) {
           formData.append(key, option.data[key]);
         });
       } else {
-        formData = JSON.stringify(option.data);
+        formData = JSON.stringify(option.data || {});
         xhr.setRequestHeader('content-type', 'application/json');
       }
     }
 
+    if (option.file) {
+      formData.append(option.filename, option.file, option.file.name);
+    }
+
     if (option.withCredentials && 'withCredentials' in xhr) {
       xhr.withCredentials = true;
     }
@@ -3506,7 +3525,11 @@
           });
         });
         vue.nextTick(function () {
-          api.clearValidateState();
+          vue.nextTick(function () {
+            vue.nextTick(function () {
+              api.clearValidateState(fields);
+            });
+          });
         });
 
         if (fields == null) {
@@ -3900,7 +3923,7 @@
         if (!this.cacheConfig[ctx.trueType]) {
           this.cacheConfig[ctx.trueType] = vue.computed(function () {
             var g = _this2.$handle.options.global;
-            return mergeRule({}, [g['*'], g[ctx.originType] || g[ctx.type] || g[ctx.type] || {}]);
+            return mergeRule({}, [g['*'] || g["default"] || {}, g[ctx.originType] || g[ctx.type] || g[ctx.type] || {}]);
           });
         }
 
@@ -4002,6 +4025,14 @@
                 children = _this4.renderChildren(_load, ctx);
               }
 
+              Object.keys(prop.renderSlots || {}).forEach(function (key) {
+                children[key] = function () {
+                  var rule = _this4.parseSide(prop.renderSlots[key], ctx);
+
+                  return _this4.renderRule(rule);
+                };
+              });
+
               var slot = _this4.getTypeSlot(ctx);
 
               var _vn;
@@ -4123,6 +4154,11 @@
             field: ctx.field,
             rule: ctx.rule,
             input: ctx.input,
+            t: function t() {
+              var _this6$$handle$api;
+
+              return (_this6$$handle$api = _this6.$handle.api).t.apply(_this6$$handle$api, arguments);
+            },
             updateValue: function updateValue(data) {
               _this6.$handle.onUpdateValue(ctx, data);
             }
@@ -4474,24 +4510,16 @@
           return _this4.loadStrVar(str, get);
         };
 
-        options.action = loadVal(options.action);
-
-        if (options.headers) {
-          var _headers = {};
-          Object.keys(options.headers).forEach(function (k) {
-            _headers[loadVal(k)] = loadVal(options.headers[k]);
-          });
-          options.headers = _headers;
-        }
-
-        if (options.data) {
-          var _data = {};
-          Object.keys(options.data).forEach(function (k) {
-            _data[loadVal(k)] = loadVal(options.data[k]);
-          });
-          options.data = _data;
-        }
-
+        options.action = loadVal(options.action || '');
+        ['headers', 'data', 'query'].forEach(function (key) {
+          if (options[key]) {
+            var data = {};
+            Object.keys(options[key]).forEach(function (k) {
+              data[loadVal(k)] = loadVal(options[key][k]);
+            });
+            options[key] = data;
+          }
+        });
         return options;
       }
     });
@@ -4760,7 +4788,9 @@
       parser.init(this);
     },
     initProp: function initProp() {
-      var _this3 = this;
+      var _this3 = this,
+          _this$refRule,
+          _this$refRule$__$vali;
 
       var rule = _objectSpread2({}, this.rule);
 
@@ -4769,7 +4799,7 @@
       this.prop = mergeRule({}, [rule].concat(_toConsumableArray(Object.keys(this.payload).map(function (k) {
         return _this3.payload[k];
       })), [this.computed]));
-      this.prop.validate = [].concat(_toConsumableArray(this.refRule.__$validate.value || []), _toConsumableArray(this.prop.validate || []));
+      this.prop.validate = [].concat(_toConsumableArray(((_this$refRule = this.refRule) === null || _this$refRule === void 0 ? void 0 : (_this$refRule$__$vali = _this$refRule.__$validate) === null || _this$refRule$__$vali === void 0 ? void 0 : _this$refRule$__$vali.value) || []), _toConsumableArray(this.prop.validate || []));
     },
     initNone: function initNone() {
       this.none = !(is.Undef(this.prop.display) || !!this.prop.display);
@@ -5338,6 +5368,8 @@
   function useInput(Handler) {
     extend(Handler.prototype, {
       setValue: function setValue(ctx, value, formValue, setFlag) {
+        var _this = this;
+
         if (ctx.deleted) return;
         ctx.rule.value = value;
         this.changeStatus = true;
@@ -5356,6 +5388,16 @@
           api: this.api,
           setFlag: setFlag || false
         });
+
+        if (setFlag) {
+          vue.nextTick(function () {
+            vue.nextTick(function () {
+              vue.nextTick(function () {
+                _this.api.clearValidateState(ctx.id);
+              });
+            });
+          });
+        }
       },
       onInput: function onInput(ctx, value) {
         var val;
@@ -5365,24 +5407,24 @@
         }
       },
       onUpdateValue: function onUpdateValue(ctx, data) {
-        var _this = this;
+        var _this2 = this;
 
         this.deferSyncValue(function () {
           var group = ctx.getParentGroup();
-          var subForm = group ? _this.subRuleData[group.id] : null;
+          var subForm = group ? _this2.subRuleData[group.id] : null;
           var subData = {};
           Object.keys(data || {}).forEach(function (k) {
             if (subForm && hasProperty(subForm, k)) {
               subData[k] = data[k];
-            } else if (hasProperty(_this.api.form, k)) {
-              _this.api.form[k] = data[k];
-            } else if (_this.api.top !== _this.api && hasProperty(_this.api.top.form, k)) {
-              _this.api.top.form[k] = data[k];
+            } else if (hasProperty(_this2.api.form, k)) {
+              _this2.api.form[k] = data[k];
+            } else if (_this2.api.top !== _this2.api && hasProperty(_this2.api.top.form, k)) {
+              _this2.api.top.form[k] = data[k];
             }
           });
 
           if (Object.keys(subData).length) {
-            _this.api.setChildrenFormData(group.rule, subData);
+            _this2.api.setChildrenFormData(group.rule, subData);
           }
         });
       },
@@ -5417,7 +5459,7 @@
         return this.formData[ctx.id];
       },
       syncForm: function syncForm() {
-        var _this2 = this;
+        var _this3 = this;
 
         var data = vue.reactive({});
         var fields = this.fields();
@@ -5426,7 +5468,7 @@
         if (this.options.appendValue !== false) {
           Object.keys(this.appendData).reduce(function (initial, field) {
             if (fields.indexOf(field) === -1) {
-              initial[field] = vue.toRef(_this2.appendData, field);
+              initial[field] = vue.toRef(_this3.appendData, field);
             }
 
             return initial;
@@ -5434,11 +5476,11 @@
         }
 
         fields.reduce(function (initial, field) {
-          var ctx = (_this2.fieldCtx[field] || []).filter(function (ctx) {
-            return !_this2.isIgnore(ctx.rule);
-          })[0] || _this2.fieldCtx[field][0];
+          var ctx = (_this3.fieldCtx[field] || []).filter(function (ctx) {
+            return !_this3.isIgnore(ctx.rule);
+          })[0] || _this3.fieldCtx[field][0];
 
-          if (_this2.isIgnore(ctx.rule)) {
+          if (_this3.isIgnore(ctx.rule)) {
             ignoreFields.push(field);
           }
 
@@ -5483,7 +5525,7 @@
         }
       },
       syncValue: function syncValue() {
-        var _this3 = this;
+        var _this4 = this;
 
         if (this.deferSyncFn) {
           return this.deferSyncFn.sync = true;
@@ -5491,8 +5533,8 @@
 
         var data = {};
         Object.keys(this.form).forEach(function (k) {
-          if (_this3.ignoreFields.indexOf(k) === -1) {
-            data[k] = _this3.form[k];
+          if (_this4.ignoreFields.indexOf(k) === -1) {
+            data[k] = _this4.form[k];
           }
         });
         this.vm.setupState.updateValue(data);
@@ -5504,11 +5546,11 @@
         return (is.Object(value) || Array.isArray(value)) && value === ctx.rule.value;
       },
       refreshUpdate: function refreshUpdate(ctx, val, origin, field) {
-        var _this4 = this;
+        var _this5 = this;
 
         if (is.Function(ctx.rule.update)) {
           var state = invoke(function () {
-            return ctx.rule.update(val, ctx.origin, _this4.api, {
+            return ctx.rule.update(val, ctx.origin, _this5.api, {
               origin: origin || 'change',
               linkField: field
             });
@@ -5532,18 +5574,18 @@
         this.refreshUpdate(ctx, val, origin, field);
       },
       appendLink: function appendLink(ctx) {
-        var _this5 = this;
+        var _this6 = this;
 
         var link = ctx.rule.link;
         is.trueArray(link) && link.forEach(function (field) {
           var fn = function fn() {
-            return _this5.refreshRule(ctx, ctx.rule.value, 'link', field);
+            return _this6.refreshRule(ctx, ctx.rule.value, 'link', field);
           };
 
-          _this5.bus.$on('change-' + field, fn);
+          _this6.bus.$on('change-' + field, fn);
 
           ctx.linkOn.push(function () {
-            return _this5.bus.$off('change-' + field, fn);
+            return _this6.bus.$off('change-' + field, fn);
           });
         });
       },
@@ -6616,7 +6658,7 @@
     var loadData = {
       name: 'loadData',
       _fn: [],
-      mounted: function mounted(inject, rule, api) {
+      loaded: function loaded(inject, rule, api) {
         this.deleted(inject);
         var attrs = toArray(inject.getValue());
         var unwatchs = [];
@@ -6627,6 +6669,8 @@
 
               if (attr.template) {
                 value = fc.$handle.loadStrVar(attr.template, get);
+              } else if (attr.handler && is.Function(attr.handler)) {
+                value = attr.handler(get, rule, api);
               } else {
                 value = get(attr.attr, attr["default"]);
               }
@@ -6931,7 +6975,7 @@
     var fetchAttr = {
       name: 'fetch',
       _fn: [],
-      mounted: function mounted() {
+      loaded: function loaded() {
         run.apply(void 0, arguments);
       },
       watch: function watch() {
@@ -7016,6 +7060,20 @@
     return null;
   }
 
+  function getSessionStorage(name) {
+    var value = sessionStorage.getItem(name);
+
+    if (value) {
+      try {
+        return JSON.parse(value);
+      } catch (e) {
+        return value;
+      }
+    }
+
+    return null;
+  }
+
   function baseDriver(driver, name) {
     if (!name) {
       return null;
@@ -7040,6 +7098,9 @@
   function localStorageDriver(name) {
     return baseDriver(getLocalStorage, name);
   }
+  function sessionStorageDriver(name) {
+    return baseDriver(getSessionStorage, name);
+  }
 
   function parseProp(name, id) {
     var prop;
@@ -7440,10 +7501,6 @@
       t: function t(id, params, get) {
         var value = get ? get('$t.' + id) : this.globalLanguageDriver(id);
 
-        if (value == null && this.vm.appContext.config.globalProperties.$i18n) {
-          return this.vm.appContext.config.globalProperties.$i18n.t(id, params);
-        }
-
         if (value == null) {
           value = '';
         }
@@ -7551,10 +7608,6 @@
           return locale;
         }
 
-        if (this.vm.appContext.config.globalProperties.$i18n && this.vm.appContext.config.globalProperties.$i18n.locale) {
-          return this.vm.appContext.config.globalProperties.$i18n.locale;
-        }
-
         return 'zh-cn';
       },
       globalLanguageDriver: function globalLanguageDriver(id) {
@@ -7583,7 +7636,7 @@
         var option = this.options.value.globalVariable && this.options.value.globalVariable[key];
 
         if (option) {
-          var handle = is.Function(option) ? option : option.handle;
+          var handle = is.Function(option) ? option : parseFn(option.handle);
 
           if (handle) {
             return deepGet(invoke(function () {
@@ -7870,6 +7923,7 @@
     useStatic(prototype);
     setDataDriver('$cookie', cookieDriver);
     setDataDriver('$localStorage', localStorageDriver);
+    setDataDriver('$sessionStorage', sessionStorageDriver);
     CreateNode.use({
       fragment: 'fcFragment'
     });
@@ -8101,7 +8155,7 @@
         type: 'primary',
         loading: false,
         disabled: false,
-        innerText: '提交',
+        innerText: '',
         show: true,
         col: undefined,
         click: undefined
@@ -8110,7 +8164,7 @@
         type: 'default',
         loading: false,
         disabled: false,
-        innerText: '重置',
+        innerText: '',
         show: false,
         col: undefined,
         click: undefined
@@ -8297,7 +8351,9 @@
       return !(!title.title && !title["native"] || isFalse(title.show));
     },
     makeInfo: function makeInfo(rule, uni, ctx) {
-      var _this5 = this;
+      var _ctx$refRule,
+          _ctx$refRule2,
+          _this5 = this;
 
       var titleProp = _objectSpread2({}, rule.title);
 
@@ -8307,10 +8363,10 @@
       var form = this.options.form;
       var titleSlot = this.getSlot('title');
       var children = [titleSlot ? titleSlot({
-        title: ctx.refRule.__$title.value,
+        title: (_ctx$refRule = ctx.refRule) === null || _ctx$refRule === void 0 ? void 0 : _ctx$refRule.__$title.value,
         rule: ctx.rule,
         options: this.options
-      }) : ctx.refRule.__$title.value + (form.labelSuffix || form['label-suffix'] || '')];
+      }) : ((_ctx$refRule2 = ctx.refRule) === null || _ctx$refRule2 === void 0 ? void 0 : _ctx$refRule2.__$title.value) + (form.labelSuffix || form['label-suffix'] || '')];
 
       if (!isFalse(infoProp.show) && (infoProp.info || infoProp["native"]) && !isFalse(infoProp.icon)) {
         var prop = {
@@ -8326,7 +8382,9 @@
         var field = 'content';
 
         if (infoProp.info && !hasProperty(prop.props, field)) {
-          prop.props[field] = ctx.refRule.__$info.value;
+          var _ctx$refRule3;
+
+          prop.props[field] = (_ctx$refRule3 = ctx.refRule) === null || _ctx$refRule3 === 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 () {
@@ -8410,7 +8468,7 @@
 
       var resetBtn = _objectSpread2({}, this.options.resetBtn);
 
-      var innerText = resetBtn.innerText;
+      var innerText = resetBtn.innerText || this.$handle.api.t('reset') || '重置';
       delete resetBtn.innerText;
       delete resetBtn.click;
       delete resetBtn.col;
@@ -8436,7 +8494,7 @@
 
       var submitBtn = _objectSpread2({}, this.options.submitBtn);
 
-      var innerText = submitBtn.innerText;
+      var innerText = submitBtn.innerText || this.$handle.api.t('submit') || '提交';
       delete submitBtn.innerText;
       delete submitBtn.click;
       delete submitBtn.col;
@@ -8732,14 +8790,18 @@
           }
         }, val);
 
+        var title = rule.__fc__.refRule.__$title.value;
+
         if (!validate.message) {
-          validate.message = rule.__fc__.refRule.__$title.value + (api.getLocale() === 'en' ? ' is required' : '不能为空');
+          validate.message = api.t('required', {
+            title: title
+          }) || title + (api.getLocale() === 'en' ? ' is required' : '不能为空');
         } else {
           var match = validate.message.match(/^\{\{\s*\$t\.(.+)\s*\}\}$/);
 
           if (match) {
             validate.message = api.t(match[1], {
-              title: rule.__fc__.refRule.__$title.value
+              title: title
             });
           }
         }
@@ -8801,7 +8863,7 @@
   function elmFormCreate() {
     return FormCreateFactory({
       ui: 'element-ui',
-      version: '3.2.16',
+      version: '3.2.18',
       manager: manager,
       extendApi: extendApi,
       install: install,