diff --git a/packages/components/config/src/defaultConfig.ts b/packages/components/config/src/defaultConfig.ts index 53c430def..b9439b499 100644 --- a/packages/components/config/src/defaultConfig.ts +++ b/packages/components/config/src/defaultConfig.ts @@ -212,7 +212,7 @@ const upload: UploadConfig = { } const uploadList: UploadListConfig = { - listType: 'text', + type: 'text', icon: { file: 'paper-clip', remove: 'delete', diff --git a/packages/components/config/src/types.ts b/packages/components/config/src/types.ts index a38e9bf89..0ec936bec 100644 --- a/packages/components/config/src/types.ts +++ b/packages/components/config/src/types.ts @@ -200,7 +200,7 @@ export interface UploadConfig { } export interface UploadListConfig { - listType: UploadListType + type: UploadListType icon: Partial> } diff --git a/packages/components/upload/__tests__/__snapshots__/upload.spec.ts.snap b/packages/components/upload/__tests__/__snapshots__/upload.spec.ts.snap index 81b5e1a46..c16f4e513 100644 --- a/packages/components/upload/__tests__/__snapshots__/upload.spec.ts.snap +++ b/packages/components/upload/__tests__/__snapshots__/upload.spec.ts.snap @@ -1,11 +1,12 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`Upload render render work 1`] = ` -"
+"
+
diff --git a/packages/components/upload/__tests__/list.spec.ts b/packages/components/upload/__tests__/list.spec.ts index a00bc048e..c2371511c 100644 --- a/packages/components/upload/__tests__/list.spec.ts +++ b/packages/components/upload/__tests__/list.spec.ts @@ -43,7 +43,7 @@ describe('Upload list render', () => { [uploadToken as symbol]: { files: ref([ { - uid: 'test1', + key: 'test1', name: 'idux.svg', thumbUrl: '/icons/logo.svg', }, @@ -72,7 +72,7 @@ describe('Upload list render', () => { [uploadToken as symbol]: { files: ref([ { - uid: 'test1', + key: 'test1', name: 'idux.svg', errorTip: 'error', status: 'error', @@ -94,7 +94,7 @@ describe('Upload list render', () => { [uploadToken as symbol]: { files: ref([ { - uid: 'test1', + key: 'test1', name: 'idux.svg', status: 'success', }, @@ -121,7 +121,7 @@ describe('Upload list render', () => { const onDownload = jest.fn() const defaultFiles = [ { - uid: 'test1', + key: 'test1', name: 'idux.svg', status: 'success', }, @@ -152,7 +152,7 @@ describe('Upload list render', () => { const onPreview = jest.fn() const defaultFiles = [ { - uid: 'test1', + key: 'test1', name: 'idux.svg', status: 'success', }, @@ -189,7 +189,7 @@ describe('Upload list render', () => { const upload = jest.fn() const defaultFiles = [ { - uid: 'test1', + key: 'test1', name: 'idux.svg', status: 'error', }, @@ -223,10 +223,10 @@ describe('Upload list render', () => { const abort = jest.fn() const defaultFiles = [ { - uid: 'test1', + key: 'test1', name: 'idux.png', status: 'uploading', - raw: Object.assign(new File(['test1'], 'idux.png', { type: 'image/png' }), { uid: 'test1' }), + raw: new File(['test1'], 'idux.png', { type: 'image/png' }), }, ] diff --git a/packages/components/upload/__tests__/upload.spec.ts b/packages/components/upload/__tests__/upload.spec.ts index eaa47f0ba..6c123cced 100644 --- a/packages/components/upload/__tests__/upload.spec.ts +++ b/packages/components/upload/__tests__/upload.spec.ts @@ -16,12 +16,12 @@ import { UploadProps } from '../src/types' const defaultFiles: UploadFile[] = [ { - uid: 'test1', + key: 'test1', name: 'idux.svg', thumbUrl: '/icons/logo.svg', }, { - uid: 'error', + key: 'error', name: 'error.png', status: 'error', errorTip: 'Upload failed.', @@ -105,7 +105,7 @@ describe('Upload render', () => { expect(wrapper.findAll('.ix-upload-file').length).toBe(2) - await wrapper.setProps({ files: [{ uid: 'files test', name: 'files test' }] }) + await wrapper.setProps({ files: [{ key: 'files test', name: 'files test' }] }) expect(wrapper.findAll('.ix-upload-file').length).toBe(1) @@ -210,7 +210,7 @@ describe('Upload render', () => { props: { files: [ { - uid: 'test2', + key: 'test2', name: 'idux.svg', status: 'uploading', percent: 50, diff --git a/packages/components/upload/demo/Action.vue b/packages/components/upload/demo/Action.vue index b5c1b2b98..ec3a57e5c 100644 --- a/packages/components/upload/demo/Action.vue +++ b/packages/components/upload/demo/Action.vue @@ -15,8 +15,8 @@ import { ref } from 'vue' const files = ref([]) const action = (file: UploadFile) => { if (file.raw?.type === 'image/png') { - return Promise.resolve('/upload/png') + return Promise.resolve('https://run.mocky.io/v3/41a4b385-bf7e-4808-b1e4-d2ef1e0cdc11') } - return '/upload' + return 'https://run.mocky.io/v3/7564bc4f-780e-43f7-bc58-467959ae3354' } diff --git a/packages/components/upload/demo/Basic.vue b/packages/components/upload/demo/Basic.vue index 0617ebf04..40f9171d4 100644 --- a/packages/components/upload/demo/Basic.vue +++ b/packages/components/upload/demo/Basic.vue @@ -1,5 +1,5 @@