yudao
/
admin-vben
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vben.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

perf: the request client upload function supports more parameters (#4439)

pull/48/MERGE
Vben 2024-09-19 22:13:43 +08:00 committed by GitHub
parent 161820dbc1
commit 4765158510
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/effects/request/src/request-client/modules/uploader.test.ts
View File

@ -34,7 +34,7 @@ describe('fileUploader', () => {
mockAxiosInstance.post as unknown as ReturnType<typeof vi.fn> mockAxiosInstance.post as unknown as ReturnType<typeof vi.fn>
).mockResolvedValueOnce(mockResponse); ).mockResolvedValueOnce(mockResponse);
const result = await fileUploader.upload(url, file); const result = await fileUploader.upload(url, { file });
expect(result).toEqual(mockResponse); expect(result).toEqual(mockResponse);
expect(mockAxiosInstance.post).toHaveBeenCalledWith( expect(mockAxiosInstance.post).toHaveBeenCalledWith(
url, url,
@ -66,7 +66,7 @@ describe('fileUploader', () => {
headers: { 'Custom-Header': 'value' }, headers: { 'Custom-Header': 'value' },
}; };
const result = await fileUploader.upload(url, file, customConfig); const result = await fileUploader.upload(url, { file }, customConfig);
expect(result).toEqual(mockResponse); expect(result).toEqual(mockResponse);
expect(mockAxiosInstance.post).toHaveBeenCalledWith( expect(mockAxiosInstance.post).toHaveBeenCalledWith(
url, url,
@ -87,7 +87,7 @@ describe('fileUploader', () => {
mockAxiosInstance.post as unknown as ReturnType<typeof vi.fn> mockAxiosInstance.post as unknown as ReturnType<typeof vi.fn>
).mockRejectedValueOnce(new Error('Network Error')); ).mockRejectedValueOnce(new Error('Network Error'));
await expect(fileUploader.upload(url, file)).rejects.toThrow( await expect(fileUploader.upload(url, { file })).rejects.toThrow(
'Network Error', 'Network Error',
); );
}); });
@ -99,7 +99,7 @@ describe('fileUploader', () => {
mockAxiosInstance.post as unknown as ReturnType<typeof vi.fn> mockAxiosInstance.post as unknown as ReturnType<typeof vi.fn>
).mockRejectedValueOnce(new Error('Request failed with status code 404')); ).mockRejectedValueOnce(new Error('Request failed with status code 404'));
await expect(fileUploader.upload(url, file)).rejects.toThrow( await expect(fileUploader.upload(url, { file })).rejects.toThrow(
'Request failed with status code 404', 'Request failed with status code 404',
); );
}); });
@ -111,7 +111,7 @@ describe('fileUploader', () => {
mockAxiosInstance.post as unknown as ReturnType<typeof vi.fn> mockAxiosInstance.post as unknown as ReturnType<typeof vi.fn>
).mockRejectedValueOnce(new Error('Request failed with status code 404')); ).mockRejectedValueOnce(new Error('Request failed with status code 404'));
await expect(fileUploader.upload(url, file)).rejects.toThrow( await expect(fileUploader.upload(url, { file })).rejects.toThrow(
'Request failed with status code 404', 'Request failed with status code 404',
); );
}); });

7
packages/effects/request/src/request-client/modules/uploader.ts
View File

@ -11,11 +11,14 @@ class FileUploader {
public async upload( public async upload(
url: string, url: string,
file: Blob | File, data: { file: Blob | File } & Record<string, any>,
config?: AxiosRequestConfig, config?: AxiosRequestConfig,
): Promise<AxiosResponse> { ): Promise<AxiosResponse> {
const formData = new FormData(); const formData = new FormData();
formData.append('file', file);
Object.entries(data).forEach(([key, value]) => {
formData.append(key, value);
});
const finalConfig: AxiosRequestConfig = { const finalConfig: AxiosRequestConfig = {
...config, ...config,

4
packages/effects/request/src/request-client/request-client.test.ts
View File

@ -79,7 +79,9 @@ describe('requestClient', () => {
: [400, { error: 'Bad Request' }]; : [400, { error: 'Bad Request' }];
}); });
const response = await requestClient.upload('/test/upload', fileData); const response = await requestClient.upload('/test/upload', {
file: fileData,
});
expect(response.data).toEqual({ data: 'file uploaded' }); expect(response.data).toEqual({ data: 'file uploaded' });
}); });