vxe-pc-ui 4.5.23 → 4.5.24

package/lib/index.umd.js

@@ -4186,14 +4186,14 @@ function checkDynamic() {
 }
 ;// CONCATENATED MODULE: ./packages/ui/src/log.ts
 
-const log_version = `ui v${"4.5.23"}`;
+const log_version = `ui v${"4.5.24"}`;
 const warnLog = log.create('warn', log_version);
 const errLog = log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
 
-const ui_version = "4.5.23";
+const ui_version = "4.5.24";
 index_esm_VxeUI.uiVersion = ui_version;
 index_esm_VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -4534,8 +4534,10 @@ setConfig({
     showRemoveButton: true,
     showButtonIcon: true,
     showPreview: true,
-    dragToUpload: true
-    // imageConfig: {}
+    dragToUpload: true,
+    // imageConfig: {},
+    showLimitSize: true,
+    showLimitCount: true
   },
   watermark: {
     rotate: -30,
@@ -24929,9 +24931,11 @@ function getOptUniqueId() {
           if (isEsc || isTab) {
             hideOptionPanel();
           } else if (isEnter) {
-            evnt.preventDefault();
-            evnt.stopPropagation();
-            changeOptionEvent(evnt, currentOption);
+            if (currentOption) {
+              evnt.preventDefault();
+              evnt.stopPropagation();
+              changeOptionEvent(evnt, currentOption);
+            }
           } else if (isUpArrow || isDwArrow) {
             evnt.preventDefault();
             let offsetOption = findOffsetOption(currentOption, isDwArrow);
@@ -34438,10 +34442,26 @@ const saveLocalFile = options => {
       type: [String, Number],
       default: () => getConfig().upload.limitSize
     },
+    showLimitSize: {
+      type: Boolean,
+      default: () => getConfig().upload.showLimitSize
+    },
+    limitSizeText: {
+      type: [String, Number, Function],
+      default: () => getConfig().upload.limitSizeText
+    },
     limitCount: {
       type: [String, Number],
       default: () => getConfig().upload.limitCount
     },
+    showLimitCount: {
+      type: Boolean,
+      default: () => getConfig().upload.showLimitCount
+    },
+    limitCountText: {
+      type: [String, Number, Function],
+      default: () => getConfig().upload.limitCountText
+    },
     nameField: {
       type: String,
       default: () => getConfig().upload.nameField
@@ -34467,7 +34487,7 @@ const saveLocalFile = options => {
       default: () => getConfig().upload.showProgress
     },
     progressText: {
-      type: String,
+      type: [String, Number, Function],
       default: () => getConfig().upload.progressText
     },
     autoHiddenButton: {
@@ -34479,7 +34499,7 @@ const saveLocalFile = options => {
       default: () => getConfig().upload.showUploadButton
     },
     buttonText: {
-      type: String,
+      type: [String, Number, Function],
       default: () => getConfig().upload.buttonText
     },
     buttonIcon: {
@@ -34510,7 +34530,7 @@ const saveLocalFile = options => {
       type: Boolean,
       default: () => null
     },
-    tipText: String,
+    tipText: [String, Number, Function],
     hintText: String,
     previewMethod: Function,
     uploadMethod: Function,
@@ -34602,7 +34622,7 @@ const saveLocalFile = options => {
     const computeSizeProp = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       return props.sizeField || 'size';
     });
-    const computeLimitMaxSizeB = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+    const computeLimitMaxSize = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(props.limitSize) * 1024 * 1024;
     });
     const computeLimitMaxCount = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
@@ -34667,6 +34687,9 @@ const saveLocalFile = options => {
       if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(tipText)) {
         return tipText;
       }
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(tipText)) {
+        return `${tipText({})}`;
+      }
       const defTips = [];
       if (isImage) {
         if (multiple && limitCount) {
@@ -34979,7 +35002,11 @@ const saveLocalFile = options => {
     const uploadFile = (files, evnt) => {
       const {
         multiple,
-        urlMode
+        urlMode,
+        showLimitSize,
+        limitSizeText,
+        showLimitCount,
+        limitCountText
       } = props;
       const {
         fileList
@@ -34990,26 +35017,36 @@ const saveLocalFile = options => {
       const typeProp = computeTypeProp.value;
       const urlProp = computeUrlProp.value;
       const sizeProp = computeSizeProp.value;
-      const limitMaxSizeB = computeLimitMaxSizeB.value;
+      const limitMaxSize = computeLimitMaxSize.value;
       const limitMaxCount = computeLimitMaxCount.value;
       const limitSizeUnit = computeLimitSizeUnit.value;
       let selectFiles = files;
       if (multiple && limitMaxCount) {
         // 校验文件数量
-        if (fileList.length >= limitMaxCount) {
+        if (showLimitCount && fileList.length >= limitMaxCount) {
           if (index_esm_VxeUI.modal) {
             index_esm_VxeUI.modal.notification({
               title: i18n_getI18n('vxe.modal.errTitle'),
               status: 'error',
-              content: i18n_getI18n('vxe.upload.overCountErr', [limitMaxCount])
+              content: limitCountText ? `${external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(limitCountText) ? limitCountText({
+                maxCount: limitMaxCount
+              }) : limitCountText}` : i18n_getI18n('vxe.upload.overCountErr', [limitMaxCount])
             });
           }
           return;
         }
         const overNum = selectFiles.length - (limitMaxCount - fileList.length);
-        if (overNum > 0) {
+        if (showLimitCount && overNum > 0) {
           const overExtraList = selectFiles.slice(limitMaxCount - fileList.length);
-          if (index_esm_VxeUI.modal) {
+          if (limitCountText) {
+            index_esm_VxeUI.modal.notification({
+              title: i18n_getI18n('vxe.modal.errTitle'),
+              status: 'error',
+              content: `${external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(limitCountText) ? limitCountText({
+                maxCount: limitMaxCount
+              }) : limitCountText}`
+            });
+          } else if (index_esm_VxeUI.modal) {
             index_esm_VxeUI.modal.notification({
               title: i18n_getI18n('vxe.modal.errTitle'),
               status: 'error',
@@ -35034,15 +35071,17 @@ const saveLocalFile = options => {
         selectFiles = selectFiles.slice(0, limitMaxCount - fileList.length);
       }
       // 校验文件大小
-      if (limitMaxSizeB) {
+      if (showLimitSize && limitMaxSize) {
         for (let i = 0; i < files.length; i++) {
           const file = files[0];
-          if (file.size > limitMaxSizeB) {
+          if (file.size > limitMaxSize) {
             if (index_esm_VxeUI.modal) {
               index_esm_VxeUI.modal.notification({
                 title: i18n_getI18n('vxe.modal.errTitle'),
                 status: 'error',
-                content: i18n_getI18n('vxe.upload.overSizeErr', [limitSizeUnit])
+                content: limitSizeText ? `${external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(limitSizeText) ? limitSizeText({
+                  maxSize: limitMaxSize
+                }) : limitSizeText}` : i18n_getI18n('vxe.upload.overSizeErr', [limitSizeUnit])
               });
             }
             return;
@@ -35576,7 +35615,7 @@ const saveLocalFile = options => {
           class: getIcon().UPLOAD_LOADING
         })]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), showProgress && isLoading && cacheItem ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
           class: 'vxe-upload--file-item-loading-text'
-        }, progressText ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toFormatString(progressText, {
+        }, progressText ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toFormatString(`${external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(progressText) ? progressText({}) : progressText}`, {
           percent: cacheItem.percent
         }) : i18n_getI18n('vxe.upload.uploadProgress', [cacheItem.percent])) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), showErrorStatus && isError ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
           class: 'vxe-upload--image-item-error'
@@ -35641,14 +35680,14 @@ const saveLocalFile = options => {
         $upload: $xeUpload
       })) : [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(src_button, {
         class: 'vxe-upload--file-action-button',
-        content: isMoreView || showButtonText ? buttonText ? `${buttonText}` : i18n_getI18n('vxe.upload.fileBtnText') : '',
+        content: isMoreView || showButtonText ? buttonText ? `${external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(buttonText) ? buttonText({}) : buttonText}` : i18n_getI18n('vxe.upload.fileBtnText') : '',
         icon: showButtonIcon ? buttonIcon || getIcon().UPLOAD_FILE_ADD : '',
         disabled: isDisabled
       })]), showTipText && (defTipText || tipSlot) ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-upload--file-action-tip'
       }, tipSlot ? getSlotVNs(tipSlot({
         $upload: $xeUpload
-      })) : defTipText) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()]);
+      })) : `${defTipText}`) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()]);
     };
     const renderAllMode = () => {
       const {
@@ -35755,7 +35794,7 @@ const saveLocalFile = options => {
           class: getIcon().UPLOAD_LOADING
         })]), showProgress ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
           class: 'vxe-upload--image-item-loading-text'
-        }, progressText ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toFormatString(progressText, {
+        }, progressText ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toFormatString(`${external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(progressText) ? progressText({}) : progressText}`, {
           percent: cacheItem.percent
         }) : i18n_getI18n('vxe.upload.uploadProgress', [cacheItem.percent])) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), !isLoading ? isError && showErrorStatus ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
           class: 'vxe-upload--image-item-error'
@@ -35830,11 +35869,11 @@ const saveLocalFile = options => {
         class: buttonIcon || getIcon().UPLOAD_IMAGE_ADD
       })]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), isMoreView || showButtonText ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-upload--image-action-content'
-      }, buttonText ? `${buttonText}` : i18n_getI18n('vxe.upload.imgBtnText')) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), showTipText && (defTipText || tipSlot) ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+      }, buttonText ? `${external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(buttonText) ? buttonText({}) : buttonText}` : i18n_getI18n('vxe.upload.imgBtnText')) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), showTipText && (defTipText || tipSlot) ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-upload--image-action-hint'
       }, tipSlot ? getSlotVNs(tipSlot({
         $upload: $xeUpload
-      })) : defTipText) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()])])]);
+      })) : `${defTipText}`) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()])])]);
     };
     const renderImageMode = () => {
       const {