From 53a52ac37475f462f82f17e3e8bb551ffcef7574 Mon Sep 17 00:00:00 2001 From: typistZxd <1046866318@qq.com> Date: Tue, 18 Jan 2022 11:43:43 +0800 Subject: [PATCH] refactor(comp:upload): fix review about name --- .../components/config/src/defaultConfig.ts | 6 ++-- packages/components/config/src/types.ts | 8 ++--- packages/components/index.ts | 4 +-- packages/components/types.d.ts | 4 +-- .../components/upload/__tests__/list.spec.ts | 36 +++++++++---------- packages/components/upload/demo/Action.vue | 2 +- packages/components/upload/demo/Basic.vue | 2 +- .../components/upload/demo/ButtonDisplay.vue | 2 +- packages/components/upload/demo/Check.vue | 2 +- .../components/upload/demo/CustomRequest.vue | 2 +- packages/components/upload/demo/Dragable.vue | 2 +- packages/components/upload/demo/FilesList.vue | 2 +- packages/components/upload/demo/Hooks.vue | 2 +- packages/components/upload/demo/Icon.md | 4 +-- packages/components/upload/demo/Icon.vue | 2 +- .../components/upload/demo/ListDisplay.vue | 2 +- packages/components/upload/demo/Manual.vue | 2 +- packages/components/upload/demo/MaxCount.vue | 2 +- packages/components/upload/demo/Operation.vue | 2 +- .../components/upload/demo/StrokeColor.vue | 2 +- packages/components/upload/docs/Index.zh.md | 4 +-- packages/components/upload/index.ts | 16 ++++----- packages/components/upload/src/List.tsx | 14 ++++---- .../upload/src/component/ImageCardList.tsx | 4 +-- .../upload/src/component/ImageList.tsx | 4 +-- .../upload/src/component/TextList.tsx | 4 +-- .../upload/src/composables/useDisplay.ts | 14 ++++---- .../upload/src/composables/useOperation.ts | 4 +-- packages/components/upload/src/types.ts | 16 ++++----- 29 files changed, 85 insertions(+), 85 deletions(-) diff --git a/packages/components/config/src/defaultConfig.ts b/packages/components/config/src/defaultConfig.ts index b9439b499..73c8da3fd 100644 --- a/packages/components/config/src/defaultConfig.ts +++ b/packages/components/config/src/defaultConfig.ts @@ -57,7 +57,7 @@ import type { TreeConfig, TreeSelectConfig, UploadConfig, - UploadListConfig, + UploadFilesConfig, } from './types' import { numFormatter } from './numFormatter' @@ -211,7 +211,7 @@ const upload: UploadConfig = { requestMethod: 'post', } -const uploadList: UploadListConfig = { +const uploadFiles: UploadFilesConfig = { type: 'text', icon: { file: 'paper-clip', @@ -431,7 +431,7 @@ export const defaultConfig: GlobalConfig = { timeRangePicker, treeSelect, upload, - uploadList, + uploadFiles, // Data Display avatar, badge, diff --git a/packages/components/config/src/types.ts b/packages/components/config/src/types.ts index 0ec936bec..e7b85f11f 100644 --- a/packages/components/config/src/types.ts +++ b/packages/components/config/src/types.ts @@ -29,7 +29,7 @@ import type { StepperSize } from '@idux/components/stepper' import type { TableColumnAlign, TableColumnSortOrder, TablePaginationPosition, TableSize } from '@idux/components/table' import type { TagShape } from '@idux/components/tag' import type { TextareaAutoRows, TextareaResize } from '@idux/components/textarea' -import type { UploadIconType, UploadListType, UploadRequestMethod, UploadRequestOption } from '@idux/components/upload' +import type { UploadFilesType, UploadIconType, UploadRequestMethod, UploadRequestOption } from '@idux/components/upload' import type { VNode } from 'vue' // Common @@ -199,8 +199,8 @@ export interface UploadConfig { customRequest?: (option: UploadRequestOption) => { abort: () => void } } -export interface UploadListConfig { - type: UploadListType +export interface UploadFilesConfig { + type: UploadFilesType icon: Partial> } @@ -454,7 +454,7 @@ export interface GlobalConfig { timePicker: TimePickerConfig timeRangePicker: TimeRangePickerConfig upload: UploadConfig - uploadList: UploadListConfig + uploadFiles: UploadFilesConfig // Data Display avatar: AvatarConfig badge: BadgeConfig diff --git a/packages/components/index.ts b/packages/components/index.ts index a741f3501..882367387 100644 --- a/packages/components/index.ts +++ b/packages/components/index.ts @@ -62,7 +62,7 @@ import { IxTooltip } from '@idux/components/tooltip' import { IxTree } from '@idux/components/tree' import { IxTreeSelect } from '@idux/components/tree-select' import { IxTypography } from '@idux/components/typography' -import { IxUpload, IxUploadList } from '@idux/components/upload' +import { IxUpload, IxUploadFiles } from '@idux/components/upload' import { version } from '@idux/components/version' const components = [ @@ -152,7 +152,7 @@ const components = [ IxTree, IxTreeSelect, IxUpload, - IxUploadList, + IxUploadFiles, ] const directives: Record = { diff --git a/packages/components/types.d.ts b/packages/components/types.d.ts index 91015c81b..453c063a3 100644 --- a/packages/components/types.d.ts +++ b/packages/components/types.d.ts @@ -69,7 +69,7 @@ import type { TimePickerComponent } from '@idux/components/time-picker' import type { TimelineComponent, TimelineItemComponent } from '@idux/components/timeline' import type { TooltipComponent } from '@idux/components/tooltip' import type { TreeComponent } from '@idux/components/tree' -import type { UploadComponent, UploadListComponent } from '@idux/components/upload' +import type { UploadComponent, UploadFilesComponent } from '@idux/components/upload' declare module 'vue' { export interface GlobalComponents { @@ -156,7 +156,7 @@ declare module 'vue' { IxTooltip: TooltipComponent IxTree: TreeComponent IxUpload: UploadComponent - IxUploadList: UploadListComponent + IxUploadFiles: UploadFilesComponent } } diff --git a/packages/components/upload/__tests__/list.spec.ts b/packages/components/upload/__tests__/list.spec.ts index c2371511c..b3671e2e5 100644 --- a/packages/components/upload/__tests__/list.spec.ts +++ b/packages/components/upload/__tests__/list.spec.ts @@ -1,4 +1,4 @@ -import type { UploadListProps } from '../src/types' +import type { UploadFilesProps } from '../src/types' import type { MountingOptions } from '@vue/test-utils' import { flushPromises, mount } from '@vue/test-utils' @@ -8,14 +8,14 @@ import { renderWork } from '@tests' import { IxIcon } from '@idux/components/icon' -import UploadFilesListCpm from '../src/List' +import UploadFilesCpm from '../src/List' import { uploadToken } from '../src/token' -const uploadListMount = (options?: MountingOptions>) => { +const uploadFilesMount = (options?: MountingOptions>) => { const { global: { provide: { [uploadToken as unknown as string]: provideObj } = {}, ...restGlobal } = {}, ...rest } = - options as MountingOptions + options as MountingOptions - return mount(UploadFilesListCpm, { + return mount(UploadFilesCpm, { global: { provide: { [uploadToken as symbol]: { @@ -32,12 +32,12 @@ const uploadListMount = (options?: MountingOptions>) => } describe('Upload list render', () => { - renderWork(UploadFilesListCpm, { + renderWork(UploadFilesCpm, { global: { provide: { [uploadToken as symbol]: { props: {}, files: { value: [] }, setSelectorVisible: () => {} } } }, }) test('type work', async () => { - const wrapper = uploadListMount({ + const wrapper = uploadFilesMount({ global: { provide: { [uploadToken as symbol]: { @@ -66,7 +66,7 @@ describe('Upload list render', () => { }) test('icon work', async () => { - const wrapper = uploadListMount({ + const wrapper = uploadFilesMount({ global: { provide: { [uploadToken as symbol]: { @@ -88,7 +88,7 @@ describe('Upload list render', () => { expect(wrapper.find('.ix-icon-delete').exists()).toBeTruthy() expect(wrapper.find('.ix-icon-edit').exists()).toBeTruthy() - const wrapperFileSuccess = uploadListMount({ + const wrapperFileSuccess = uploadFilesMount({ global: { provide: { [uploadToken as symbol]: { @@ -109,7 +109,7 @@ describe('Upload list render', () => { file: 'left', }, }, - } as MountingOptions>) + } as MountingOptions>) await flushPromises() expect(wrapperFileSuccess.find('.ix-icon-download').exists()).toBeTruthy() @@ -127,7 +127,7 @@ describe('Upload list render', () => { }, ] - const wrapper = uploadListMount({ + const wrapper = uploadFilesMount({ global: { provide: { [uploadToken as symbol]: { @@ -141,7 +141,7 @@ describe('Upload list render', () => { }, onDownload, }, - } as MountingOptions>) + } as MountingOptions>) await wrapper.find('.ix-upload-icon-download').trigger('click') @@ -158,7 +158,7 @@ describe('Upload list render', () => { }, ] - const wrapper = uploadListMount({ + const wrapper = uploadFilesMount({ global: { provide: { [uploadToken as symbol]: { @@ -172,7 +172,7 @@ describe('Upload list render', () => { }, onPreview, }, - } as MountingOptions>) + } as MountingOptions>) await wrapper.find('.ix-upload-name').trigger('click') @@ -195,7 +195,7 @@ describe('Upload list render', () => { }, ] - const wrapper = uploadListMount({ + const wrapper = uploadFilesMount({ global: { provide: { [uploadToken as symbol]: { @@ -210,7 +210,7 @@ describe('Upload list render', () => { }, onRetry, }, - } as MountingOptions>) + } as MountingOptions>) await wrapper.find('.ix-upload-icon-retry').trigger('click') expect(upload).toBeCalled() @@ -230,7 +230,7 @@ describe('Upload list render', () => { }, ] - const wrapper = uploadListMount({ + const wrapper = uploadFilesMount({ global: { provide: { [uploadToken as symbol]: { @@ -243,7 +243,7 @@ describe('Upload list render', () => { props: { onRemove, }, - } as MountingOptions>) + } as MountingOptions>) await wrapper.find('.ix-upload-icon-remove').trigger('click') expect(onRemove).toBeCalledWith(expect.objectContaining(defaultFiles[0])) diff --git a/packages/components/upload/demo/Action.vue b/packages/components/upload/demo/Action.vue index ec3a57e5c..c807130ce 100644 --- a/packages/components/upload/demo/Action.vue +++ b/packages/components/upload/demo/Action.vue @@ -2,7 +2,7 @@ Upload diff --git a/packages/components/upload/demo/Basic.vue b/packages/components/upload/demo/Basic.vue index 40f9171d4..0965091f5 100644 --- a/packages/components/upload/demo/Basic.vue +++ b/packages/components/upload/demo/Basic.vue @@ -2,7 +2,7 @@ Upload diff --git a/packages/components/upload/demo/ButtonDisplay.vue b/packages/components/upload/demo/ButtonDisplay.vue index d7e8ad57d..240ee6e9f 100644 --- a/packages/components/upload/demo/ButtonDisplay.vue +++ b/packages/components/upload/demo/ButtonDisplay.vue @@ -2,7 +2,7 @@ Click here diff --git a/packages/components/upload/demo/Check.vue b/packages/components/upload/demo/Check.vue index 018e61e9e..b098dc991 100644 --- a/packages/components/upload/demo/Check.vue +++ b/packages/components/upload/demo/Check.vue @@ -8,7 +8,7 @@ > Upload diff --git a/packages/components/upload/demo/CustomRequest.vue b/packages/components/upload/demo/CustomRequest.vue index c558f4e4b..9a3b0a391 100644 --- a/packages/components/upload/demo/CustomRequest.vue +++ b/packages/components/upload/demo/CustomRequest.vue @@ -7,7 +7,7 @@ > Custom upload diff --git a/packages/components/upload/demo/Dragable.vue b/packages/components/upload/demo/Dragable.vue index 51415300b..8ca95c7d5 100644 --- a/packages/components/upload/demo/Dragable.vue +++ b/packages/components/upload/demo/Dragable.vue @@ -5,7 +5,7 @@

Drag and drop files or click to select files to upload.

diff --git a/packages/components/upload/demo/FilesList.vue b/packages/components/upload/demo/FilesList.vue index 7c9795968..f09113946 100644 --- a/packages/components/upload/demo/FilesList.vue +++ b/packages/components/upload/demo/FilesList.vue @@ -2,7 +2,7 @@ Upload diff --git a/packages/components/upload/demo/Hooks.vue b/packages/components/upload/demo/Hooks.vue index c5130a134..00e1c8751 100644 --- a/packages/components/upload/demo/Hooks.vue +++ b/packages/components/upload/demo/Hooks.vue @@ -10,7 +10,7 @@ > Hook diff --git a/packages/components/upload/demo/Icon.md b/packages/components/upload/demo/Icon.md index 0fdb3486d..2b486743b 100644 --- a/packages/components/upload/demo/Icon.md +++ b/packages/components/upload/demo/Icon.md @@ -7,8 +7,8 @@ order: 10 ## zh -`IxUploadList`使用`icon`配置对应的图标，支持 `string` 和 `VNode` +`IxUploadFiles`使用`icon`配置对应的图标，支持 `string` 和 `VNode` ## en -`IxUploadList` uses `icon` to configure the corresponding icon, and supports `string` and `VNode` +`IxUploadFiles` uses `icon` to configure the corresponding icon, and supports `string` and `VNode` diff --git a/packages/components/upload/demo/Icon.vue b/packages/components/upload/demo/Icon.vue index 163a409d2..dc10e0815 100644 --- a/packages/components/upload/demo/Icon.vue +++ b/packages/components/upload/demo/Icon.vue @@ -2,7 +2,7 @@ Upload diff --git a/packages/components/upload/demo/ListDisplay.vue b/packages/components/upload/demo/ListDisplay.vue index a6767c6bf..0507e3ad9 100644 --- a/packages/components/upload/demo/ListDisplay.vue +++ b/packages/components/upload/demo/ListDisplay.vue @@ -4,7 +4,7 @@ Upload diff --git a/packages/components/upload/demo/Manual.vue b/packages/components/upload/demo/Manual.vue index 9502ab54c..6e4482138 100644 --- a/packages/components/upload/demo/Manual.vue +++ b/packages/components/upload/demo/Manual.vue @@ -6,7 +6,7 @@ > Manual upload diff --git a/packages/components/upload/demo/MaxCount.vue b/packages/components/upload/demo/MaxCount.vue index a3e5880a4..81c9cdef5 100644 --- a/packages/components/upload/demo/MaxCount.vue +++ b/packages/components/upload/demo/MaxCount.vue @@ -7,7 +7,7 @@ > Upload diff --git a/packages/components/upload/demo/Operation.vue b/packages/components/upload/demo/Operation.vue index 95d43d5bb..733a352b1 100644 --- a/packages/components/upload/demo/Operation.vue +++ b/packages/components/upload/demo/Operation.vue @@ -2,7 +2,7 @@ Upload diff --git a/packages/components/upload/docs/Index.zh.md b/packages/components/upload/docs/Index.zh.md index f8d7a0222..1bd9172e8 100644 --- a/packages/components/upload/docs/Index.zh.md +++ b/packages/components/upload/docs/Index.zh.md @@ -31,9 +31,9 @@ order: 0 | `requestData` | 上传附加的参数 | `Record \| ((file: UploadFile) => Record \| Promise>)` | - | - | - | | `requestHeaders` | 设置上传请求的请求头 | `UploadRequestHeader` | - | - | - | | `requestMethod` | 上传请求的http method | `UploadRequestMethod` | `post` | ✅ | - | -| `onSelect` | 选中文件时钩子 | `(file: File[]) => boolean \| File[] \| Promise` | `() => true` | - | - | +| `onSelect` | 选中文件时钩子 | `(file: File[]) => boolean \| File[] \| Promise` | - | - | - | | `onFileStatusChange` | 上传文件改变时的状态 | `(file: UploadFile) => void` | - | - | - | -| `onBeforeUpload` | 文件上传前的钩子，根据返回结果是否上传
返回`false`阻止上传
返回`Promise`对象`reject`时停止上传
返回`Promise`对象`resolve`时开始上传 | `(file: UploadFile) => boolean \| UploadFile \| Promise` | `() => true` | - | - | +| `onBeforeUpload` | 文件上传前的钩子，根据返回结果是否上传
返回`false`阻止上传
返回`Promise`对象`reject`时停止上传
返回`Promise`对象`resolve`时开始上传 | `(file: UploadFile) => boolean \| UploadFile \| Promise` | - | - | - | | `onRequestChange` | 请求状态改变的钩子 | `(option: UploadRequestChangeOption) => void` | - | - | - | ### IxUploadFiles diff --git a/packages/components/upload/index.ts b/packages/components/upload/index.ts index 108abef34..8aa9deef5 100644 --- a/packages/components/upload/index.ts +++ b/packages/components/upload/index.ts @@ -5,18 +5,18 @@ * found in the LICENSE file at https://github.com/IDuxFE/idux/blob/main/LICENSE */ -import type { UploadComponent, UploadListComponent } from './src/types' +import type { UploadComponent, UploadFilesComponent } from './src/types' -import UploadList from './src/List' +import UploadFiles from './src/List' import Upload from './src/Upload' const IxUpload = Upload as unknown as UploadComponent -const IxUploadList = UploadList as unknown as UploadListComponent +const IxUploadFiles = UploadFiles as unknown as UploadFilesComponent -export { IxUpload, IxUploadList } +export { IxUpload, IxUploadFiles } export type { - UploadListType, + UploadFilesType, UploadRequestMethod, UploadRequestStatus, UploadFileStatus, @@ -28,7 +28,7 @@ export type { UploadInstance, UploadComponent, UploadPublicProps as UploadProps, - UploadListInstance, - UploadListComponent, - UploadListPublicProps as UploadListProps, + UploadFilesInstance, + UploadFilesComponent, + UploadFilesPublicProps as UploadFilesProps, } from './src/types' diff --git a/packages/components/upload/src/List.tsx b/packages/components/upload/src/List.tsx index b45500fa1..9c8c2c8a8 100644 --- a/packages/components/upload/src/List.tsx +++ b/packages/components/upload/src/List.tsx @@ -5,8 +5,8 @@ * found in the LICENSE file at https://github.com/IDuxFE/idux/blob/main/LICENSE */ -import type { UploadListProps } from './types' -import type { UploadListConfig } from '@idux/components/config' +import type { UploadFilesProps } from './types' +import type { UploadFilesConfig } from '@idux/components/config' import { computed, defineComponent, h, inject, watchEffect } from 'vue' @@ -17,7 +17,7 @@ import IxUploadImageList from './component/ImageList' import IxUploadTextList from './component/TextList' import { useSelectorVisible } from './composables/useDisplay' import { uploadToken } from './token' -import { uploadListProps } from './types' +import { uploadFilesProps } from './types' const cpmMap = { text: IxUploadTextList, @@ -26,10 +26,10 @@ const cpmMap = { } as const export default defineComponent({ - name: 'IxUploadList', - props: uploadListProps, + name: 'IxUploadFiles', + props: uploadFilesProps, setup(props) { - const config = useGlobalConfig('uploadList') + const config = useGlobalConfig('uploadFiles') const listType = useListType(props, config) const { props: uploadProps, setSelectorVisible } = inject(uploadToken)! const [outerSelector] = useSelectorVisible(uploadProps, listType) @@ -40,6 +40,6 @@ export default defineComponent({ }, }) -function useListType(props: UploadListProps, config: UploadListConfig) { +function useListType(props: UploadFilesProps, config: UploadFilesConfig) { return computed(() => props.type ?? config.type) } diff --git a/packages/components/upload/src/component/ImageCardList.tsx b/packages/components/upload/src/component/ImageCardList.tsx index 879e947fc..a0c01136a 100644 --- a/packages/components/upload/src/component/ImageCardList.tsx +++ b/packages/components/upload/src/component/ImageCardList.tsx @@ -28,14 +28,14 @@ import { } from '../composables/useDisplay' import { useOperation } from '../composables/useOperation' import { uploadToken } from '../token' -import { uploadListProps } from '../types' +import { uploadFilesProps } from '../types' import { renderOprIcon } from '../util/icon' import { showDownload, showErrorTip, showPreview, showProgress, showRetry } from '../util/visible' import FileSelector from './Selector' export default defineComponent({ name: 'IxUploadImageCardList', - props: uploadListProps, + props: uploadFilesProps, setup(listProps) { const { props: uploadProps, files, upload, abort, onUpdateFiles, setViewerVisible } = inject(uploadToken)! const icons = useIcon(listProps) diff --git a/packages/components/upload/src/component/ImageList.tsx b/packages/components/upload/src/component/ImageList.tsx index 5c7d27790..26c93915d 100644 --- a/packages/components/upload/src/component/ImageList.tsx +++ b/packages/components/upload/src/component/ImageList.tsx @@ -21,13 +21,13 @@ import { IxTooltip } from '@idux/components/tooltip' import { useCmpClasses, useIcon, useListClasses, useThumb } from '../composables/useDisplay' import { useOperation } from '../composables/useOperation' import { uploadToken } from '../token' -import { uploadListProps } from '../types' +import { uploadFilesProps } from '../types' import { renderIcon, renderOprIcon } from '../util/icon' import { showDownload, showErrorTip, showPreview, showProgress, showRetry } from '../util/visible' export default defineComponent({ name: 'IxUploadImageList', - props: uploadListProps, + props: uploadFilesProps, setup(listProps) { const { props: uploadProps, files, upload, abort, onUpdateFiles, setViewerVisible } = inject(uploadToken)! const icons = useIcon(listProps) diff --git a/packages/components/upload/src/component/TextList.tsx b/packages/components/upload/src/component/TextList.tsx index 9ffcff50d..61306e9a9 100644 --- a/packages/components/upload/src/component/TextList.tsx +++ b/packages/components/upload/src/component/TextList.tsx @@ -20,13 +20,13 @@ import { IxTooltip } from '@idux/components/tooltip' import { useCmpClasses, useIcon, useListClasses } from '../composables/useDisplay' import { useOperation } from '../composables/useOperation' import { uploadToken } from '../token' -import { uploadListProps } from '../types' +import { uploadFilesProps } from '../types' import { renderIcon, renderOprIcon } from '../util/icon' import { showDownload, showErrorTip, showPreview, showProgress, showRetry } from '../util/visible' export default defineComponent({ name: 'IxUploadTextList', - props: uploadListProps, + props: uploadFilesProps, setup(listProps) { const { props: uploadProps, files, upload, abort, onUpdateFiles, setViewerVisible } = inject(uploadToken)! const icons = useIcon(listProps) diff --git a/packages/components/upload/src/composables/useDisplay.ts b/packages/components/upload/src/composables/useDisplay.ts index 80d58eb54..1649c2a47 100644 --- a/packages/components/upload/src/composables/useDisplay.ts +++ b/packages/components/upload/src/composables/useDisplay.ts @@ -5,7 +5,7 @@ * found in the LICENSE file at https://github.com/IDuxFE/idux/blob/main/LICENSE */ -import type { UploadFile, UploadListProps, UploadListType, UploadProps } from '../types' +import type { UploadFile, UploadFilesProps, UploadFilesType, UploadProps } from '../types' import type { IconsMap } from '../util/icon' import type { ComputedRef, ShallowRef, VNode } from 'vue' @@ -20,7 +20,7 @@ export function useCmpClasses(): ComputedRef { return computed(() => `${commonPrefix.prefixCls}-upload`) } -export function useListClasses(props: UploadProps, type: UploadListType): ComputedRef { +export function useListClasses(props: UploadProps, type: UploadFilesType): ComputedRef { const cpmClasses = useCmpClasses() return computed(() => normalizeClass([ @@ -31,20 +31,20 @@ export function useListClasses(props: UploadProps, type: UploadListType): Comput ) } -export function useIcon(props: UploadListProps): ComputedRef { - const uploadListConfig = useGlobalConfig('uploadList') - return computed(() => props.icon ?? uploadListConfig.icon) +export function useIcon(props: UploadFilesProps): ComputedRef { + const uploadFilesConfig = useGlobalConfig('uploadFiles') + return computed(() => props.icon ?? uploadFilesConfig.icon) } export function useSelectorVisible( props: UploadProps, - listType: ComputedRef | UploadListType, + listType: ComputedRef | UploadFilesType, ): ComputedRef[] { // imageCard自带selector，drag统一用外部 const outerSelector = computed( () => props.dragable || - (isProxy(listType) ? (listType as ComputedRef).value !== 'imageCard' : listType !== 'imageCard'), + (isProxy(listType) ? (listType as ComputedRef).value !== 'imageCard' : listType !== 'imageCard'), ) const imageCardSelector = computed(() => !outerSelector.value) return [outerSelector, imageCardSelector] diff --git a/packages/components/upload/src/composables/useOperation.ts b/packages/components/upload/src/composables/useOperation.ts index 32bec1f05..37eeaa9f6 100644 --- a/packages/components/upload/src/composables/useOperation.ts +++ b/packages/components/upload/src/composables/useOperation.ts @@ -6,7 +6,7 @@ */ import type { UploadToken } from '../token' -import type { UploadFile, UploadListProps, UploadProps } from '../types' +import type { UploadFile, UploadFilesProps, UploadProps } from '../types' import type { ComputedRef } from 'vue' import { callEmit } from '@idux/cdk/utils' @@ -23,7 +23,7 @@ export interface FileOperation { export function useOperation( files: ComputedRef, - listProps: UploadListProps, + listProps: UploadFilesProps, uploadProps: UploadProps, opr: Pick, ): FileOperation { diff --git a/packages/components/upload/src/types.ts b/packages/components/upload/src/types.ts index 95c47459a..1cf37ce50 100644 --- a/packages/components/upload/src/types.ts +++ b/packages/components/upload/src/types.ts @@ -16,7 +16,7 @@ export type UploadRequestHeader = Record export type UploadRequestMethod = 'POST' | 'PUT' | 'PATCH' | 'post' | 'put' | 'patch' export type UploadRequestStatus = 'loadstart' | 'progress' | 'abort' | 'error' | 'loadend' export type UploadFileStatus = 'selected' | 'uploading' | 'error' | 'success' | 'abort' -export type UploadListType = 'text' | 'image' | 'imageCard' +export type UploadFilesType = 'text' | 'image' | 'imageCard' export type UploadIconType = 'file' | 'preview' | 'download' | 'remove' | 'retry' export interface UploadProgressEvent extends ProgressEvent { percent?: number @@ -89,17 +89,17 @@ export type UploadPublicProps = IxPublicPropTypes export type UploadComponent = DefineComponent & UploadPublicProps> export type UploadInstance = InstanceType> -export const uploadListProps = { - type: IxPropTypes.oneOf(['text', 'image', 'imageCard']), +export const uploadFilesProps = { + type: IxPropTypes.oneOf(['text', 'image', 'imageCard']), icon: IxPropTypes.object>>(), onDownload: IxPropTypes.emit<(file: UploadFile) => void>(), onPreview: IxPropTypes.emit<(file: UploadFile) => void>(), onRemove: IxPropTypes.emit<(file: UploadFile) => boolean | Promise>(), onRetry: IxPropTypes.emit<(file: UploadFile) => void>(), } -export type UploadListProps = IxInnerPropTypes -export type UploadListPublicProps = IxPublicPropTypes -export type UploadListComponent = DefineComponent< - Omit & UploadListPublicProps +export type UploadFilesProps = IxInnerPropTypes +export type UploadFilesPublicProps = IxPublicPropTypes +export type UploadFilesComponent = DefineComponent< + Omit & UploadFilesPublicProps > -export type UploadListInstance = InstanceType> +export type UploadFilesInstance = InstanceType>