feat(Upload): 文件列表支持显示上传失败的原因

Tencent · Nov 5, 2023 · 35fc954 · 35fc954
1 parent a93f68d
commit 35fc954
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/js/upload/main.ts b/js/upload/main.ts
@@ -15,6 +15,7 @@ import {
   handleSuccessParams,
   UploadTriggerUploadText,
   ErrorContext,
+  ResponseType,
 } from './types';
 
 export interface BeforeUploadExtra {
@@ -67,13 +68,15 @@ export interface OnErrorParams extends ErrorContext {
 
 export function handleError(options: OnErrorParams) {
   const { event, files, response, XMLHttpRequest, formatResponse } = options;
-  files.forEach((file) => {
-    file.status = 'fail';
-  });
   let res = response;
   if (isFunction(formatResponse)) {
     res = formatResponse(response, { file: files[0], currentFiles: files });
   }
+  files.forEach((file) => {
+    file.status = 'fail';
+    file.response = res;
+  });
+
   return { response: res, event, files, XMLHttpRequest };
 }
 
@@ -146,7 +149,15 @@ export function uploadOneRequest(params: HandleUploadParams): Promise<UploadRequ
           resolve({});
           return;
         }
-        const { response = {} } = res;
+        let response = res.response as ResponseType;
+        if (isFunction(params.formatResponse)) {
+          response = params.formatResponse(response, { file: toUploadFiles[0], currentFiles: toUploadFiles });
+          if (response.status === 'success' && !response.files) {
+            log.error('Upload', 'formatResponse:: upload success `files` are missing');
+          } else if (!response.status) {
+            log.error('Upload', 'formatResponse: return value of `status` is missing');
+          }
+        }
         if (res.status === 'fail') {
           response.error = res.error || response.error;
         }

diff --git a/js/upload/types.ts b/js/upload/types.ts
@@ -182,7 +182,7 @@ export interface OnResponseErrorContext {
   files: UploadFile[];
 }
 
-export type ResponseType = { error?: string; url?: string } & Record<string, any>;
+export type ResponseType = { error?: string; url?: string; status?: 'fail' | 'success'; files?: UploadFile[] } & Record<string, any>
 
 export interface HandleUploadParams {
   /** 已经上传过的文件 */