diff --git a/src/upload/themes/custom-file.tsx b/src/upload/themes/custom-file.tsx index 72ebf25ed..8ec4592c2 100644 --- a/src/upload/themes/custom-file.tsx +++ b/src/upload/themes/custom-file.tsx @@ -32,7 +32,6 @@ export default defineComponent({ setup(props) { const { accept } = toRefs(props); - const drag = useDrag(props.dragEvents, accept); const { dragActive } = drag; diff --git a/src/upload/themes/dragger-file.tsx b/src/upload/themes/dragger-file.tsx index 17009f737..d51a37081 100644 --- a/src/upload/themes/dragger-file.tsx +++ b/src/upload/themes/dragger-file.tsx @@ -18,6 +18,7 @@ import useGlobalIcon from '../../hooks/useGlobalIcon'; import ImageViewer from '../../image-viewer'; import { renderTNodeJSX } from '../../utils/render-tnode'; import Image from '../../image'; +import { UploadConfig } from '../../config-provider'; export interface DraggerProps extends CommonDisplayFileProps { trigger?: TdUploadProps['trigger']; @@ -41,7 +42,7 @@ export default defineComponent({ setup(props: DraggerProps) { const { displayFiles, accept } = toRefs(props); - + const locale = computed(() => props.locale as UploadConfig); const { sizeClassNames } = useCommonClassName(); const uploadPrefix = `${props.classPrefix}-upload`; @@ -69,6 +70,7 @@ export default defineComponent({ sizeClassNames, uploadPrefix, icons, + locale, }; }, diff --git a/src/upload/themes/image-card.tsx b/src/upload/themes/image-card.tsx index 0028dffaa..9ab143325 100644 --- a/src/upload/themes/image-card.tsx +++ b/src/upload/themes/image-card.tsx @@ -18,6 +18,7 @@ import { abridgeName } from '../../_common/js/upload/utils'; import { renderTNodeJSX } from '../../utils/render-tnode'; import Link from '../../link'; import Image from '../../image'; +import { UploadConfig } from '../../config-provider'; export interface ImageCardUploadProps extends CommonDisplayFileProps { multiple: TdUploadProps['multiple']; @@ -45,6 +46,7 @@ export default defineComponent({ }, setup(props: ImageCardUploadProps) { + const locale = computed(() => props.locale as UploadConfig); const { displayFiles, multiple, max } = toRefs(props); const icons = useGlobalIcon({ AddIcon: TdAddIcon, @@ -63,6 +65,7 @@ export default defineComponent({ return { icons, showTrigger, + locale, }; }, diff --git a/src/upload/themes/multiple-flow-list.tsx b/src/upload/themes/multiple-flow-list.tsx index cbbd60610..7ac80b9a9 100644 --- a/src/upload/themes/multiple-flow-list.tsx +++ b/src/upload/themes/multiple-flow-list.tsx @@ -37,6 +37,7 @@ import TLoading from '../../loading'; import Link from '../../link'; import { renderTNodeJSX } from '../../utils/render-tnode'; import Image from '../../image'; +import { UploadConfig } from '../../config-provider'; export interface ImageFlowListProps extends CommonDisplayFileProps { uploadFiles?: (toFiles?: UploadFile[]) => void; @@ -69,9 +70,8 @@ export default defineComponent({ setup(props: ImageFlowListProps, context) { // locale 已经在 useUpload 中统一处理优先级 - const { - locale, uploading, classPrefix, accept, - } = toRefs(props); + const { uploading, classPrefix, accept } = toRefs(props); + const locale = computed(() => props.locale as UploadConfig); const uploadPrefix = `${classPrefix.value}-upload`; const icons = useGlobalIcon({ @@ -150,6 +150,7 @@ export default defineComponent({ browseIconClick, closePreview, previewIndexChange, + locale, }; }, @@ -286,7 +287,7 @@ export default defineComponent({ renderBatchActionCol(index: number) { // 第一行数据才需要合并单元格 return index === 0 ? ( - + {!this.displayFiles.length && ( - {this.renderEmpty()} + {this.renderEmpty()} )} {this.displayFiles.map((file, index) => { diff --git a/src/upload/themes/normal-file.tsx b/src/upload/themes/normal-file.tsx index 6d415355c..b44e837b5 100644 --- a/src/upload/themes/normal-file.tsx +++ b/src/upload/themes/normal-file.tsx @@ -14,6 +14,7 @@ import { abridgeName } from '../../_common/js/upload/utils'; import { useGlobalIcon } from '../../hooks/useGlobalIcon'; import { CommonDisplayFileProps } from '../interface'; import { commonProps } from '../constants'; +import { UploadConfig } from '../../config-provider'; export interface NormalFileProps extends CommonDisplayFileProps { multiple: boolean; @@ -35,7 +36,7 @@ const NormalFile = defineComponent({ ErrorCircleFilledIcon: TdErrorCircleFilledIcon, CloseCircleFilledIcon: TdCloseCircleFilledIcon, }); - + const locale = computed(() => props.locale as UploadConfig); const uploadPrefix = computed(() => `${props.classPrefix}-upload`); const classes = computed(() => [`${uploadPrefix.value}__single`, `${uploadPrefix.value}__single-${props.theme}`]); @@ -44,6 +45,7 @@ const NormalFile = defineComponent({ classes, uploadPrefix, icons, + locale, }; },