diff --git a/examples/docs/resources/pc/demo/file-upload/max-file-count.vue b/examples/docs/resources/pc/demo/file-upload/max-file-count.vue index 260be3534..a74a47366 100644 --- a/examples/docs/resources/pc/demo/file-upload/max-file-count.vue +++ b/examples/docs/resources/pc/demo/file-upload/max-file-count.vue @@ -1,6 +1,8 @@ diff --git a/packages/renderless/src/upload/index.ts b/packages/renderless/src/upload/index.ts index f53cfd885..012992857 100644 --- a/packages/renderless/src/upload/index.ts +++ b/packages/renderless/src/upload/index.ts @@ -56,17 +56,9 @@ export const getFormData = ({ constants, state, parent, props }) => ({ formData, export const uploadFiles = ({ state, constants, Modal, props, t }) => (files) => { const { limit, fileList } = props - if (limit) { - const fileCount = fileList.length + files.length - if (fileCount > limit) { - props.onExceed && props.onExceed(files, fileList) - return - } else if (fileCount === limit) { - Modal.message({ - message: `${t('ui.upload.limitUploadFileNumber')}:${limit}`, - status: 'info' - }) - } + if (limit && fileList.length + files.length > limit) { + props.onExceed && props.onExceed(files, fileList) + return } let postFiles = Array.prototype.slice.call(files) diff --git a/packages/vue/src/file-upload/src/pc.vue b/packages/vue/src/file-upload/src/pc.vue index 789cc4aae..8b21397ff 100644 --- a/packages/vue/src/file-upload/src/pc.vue +++ b/packages/vue/src/file-upload/src/pc.vue @@ -55,7 +55,8 @@ export default defineComponent({ 'isFolderTitle', 'plugin', 'listOption', - 'maxNameLength' + 'maxNameLength', + 'isHidden' ], setup(props, context) { return setup({ props, context, renderless, api, extendOptions: { Modal } }) @@ -209,7 +210,8 @@ export default defineComponent({ onPreview: preview, httpRequest, isFolder, - edmToken + edmToken, + isHidden: this.isHidden }, ref: 'upload-inner' } diff --git a/packages/vue/src/upload/src/index.vue b/packages/vue/src/upload/src/index.vue index e49af4080..2fac294ed 100644 --- a/packages/vue/src/upload/src/index.vue +++ b/packages/vue/src/upload/src/index.vue @@ -67,7 +67,11 @@ export default defineComponent({ onSuccess: Function, size: String, type: String, - withCredentials: Boolean + withCredentials: Boolean, + isHidden: { + type: Boolean, + default: false + } }, setup(props, context) { return setup({ @@ -94,12 +98,13 @@ export default defineComponent({ name, uploadFiles, fileList, - limit + limit, + isHidden } = this const defaultSlot = (this.slots.default && this.slots.default()) || [] - const hidden = fileList.length >= limit + const hidden = isHidden && fileList.length >= limit return (