@form-create/element-ui 3.2.17 → 3.2.18

package/dist/form-create.esm.js

@@ -1,10 +1,10 @@
 /*!
- * @form-create/element-ui v3.2.17
+ * @form-create/element-ui v3.2.18
  * (c) 2018-2025 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
  */
-import { defineComponent, toRef, ref, watch, computed, createVNode, resolveComponent, mergeProps as mergeProps$1, openBlock, createElementBlock, createElementVNode, isVNode, nextTick, createTextVNode, markRaw, reactive, getCurrentInstance, provide, inject, toRefs, onBeforeMount, watchEffect, onMounted, onBeforeUnmount, onUpdated, withDirectives, resolveDirective, createApp, h } from 'vue';
+import { defineComponent, toRef, ref, watch, computed, createVNode, resolveComponent, mergeProps as mergeProps$1, openBlock, createElementBlock, createElementVNode, nextTick, markRaw, reactive, getCurrentInstance, provide, inject, toRefs, onBeforeMount, watchEffect, onMounted, onBeforeUnmount, onUpdated, isVNode, withDirectives, resolveDirective, createApp, h } from 'vue';
 
 function ownKeys(object, enumerableOnly) {
   var keys = Object.keys(object);
@@ -198,11 +198,11 @@ function _nonIterableSpread() {
 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) {
@@ -548,10 +548,6 @@ function render$2(_ctx, _cache, $props, $setup, $data, $options) {
 
 script$2.render = render$2;
 
-function _isSlot(s) {
-  return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !isVNode(s);
-}
-
 var NAME$7 = 'fcFrame';
 var Frame = defineComponent({
   name: NAME$7,
@@ -591,11 +587,11 @@ var Frame = defineComponent({
     },
     okBtnText: {
       type: String,
-      "default": '确定'
+      "default": ''
     },
     closeBtnText: {
       type: String,
-      "default": '关闭'
+      "default": ''
     },
     modalTitle: String,
     handleIcon: {
@@ -929,18 +925,18 @@ var Frame = defineComponent({
         "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 ? createVNode(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]);
     }
@@ -1412,8 +1408,10 @@ var Upload = defineComponent({
   props: {
     previewMask: undefined,
     onPreview: Function,
+    httpRequest: Function,
     modalTitle: String,
     listType: String,
+    formCreateInject: Object,
     modelValue: [Array, String, Object]
   },
   emits: ['update:modelValue', 'change', 'remove', 'fc.el'],
@@ -1466,6 +1464,14 @@ var Upload = defineComponent({
     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() {
@@ -1486,6 +1492,7 @@ var Upload = defineComponent({
       "onPreview": this.handlePreview,
       "onChange": this.handleChange,
       "onRemove": this.handleRemove,
+      "httpRequest": this.doHttpRequest,
       "fileList": this.fileList,
       "ref": "upload"
     }), _objectSpread2({
@@ -1498,7 +1505,7 @@ var Upload = defineComponent({
           "type": "primary"
         }, {
           "default": function _default() {
-            return [createTextVNode("\u70B9\u51FB\u4E0A\u4F20")];
+            return [_this.formCreateInject.t('clickToUpload') || '点击上传'];
           }
         }))];
       }
@@ -1776,6 +1783,7 @@ var Group = defineComponent({
         return;
       }
 
+      this.cacheRule[key].$f && this.cacheRule[key].$f.setValue(value);
       this.cache(key, value);
     },
     addRule: function addRule(i, emit) {
@@ -2512,7 +2520,7 @@ var mergeFn = function mergeFn(fn1, fn2) {
 
 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);
 }
@@ -2999,6 +3007,13 @@ function fetch$1(option) {
   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();
 
@@ -3024,18 +3039,22 @@ function fetch$1(option) {
   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;
   }
@@ -3502,7 +3521,11 @@ function Api(h) {
         });
       });
       nextTick(function () {
-        api.clearValidateState();
+        nextTick(function () {
+          nextTick(function () {
+            api.clearValidateState(fields);
+          });
+        });
       });
 
       if (fields == null) {
@@ -3896,7 +3919,7 @@ function useRender$1(Render) {
       if (!this.cacheConfig[ctx.trueType]) {
         this.cacheConfig[ctx.trueType] = 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] || {}]);
         });
       }
 
@@ -3998,6 +4021,14 @@ function useRender$1(Render) {
               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;
@@ -4119,6 +4150,11 @@ function useRender$1(Render) {
           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);
           }
@@ -4748,7 +4784,9 @@ extend(RuleContext.prototype, {
     parser.init(this);
   },
   initProp: function initProp() {
-    var _this3 = this;
+    var _this3 = this,
+        _this$refRule,
+        _this$refRule$__$vali;
 
     var rule = _objectSpread2({}, this.rule);
 
@@ -4757,7 +4795,7 @@ extend(RuleContext.prototype, {
     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);
@@ -5326,6 +5364,8 @@ function isCtrl(ctx) {
 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;
@@ -5344,6 +5384,16 @@ function useInput(Handler) {
         api: this.api,
         setFlag: setFlag || false
       });
+
+      if (setFlag) {
+        nextTick(function () {
+          nextTick(function () {
+            nextTick(function () {
+              _this.api.clearValidateState(ctx.id);
+            });
+          });
+        });
+      }
     },
     onInput: function onInput(ctx, value) {
       var val;
@@ -5353,24 +5403,24 @@ function useInput(Handler) {
       }
     },
     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);
         }
       });
     },
@@ -5405,7 +5455,7 @@ function useInput(Handler) {
       return this.formData[ctx.id];
     },
     syncForm: function syncForm() {
-      var _this2 = this;
+      var _this3 = this;
 
       var data = reactive({});
       var fields = this.fields();
@@ -5414,7 +5464,7 @@ function useInput(Handler) {
       if (this.options.appendValue !== false) {
         Object.keys(this.appendData).reduce(function (initial, field) {
           if (fields.indexOf(field) === -1) {
-            initial[field] = toRef(_this2.appendData, field);
+            initial[field] = toRef(_this3.appendData, field);
           }
 
           return initial;
@@ -5422,11 +5472,11 @@ function useInput(Handler) {
       }
 
       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);
         }
 
@@ -5471,7 +5521,7 @@ function useInput(Handler) {
       }
     },
     syncValue: function syncValue() {
-      var _this3 = this;
+      var _this4 = this;
 
       if (this.deferSyncFn) {
         return this.deferSyncFn.sync = true;
@@ -5479,8 +5529,8 @@ function useInput(Handler) {
 
       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);
@@ -5492,11 +5542,11 @@ function useInput(Handler) {
       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
           });
@@ -5520,18 +5570,18 @@ function useInput(Handler) {
       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);
         });
       });
     },
@@ -6604,7 +6654,7 @@ var loadData = function loadData(fc) {
   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 = [];
@@ -6921,7 +6971,7 @@ var fetch = function fetch(fc) {
   var fetchAttr = {
     name: 'fetch',
     _fn: [],
-    mounted: function mounted() {
+    loaded: function loaded() {
       run.apply(void 0, arguments);
     },
     watch: function watch() {
@@ -7006,6 +7056,20 @@ function getLocalStorage(name) {
   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;
@@ -7030,6 +7094,9 @@ function cookieDriver(name) {
 function localStorageDriver(name) {
   return baseDriver(getLocalStorage, name);
 }
+function sessionStorageDriver(name) {
+  return baseDriver(getSessionStorage, name);
+}
 
 function parseProp(name, id) {
   var prop;
@@ -7852,6 +7919,7 @@ function FormCreateFactory(config) {
   useStatic(prototype);
   setDataDriver('$cookie', cookieDriver);
   setDataDriver('$localStorage', localStorageDriver);
+  setDataDriver('$sessionStorage', sessionStorageDriver);
   CreateNode.use({
     fragment: 'fcFragment'
   });
@@ -8083,7 +8151,7 @@ function getConfig() {
       type: 'primary',
       loading: false,
       disabled: false,
-      innerText: '提交',
+      innerText: '',
       show: true,
       col: undefined,
       click: undefined
@@ -8092,7 +8160,7 @@ function getConfig() {
       type: 'default',
       loading: false,
       disabled: false,
-      innerText: '重置',
+      innerText: '',
       show: false,
       col: undefined,
       click: undefined
@@ -8279,7 +8347,9 @@ var manager = {
     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);
 
@@ -8289,10 +8359,10 @@ var manager = {
     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 = {
@@ -8308,7 +8378,9 @@ var manager = {
       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 () {
@@ -8392,7 +8464,7 @@ var manager = {
 
     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;
@@ -8418,7 +8490,7 @@ var manager = {
 
     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;
@@ -8714,14 +8786,18 @@ var required = {
         }
       }, 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
           });
         }
       }
@@ -8783,7 +8859,7 @@ function install(FormCreate) {
 function elmFormCreate() {
   return FormCreateFactory({
     ui: 'element-ui',
-    version: '3.2.17',
+    version: '3.2.18',
     manager: manager,
     extendApi: extendApi,
     install: install,