vxe-pc-ui 4.6.45 → 4.6.47

package/packages/select/src/select.ts

@@ -1128,7 +1128,17 @@ export default defineVxeComponent({
         const isDisabled = !isAdd && checkOptionDisabled(isSelected, option, group)
         const defaultSlot = slots ? slots.default : null
         const optParams = { option, group: null, $select: $xeSelect }
-        const optVNs = optionSlot ? callSlot(optionSlot, optParams) : (defaultSlot ? callSlot(defaultSlot, optParams) : getFuncText(option[(isOptGroup ? groupLabelField : labelField) as 'label']))
+        let optLabel = ''
+        let optVNs: string | VxeComponentSlotType[] = []
+        if (optionSlot) {
+          optVNs = callSlot(optionSlot, optParams)
+        } else if (defaultSlot) {
+          optVNs = callSlot(defaultSlot, optParams)
+        } else {
+          optLabel = getFuncText(option[(isOptGroup ? groupLabelField : labelField) as 'label'])
+          optVNs = optLabel
+        }
+
         return isVisible
           ? h('div', {
             key: useKey || optionKey ? optid : cIndex,
@@ -1139,9 +1149,8 @@ export default defineVxeComponent({
               'is--add': isAdd,
               'is--hover': currentOption && getOptId(currentOption) === optid
             }],
-            // attrs
             optid: optid,
-            // event
+            title: optLabel || null,
             onMousedown: (evnt: MouseEvent) => {
               const isLeftBtn = evnt.button === 0
               if (isLeftBtn) {
@@ -1258,6 +1267,7 @@ export default defineVxeComponent({
           prefixIcon: props.prefixIcon,
           suffixIcon: loading ? getIcon().SELECT_LOADED : (visiblePanel ? getIcon().SELECT_OPEN : getIcon().SELECT_CLOSE),
           autoFocus: false,
+          title: selectLabel,
           modelValue: selectLabel,
           onClear: clearEvent,
           onClick: clickEvent,

package/packages/ui/index.ts

@@ -381,7 +381,9 @@ setConfig({
     dragToUpload: true,
     // imageConfig: {},
     showLimitSize: true,
-    showLimitCount: true
+    showLimitCount: true,
+    autoSubmit: true,
+    maxSimultaneousUploads: 5
   },
   watermark: {
     rotate: -30,
@@ -504,6 +506,7 @@ setIcon({
   UPLOAD_FILE_ADD: iconPrefix + 'upload',
   UPLOAD_FILE_REMOVE: iconPrefix + 'delete',
   UPLOAD_FILE_DOWNLOAD: iconPrefix + 'download',
+  UPLOAD_IMAGE_UPLOAD: iconPrefix + 'upload',
   UPLOAD_IMAGE_RE_UPLOAD: iconPrefix + 'repeat',
   UPLOAD_IMAGE_ADD: iconPrefix + 'add',
   UPLOAD_IMAGE_REMOVE: iconPrefix + 'close',

package/packages/upload/src/upload.ts

@@ -28,6 +28,10 @@ export default defineVxeComponent({
       type: Boolean as PropType<VxeUploadPropTypes.Disabled>,
       default: null
     },
+    autoSubmit: {
+      type: Boolean as PropType<VxeUploadPropTypes.AutoSubmit>,
+      default: () => getConfig().upload.autoSubmit
+    },
     mode: {
       type: String as PropType<VxeUploadPropTypes.Mode>,
       default: () => getConfig().upload.mode
@@ -117,6 +121,7 @@ export default defineVxeComponent({
       type: [String, Number, Function] as PropType<VxeUploadPropTypes.ProgressText>,
       default: () => getConfig().upload.progressText
     },
+    showSubmitButton: Boolean as PropType<VxeUploadPropTypes.ShowSubmitButton>,
     autoHiddenButton: {
       type: Boolean as PropType<VxeUploadPropTypes.AutoHiddenButton>,
       default: () => getConfig().upload.autoHiddenButton
@@ -157,6 +162,10 @@ export default defineVxeComponent({
       type: Boolean as PropType<VxeUploadPropTypes.ShowTip>,
       default: () => null
     },
+    maxSimultaneousUploads: {
+      type: Number as PropType<VxeUploadPropTypes.MaxSimultaneousUploads>,
+      default: () => getConfig().upload.maxSimultaneousUploads
+    },
     tipText: [String, Number, Function] as PropType<VxeUploadPropTypes.TipText>,
     hintText: String as PropType<VxeUploadPropTypes.HintText>,
     previewMethod: Function as PropType<VxeUploadPropTypes.PreviewMethod>,
@@ -570,6 +579,7 @@ export default defineVxeComponent({
           const cacheItem = fileCacheMaps[fileKey]
           if (cacheItem) {
             cacheItem.percent = 100
+            cacheItem.status = 'success'
           }
           Object.assign(item, res)
           dispatchEvent('upload-success', { option: item, data: res }, null)
@@ -611,7 +621,7 @@ export default defineVxeComponent({
       if (uploadFn && cacheItem) {
         const file = cacheItem.file
         cacheItem.loading = true
-        cacheItem.status = ''
+        cacheItem.status = 'pending'
         cacheItem.percent = 0
         handleUploadResult(item, file).then(() => {
           if (urlMode) {
@@ -620,8 +630,8 @@ export default defineVxeComponent({
         })
       }
     }
-    const uploadFile = (files: File[], evnt: Event | null) => {
-      const { multiple, urlMode, showLimitSize, limitSizeText, showLimitCount, limitCountText } = props
+    const handleUploadFile = (files: File[], evnt: Event | null) => {
+      const { multiple, urlMode, showLimitSize, limitSizeText, showLimitCount, limitCountText, autoSubmit } = props
       const { fileList } = reactData
       const uploadFn = props.uploadMethod || getConfig().upload.uploadMethod
       const keyField = computeKeyField.value
@@ -716,13 +726,13 @@ export default defineVxeComponent({
         if (uploadFn) {
           cacheMaps[fileKey] = {
             file: file,
-            loading: true,
-            status: '',
+            loading: !!autoSubmit,
+            status: 'pending',
             percent: 0
           }
         }
         const item = reactive(fileObj)
-        if (uploadFn) {
+        if (uploadFn && autoSubmit) {
           uploadPromiseRests.push(
             handleUploadResult(item, file)
           )
@@ -756,7 +766,7 @@ export default defineVxeComponent({
         multiple,
         types: isImage ? imageTypes : fileTypes
       }).then((params) => {
-        uploadFile(params.files, evnt)
+        handleUploadFile(params.files, evnt)
         return params
       })
     }
@@ -908,7 +918,7 @@ export default defineVxeComponent({
         }
         return
       }
-      uploadFile(files, evnt)
+      handleUploadFile(files, evnt)
     }
 
     const handleUploadDropEvent = (evnt: DragEvent) => {
@@ -1183,6 +1193,43 @@ export default defineVxeComponent({
       dispatchEvent,
       choose () {
         return handleChoose(null)
+      },
+      submit (isFull) {
+        const { maxSimultaneousUploads } = props
+        const msNum = XEUtils.toNumber(maxSimultaneousUploads || 1) || 1
+        const { fileList, fileCacheMaps } = reactData
+        const allPendingList = fileList.filter(item => {
+          const fileKey = getFieldKey(item)
+          const cacheItem = fileCacheMaps[fileKey]
+          return cacheItem && (cacheItem.status === 'pending' || (isFull && cacheItem.status === 'error'))
+        })
+
+        const handleSubmit = (item: VxeUploadDefines.FileObjItem): Promise<void> => {
+          const fileKey = getFieldKey(item)
+          const cacheItem = fileCacheMaps[fileKey]
+          if (cacheItem) {
+            const file = cacheItem.file
+            if (file && (cacheItem.status === 'pending' || (isFull && cacheItem.status === 'error'))) {
+              cacheItem.loading = true
+              cacheItem.percent = 0
+              return handleUploadResult(item, file).then(handleNextSubmit)
+            }
+          }
+          return handleNextSubmit()
+        }
+
+        const handleNextSubmit = (): Promise<void> => {
+          if (allPendingList.length) {
+            const item = allPendingList[0]
+            allPendingList.splice(0, 1)
+            return handleSubmit(item).then(handleNextSubmit)
+          }
+          return Promise.resolve()
+        }
+
+        return Promise.all(allPendingList.splice(0, msNum).map(handleSubmit)).then(() => {
+          // 完成
+        })
       }
     }
 
@@ -1192,7 +1239,7 @@ export default defineVxeComponent({
     Object.assign($xeUpload, uploadMethods, uploadPrivateMethods)
 
     const renderFileItemList = (currList: VxeUploadDefines.FileObjItem[], isMoreView: boolean) => {
-      const { showRemoveButton, showDownloadButton, showProgress, progressText, showPreview, showErrorStatus, dragSort } = props
+      const { showRemoveButton, showDownloadButton, showProgress, progressText, showPreview, showErrorStatus, dragSort, autoSubmit, showSubmitButton } = props
       const { fileCacheMaps } = reactData
       const isDisabled = computeIsDisabled.value
       const formReadonly = computeFormReadonly.value
@@ -1210,13 +1257,21 @@ export default defineVxeComponent({
       return currList.map((item, index) => {
         const fileKey = getFieldKey(item)
         const cacheItem = fileCacheMaps[fileKey]
-        const isLoading = cacheItem && cacheItem.loading
-        const isError = cacheItem && cacheItem.status === 'error'
+        let isLoading = false
+        let isError = false
+        let isPending = false
+        const fileName = `${item[nameProp] || ''}`
+        if (cacheItem) {
+          isLoading = cacheItem.loading
+          isError = cacheItem.status === 'error'
+          isPending = cacheItem.status === 'pending'
+        }
         return h('div', {
           key: dragSort ? fileKey : index,
           class: ['vxe-upload--file-item', {
             'is--preview': showPreview,
             'is--loading': isLoading,
+            'is--pending': isPending,
             'is--error': isError
           }],
           fileid: fileKey,
@@ -1232,12 +1287,13 @@ export default defineVxeComponent({
           ]),
           h('div', {
             class: 'vxe-upload--file-item-name',
+            title: fileName,
             onClick (evnt) {
               if (!isLoading && !isError) {
                 handlePreviewFileEvent(evnt, item)
               }
             }
-          }, `${item[nameProp] || ''}`),
+          }, fileName),
           isLoading
             ? h('div', {
               class: 'vxe-upload--file-item-loading-icon'
@@ -1252,15 +1308,15 @@ export default defineVxeComponent({
               class: 'vxe-upload--file-item-loading-text'
             }, progressText ? XEUtils.toFormatString(`${XEUtils.isFunction(progressText) ? progressText({}) : progressText}`, { percent: cacheItem.percent }) : getI18n('vxe.upload.uploadProgress', [cacheItem.percent]))
             : renderEmptyElement($xeUpload),
-          showErrorStatus && isError
+          !isLoading && ((isError && showErrorStatus) || (isPending && showSubmitButton && !autoSubmit))
             ? h('div', {
-              class: 'vxe-upload--image-item-error'
+              class: 'vxe-upload--file-item-rebtn'
             }, [
               h(VxeButtonComponent, {
-                icon: getIcon().UPLOAD_IMAGE_RE_UPLOAD,
+                icon: isError ? getIcon().UPLOAD_IMAGE_RE_UPLOAD : getIcon().UPLOAD_IMAGE_UPLOAD,
                 mode: 'text',
                 status: 'primary',
-                content: getI18n('vxe.upload.reUpload'),
+                content: isError ? getI18n('vxe.upload.reUpload') : getI18n('vxe.upload.manualUpload'),
                 onClick () {
                   handleReUpload(item)
                 }
@@ -1275,7 +1331,7 @@ export default defineVxeComponent({
                 class: 'vxe-upload--file-item-corner'
               }, getSlotVNs(cornerSlot({ option: item, isMoreView, readonly: formReadonly })))
               : renderEmptyElement($xeUpload),
-            showDownloadButton && !isLoading
+            showDownloadButton && !(isLoading || isPending)
               ? h('div', {
                 class: 'vxe-upload--file-item-download-btn',
                 onClick (evnt: MouseEvent) {
@@ -1411,7 +1467,7 @@ export default defineVxeComponent({
     }
 
     const renderImageItemList = (currList: VxeUploadDefines.FileObjItem[], isMoreView: boolean) => {
-      const { showRemoveButton, showProgress, progressText, showPreview, showErrorStatus, dragSort } = props
+      const { showRemoveButton, showProgress, progressText, showPreview, showErrorStatus, dragSort, autoSubmit, showSubmitButton } = props
       const { fileCacheMaps } = reactData
       const isDisabled = computeIsDisabled.value
       const formReadonly = computeFormReadonly.value
@@ -1431,14 +1487,21 @@ export default defineVxeComponent({
       return currList.map((item, index) => {
         const fileKey = getFieldKey(item)
         const cacheItem = fileCacheMaps[fileKey]
-        const isLoading = cacheItem && cacheItem.loading
-        const isError = cacheItem && cacheItem.status === 'error'
+        let isLoading = false
+        let isError = false
+        let isPending = false
+        if (cacheItem) {
+          isLoading = cacheItem.loading
+          isError = cacheItem.status === 'error'
+          isPending = cacheItem.status === 'pending'
+        }
         return h('div', {
           key: dragSort ? fileKey : index,
           class: ['vxe-upload--image-item', {
             'is--preview': showPreview,
             'is--circle': imageOpts.circle,
             'is--loading': isLoading,
+            'is--pending': isPending,
             'is--error': isError
           }],
           fileid: fileKey,
@@ -1448,7 +1511,6 @@ export default defineVxeComponent({
           h('div', {
             class: 'vxe-upload--image-item-box',
             style: isMoreView ? null : imgStyle,
-            title: getI18n('vxe.upload.viewItemTitle'),
             onClick (evnt) {
               if (!isLoading && !isError) {
                 handlePreviewImageEvent(evnt, item, index)
@@ -1473,31 +1535,29 @@ export default defineVxeComponent({
                   : renderEmptyElement($xeUpload)
               ])
               : renderEmptyElement($xeUpload),
-            !isLoading
-              ? (
-                  isError && showErrorStatus
-                    ? h('div', {
-                      class: 'vxe-upload--image-item-error'
-                    }, [
-                      h(VxeButtonComponent, {
-                        icon: getIcon().UPLOAD_IMAGE_RE_UPLOAD,
-                        mode: 'text',
-                        status: 'primary',
-                        content: getI18n('vxe.upload.reUpload'),
-                        onClick () {
-                          handleReUpload(item)
-                        }
-                      })
-                    ])
-                    : h('div', {
-                      class: 'vxe-upload--image-item-img-wrapper'
-                    }, [
-                      h('img', {
-                        class: 'vxe-upload--image-item-img',
-                        src: getThumbnailFileUrl(item)
-                      })
-                    ])
-                )
+            h('div', {
+              class: 'vxe-upload--image-item-img-wrapper',
+              title: getI18n('vxe.upload.viewItemTitle')
+            }, [
+              h('img', {
+                class: 'vxe-upload--image-item-img',
+                src: getThumbnailFileUrl(item)
+              })
+            ]),
+            !isLoading && ((isError && showErrorStatus) || (isPending && showSubmitButton && !autoSubmit))
+              ? h('div', {
+                class: 'vxe-upload--image-item-rebtn'
+              }, [
+                h(VxeButtonComponent, {
+                  icon: isError ? getIcon().UPLOAD_IMAGE_RE_UPLOAD : getIcon().UPLOAD_IMAGE_UPLOAD,
+                  mode: 'text',
+                  status: 'primary',
+                  content: isError ? getI18n('vxe.upload.reUpload') : getI18n('vxe.upload.manualUpload'),
+                  onClick () {
+                    handleReUpload(item)
+                  }
+                })
+              ])
               : renderEmptyElement($xeUpload),
             h('div', {
               class: 'vxe-upload--image-item-btn-wrapper',

package/styles/components/upload.scss

@@ -86,24 +86,30 @@
   padding: var(--vxe-ui-layout-padding-half);
   &:hover {
     background-color: var(--vxe-ui-base-hover-background-color);
-    &:not(.is--loading) {
-      .vxe-upload--file-item-name {
-        color: var(--vxe-ui-font-primary-color);
-      }
+    .vxe-upload--file-item-name {
+      color: var(--vxe-ui-font-primary-color);
     }
   }
   &:last-child {
     margin-bottom: 0;
   }
-  &.is--loading {
-    cursor: progress;
-    color: var(--vxe-ui-input-placeholder-color);
-  }
   &.is--preview {
     .vxe-upload--file-item-name {
       cursor: pointer;
     }
   }
+  &.is--loading {
+    cursor: progress;
+    color: var(--vxe-ui-input-placeholder-color);
+    &:hover {
+      .vxe-upload--file-item-name {
+        color: var(--vxe-ui-input-placeholder-color);
+      }
+    }
+  }
+  &.is--pending {
+    color: var(--vxe-ui-input-placeholder-color);
+  }
 }
 .vxe-upload--file-over-more {
   display: flex;
@@ -131,7 +137,7 @@
   padding: var(--vxe-ui-layout-padding-half);
   color: var(--vxe-ui-input-placeholder-color);
 }
-.vxe-upload--file-item-error {
+.vxe-upload--file-item-rebtn {
   padding-right: 0.4em;
   color: var(--vxe-ui-status-error-color);
   text-decoration: none;
@@ -249,28 +255,48 @@
   }
 }
 .vxe-upload--image-item {
+  &.is--loading {
+    .vxe-upload--image-item-box {
+      cursor: progress;
+    }
+  }
+  &:hover,
+  &.is--error,
+  &.is--pending {
+    .vxe-upload--image-item-img-wrapper {
+      &::after {
+        content: "";
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+        pointer-events: none;
+      }
+    }
+  }
   &:hover {
-    &:not(.is--loading) {
+    .vxe-upload--image-item-img-wrapper {
+      &::after {
+        background-color: rgba(0, 0, 0, 0.1);
+      }
+    }
+  }
+  &.is--error,
+  &.is--pending {
+    .vxe-upload--image-item-img-wrapper {
+      &::after {
+        background-color: rgba(0, 0, 0, 0.4);
+      }
+    }
+    &:hover {
       .vxe-upload--image-item-img-wrapper {
-        border-color: var(--vxe-ui-font-primary-color);
         &::after {
-          content: "";
-          position: absolute;
-          top: 0;
-          left: 0;
-          width: 100%;
-          height: 100%;
-          pointer-events: none;
-          background-color: rgba(0, 0, 0, 0.1);;
+          background-color: rgba(0, 0, 0, 0.5);
         }
       }
     }
   }
-  &.is--loading {
-    .vxe-upload--image-item-box {
-      cursor: progress;
-    }
-  }
   &.is--error {
     .vxe-upload--image-item-img-wrapper {
       border-color: var(--vxe-ui-status-error-color);
@@ -289,6 +315,10 @@
         border-radius: 50%;
       }
     }
+    .vxe-upload--image-item-loading,
+    .vxe-upload--image-item-rebtn {
+      border-radius: 50%;
+    }
   }
 }
 .vxe-upload--image-item-img-wrapper {
@@ -316,10 +346,22 @@
   width: 100%;
   height: 100%;
   color: var(--vxe-ui-loading-color);
-  background-color: var(--vxe-ui-loading-background-color);
+  background-color: rgba(0, 0, 0, 0.6);
   z-index: 1;
   user-select: none;
 }
+.vxe-upload--image-item-rebtn {
+  position: absolute;
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(0, 0, 0, 0.6);
+}
 .vxe-upload--image-action-hint {
   font-size: 0.8em;
   word-break: break-all;
@@ -407,6 +449,13 @@
   .vxe-upload--file-list {
     max-height: none;
   }
+  .vxe-upload--file-action-btn {
+    width: 100%;
+    & > .vxe-button {
+      width: 100%;
+      max-width: 100%;
+    }
+  }
 }
 .vxe-upload,
 .vxe-upload--more-popup {

package/types/components/column.d.ts

@@ -41,9 +41,9 @@ export namespace VxeColumnPropTypes {
   export type ShowOverflow = VxeTablePropTypes.ShowOverflow
   export type ShowHeaderOverflow = ShowOverflow
   export type ShowFooterOverflow = ShowOverflow
-  export type ClassName<D = any> = string | ((params: VxeGlobalRendererHandles.RenderCellParams<D>) => string | any[] | { [key: string]: boolean })
-  export type HeaderClassName<D = any> = string | ((params: VxeGlobalRendererHandles.RenderHeaderParams<D>) => string | any[] | { [key: string]: boolean })
-  export type FooterClassName<D = any> = string | ((params: VxeGlobalRendererHandles.RenderFooterParams<D>) => string | any[] | { [key: string]: boolean })
+  export type ClassName<D = any> = string | ((params: VxeGlobalRendererHandles.RenderTableCellParams<D>) => string | any[] | { [key: string]: boolean })
+  export type HeaderClassName<D = any> = string | ((params: VxeGlobalRendererHandles.RenderTableHeaderParams<D>) => string | any[] | { [key: string]: boolean })
+  export type FooterClassName<D = any> = string | ((params: VxeGlobalRendererHandles.RenderTableFooterParams<D>) => string | any[] | { [key: string]: boolean })
   export type Padding = boolean
   export type VerticalAlign = '' | 'top' | 'center' | null
 
@@ -68,10 +68,10 @@ export namespace VxeColumnPropTypes {
   }) => string | number)
   export type SortType = 'auto' | 'string' | 'number' | null
 
-  export interface FilterItem {
+  export interface FilterItem<OD = any> {
     label?: string | number
     value?: any
-    data?: any
+    data?: OD
     resetValue?: any
     checked?: boolean
   }
@@ -80,7 +80,7 @@ export namespace VxeColumnPropTypes {
    * @deprecated
    */
   export interface Filter extends FilterItem {}
-  export type Filters = FilterItem[]
+  export type Filters<OD = any> = FilterItem<OD>[]
 
   export type FilterMultiple = boolean
 

package/types/components/input.d.ts

@@ -29,6 +29,7 @@ export namespace VxeInputPropTypes {
   export type ClassName = string
   export type Immediate = boolean
   export type Name = string
+  export type Title = string
   export type Type = 'text' | 'search' | 'number' | 'integer' | 'float' | 'password' | 'date' | 'time' | 'datetime' | 'week' | 'month' | 'quarter' | 'year'
   export type Clearable = boolean
   export type Editable = boolean
@@ -85,6 +86,7 @@ export interface VxeInputProps {
   className?: VxeInputPropTypes.ClassName
   immediate?: VxeInputPropTypes.Immediate
   name?: VxeInputPropTypes.Name
+  title?: VxeInputPropTypes.Title
   type?: VxeInputPropTypes.Type
   clearable?: VxeInputPropTypes.Clearable
   readonly?: VxeInputPropTypes.Readonly

package/types/components/table-plugins/filters-combination.d.ts

@@ -0,0 +1,15 @@
+export namespace VxeTableFilterCombinationDefines {
+  export interface SimpleData {
+    checks: string[]
+    sVal: string
+  }
+
+  export interface CombinationData extends SimpleData {
+    sMenu: string
+    fType1: 'equal' | 'unequal' | 'gt' | 'ge' | 'lt' | 'le' | 'begin' | 'notbegin' | 'endin' | 'notendin' | 'include' | 'exclude' | ''
+    fVal1: string
+    fMode: 'and' | 'or' | ''
+    fType2: string
+    fVal2: string
+  }
+}

package/types/components/table-plugins/filters-complex-input.d.ts

@@ -0,0 +1,9 @@
+export namespace VxeTableFilterComplexInputDefines {
+  export interface SimpleData {
+    sType: 'include' | 'equal' | 'begin' | 'endin' | 'gt' | 'lt' | ''
+    isSensitive: boolean
+    sVal: string
+  }
+
+  export interface ComplexData extends SimpleData {}
+}

package/types/components/table-plugins/index.d.ts

@@ -1,2 +1,4 @@
 export * from './extend-cell-area'
 export * from './extend-pivot-table'
+export * from './filters-combination'
+export * from './filters-complex-input'

package/types/components/upload.d.ts

@@ -35,6 +35,7 @@ export namespace VxeUploadPropTypes {
   export type Mode = null | '' | 'all' | 'image'
   export type Readonly = boolean
   export type Disabled = boolean
+  export type AutoSubmit = boolean
   export type ImageTypes = string[]
   export interface ImageConfig {
     width?: VxeImagePropTypes.Width
@@ -72,6 +73,7 @@ export namespace VxeUploadPropTypes {
   export type UrlField = string
   export type SizeField = string
   export type ShowTip = boolean
+  export type MaxSimultaneousUploads = number | string
   export type TipText = number | string | ((params: {}) => number | string)
   export type ButtonText = number | string | ((params: {}) => number | string)
   export type ButtonIcon = string
@@ -83,6 +85,7 @@ export namespace VxeUploadPropTypes {
   export type ShowErrorStatus = boolean
   export type ShowProgress = boolean
   export type ProgressText = number | string | ((params: {}) => number | string)
+  export type ShowSubmitButton = boolean
   export type AutoHiddenButton = boolean
   export type ShowUploadButton = boolean
   export type PreviewMethod = undefined | ((params: {
@@ -135,6 +138,7 @@ export interface VxeUploadProps {
   mode?: VxeUploadPropTypes.Mode
   readonly?: VxeUploadPropTypes.Readonly
   disabled?: VxeUploadPropTypes.Disabled
+  autoSubmit?: VxeUploadPropTypes.AutoSubmit
   imageTypes?: VxeUploadPropTypes.ImageTypes
   imageConfig?: VxeUploadPropTypes.ImageConfig
   /**
@@ -174,9 +178,14 @@ export interface VxeUploadProps {
   showErrorStatus?: VxeUploadPropTypes.ShowErrorStatus
   showProgress?: VxeUploadPropTypes.ShowProgress
   progressText?: VxeUploadPropTypes.ProgressText
+  showSubmitButton?: VxeUploadPropTypes.ShowSubmitButton
   autoHiddenButton?: VxeUploadPropTypes.AutoHiddenButton
   showTip?: VxeUploadPropTypes.ShowTip
   tipText?: VxeUploadPropTypes.TipText
+  /**
+   * 用于 autoSubmit=false，最大同时上传数量
+   */
+  maxSimultaneousUploads?: VxeUploadPropTypes.MaxSimultaneousUploads
   previewMethod?: VxeUploadPropTypes.PreviewMethod
   uploadMethod?: VxeUploadPropTypes.UploadMethod
   beforeRemoveMethod?: VxeUploadPropTypes.BeforeRemoveMethod
@@ -224,6 +233,10 @@ export interface UploadMethods {
     files: File[]
     file: File | null
   }>
+  /**
+   * 用于 auto-upload 模式，手动调用上传附件；如果传 true，这包含未上传和上传失败的都会重新提交
+   */
+  submit(isFull?: boolean): Promise<void>
 }
 export interface VxeUploadMethods extends UploadMethods { }
 
@@ -270,7 +283,7 @@ export namespace VxeUploadDefines {
   export interface FileCacheItem {
     file: File
     loading: boolean
-    status: string
+    status: 'error' | 'success' | 'pending'
     percent: number
   }
 

package/types/ui/global-icon.d.ts

@@ -160,6 +160,7 @@ declare module '@vxe-ui/core' {
     UPLOAD_FILE_ADD?: string
     UPLOAD_FILE_REMOVE?: string
     UPLOAD_FILE_DOWNLOAD?: string
+    UPLOAD_IMAGE_UPLOAD?: string
     UPLOAD_IMAGE_RE_UPLOAD?: string
     UPLOAD_IMAGE_ADD?: string
     UPLOAD_IMAGE_REMOVE?: string