Merge branch 'dev' of gitea.51mars.com:Oak-Team/oak-frontend-base into dev

es/utils/upload.d.ts

@@ -1,5 +1,6 @@
 export declare class Upload {
-    uploadFile(file: string | File, name: string, uploadUrl: string, formData: Record<string, any>, autoInform?: boolean): Promise<any>;
+    uploadFile(file: File | string, name: string, uploadUrl: string, formData: Record<string, any>, autoInform?: boolean, getPercent?: Function, uploadId?: string, // 新增：上传任务ID，用于中断特定上传
+    method?: "POST" | "PUT" | "PATCH"): Promise<any>;
     private controllers;
     constructor();
     abortUpload(uploadId: string): boolean;

es/utils/upload.js

@@ -1,5 +1,6 @@
 export class Upload {
-    async uploadFile(file, name, uploadUrl, formData, autoInform) {
+    async uploadFile(file, name, uploadUrl, formData, autoInform, getPercent, uploadId, // 新增：上传任务ID，用于中断特定上传
+    method = "POST") {
         console.warn('server不会调用此函数');
     }
     controllers = new Map();

es/utils/upload.mp.d.ts

@@ -1,3 +1,4 @@
 export declare class Upload {
-    uploadFile(file: string | File, name: string, uploadUrl: string, formData: Record<string, any>, autoInform?: boolean, getPercent?: Function, method?: "POST" | "PUT" | "PATCH"): Promise<any>;
+    uploadFile(file: File | string, name: string, uploadUrl: string, formData: Record<string, any>, autoInform?: boolean, getPercent?: Function, uploadId?: string, // 新增：上传任务ID，用于中断特定上传
+    method?: "POST" | "PUT" | "PATCH"): Promise<any>;
 }

es/utils/upload.mp.js

@@ -1,6 +1,7 @@
 import { promisify } from './promisify';
 export class Upload {
-    async uploadFile(file, name, uploadUrl, formData, autoInform, getPercent, method = "POST") {
+    async uploadFile(file, name, uploadUrl, formData, autoInform, getPercent, uploadId, // 新增：上传任务ID，用于中断特定上传
+    method = "POST") {
         const isPut = method === "PUT";
         if (isPut) {
             return new Promise((resolve, reject) => {

es/utils/upload.native.d.ts

@@ -1,3 +1,4 @@
 export declare class Upload {
-    uploadFile(file: File | string, name: string, uploadUrl: string, formData: Record<string, any>, autoInform?: boolean, getPercent?: Function, method?: "POST" | "PUT" | "PATCH"): Promise<any>;
+    uploadFile(file: File | string, name: string, uploadUrl: string, formData: Record<string, any>, autoInform?: boolean, getPercent?: Function, uploadId?: string, // 新增：上传任务ID，用于中断特定上传
+    method?: "POST" | "PUT" | "PATCH"): Promise<any>;
 }

es/utils/upload.native.js

@@ -1,5 +1,6 @@
 export class Upload {
-    async uploadFile(file, name, uploadUrl, formData, autoInform, getPercent, method = "POST") {
+    async uploadFile(file, name, uploadUrl, formData, autoInform, getPercent, uploadId, // 新增：上传任务ID，用于中断特定上传
+    method = "POST") {
         const isPut = method === "PUT";
         if (isPut) {
             // S3 预签名上传

lib/utils/upload.d.ts

@@ -1,5 +1,6 @@
 export declare class Upload {
-    uploadFile(file: string | File, name: string, uploadUrl: string, formData: Record<string, any>, autoInform?: boolean): Promise<any>;
+    uploadFile(file: File | string, name: string, uploadUrl: string, formData: Record<string, any>, autoInform?: boolean, getPercent?: Function, uploadId?: string, // 新增：上传任务ID，用于中断特定上传
+    method?: "POST" | "PUT" | "PATCH"): Promise<any>;
     private controllers;
     constructor();
     abortUpload(uploadId: string): boolean;

lib/utils/upload.js

@@ -2,7 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Upload = void 0;
 class Upload {
-    async uploadFile(file, name, uploadUrl, formData, autoInform) {
+    async uploadFile(file, name, uploadUrl, formData, autoInform, getPercent, uploadId, // 新增：上传任务ID，用于中断特定上传
+    method = "POST") {
         console.warn('server不会调用此函数');
     }
     controllers = new Map();

lib/utils/upload.mp.d.ts

@@ -1,3 +1,4 @@
 export declare class Upload {
-    uploadFile(file: string | File, name: string, uploadUrl: string, formData: Record<string, any>, autoInform?: boolean, getPercent?: Function, method?: "POST" | "PUT" | "PATCH"): Promise<any>;
+    uploadFile(file: File | string, name: string, uploadUrl: string, formData: Record<string, any>, autoInform?: boolean, getPercent?: Function, uploadId?: string, // 新增：上传任务ID，用于中断特定上传
+    method?: "POST" | "PUT" | "PATCH"): Promise<any>;
 }

lib/utils/upload.mp.js

@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Upload = void 0;
 const promisify_1 = require("./promisify");
 class Upload {
-    async uploadFile(file, name, uploadUrl, formData, autoInform, getPercent, method = "POST") {
+    async uploadFile(file, name, uploadUrl, formData, autoInform, getPercent, uploadId, // 新增：上传任务ID，用于中断特定上传
+    method = "POST") {
         const isPut = method === "PUT";
         if (isPut) {
             return new Promise((resolve, reject) => {

lib/utils/upload.native.d.ts

@@ -1,3 +1,4 @@
 export declare class Upload {
-    uploadFile(file: File | string, name: string, uploadUrl: string, formData: Record<string, any>, autoInform?: boolean, getPercent?: Function, method?: "POST" | "PUT" | "PATCH"): Promise<any>;
+    uploadFile(file: File | string, name: string, uploadUrl: string, formData: Record<string, any>, autoInform?: boolean, getPercent?: Function, uploadId?: string, // 新增：上传任务ID，用于中断特定上传
+    method?: "POST" | "PUT" | "PATCH"): Promise<any>;
 }

lib/utils/upload.native.js

@@ -2,7 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Upload = void 0;
 class Upload {
-    async uploadFile(file, name, uploadUrl, formData, autoInform, getPercent, method = "POST") {
+    async uploadFile(file, name, uploadUrl, formData, autoInform, getPercent, uploadId, // 新增：上传任务ID，用于中断特定上传
+    method = "POST") {
         const isPut = method === "PUT";
         if (isPut) {
             // S3 预签名上传

src/utils/upload.mp.ts

@@ -2,13 +2,14 @@ import { promisify } from './promisify';
 
 export class Upload {
     async uploadFile(
-        file: string | File,
+        file: File | string,
         name: string,
         uploadUrl: string,
         formData: Record<string, any>,
         autoInform?: boolean,
         getPercent?: Function,
-        method: "POST" | "PUT" | "PATCH" = "POST"
+        uploadId?: string, // 新增：上传任务ID，用于中断特定上传
+        method: "POST" | "PUT" | "PATCH" = "POST",
     ): Promise<any> {
         const isPut = method === "PUT";
 

src/utils/upload.native.ts

@@ -8,7 +8,8 @@ export class Upload {
         formData: Record<string, any>,
         autoInform?: boolean,
         getPercent?: Function,
-        method: "POST" | "PUT" | "PATCH" = "POST"
+        uploadId?: string, // 新增：上传任务ID，用于中断特定上传
+        method: "POST" | "PUT" | "PATCH" = "POST",
     ): Promise<any> {
         const isPut = method === "PUT";
 

src/utils/upload.ts

@@ -1,11 +1,14 @@
 
 export class Upload {
     async uploadFile(
-        file: string | File,
+        file: File | string,
         name: string,
         uploadUrl: string,
         formData: Record<string, any>,
-        autoInform?: boolean
+        autoInform?: boolean,
+        getPercent?: Function,
+        uploadId?: string, // 新增：上传任务ID，用于中断特定上传
+        method: "POST" | "PUT" | "PATCH" = "POST",
     ): Promise<any> {
         console.warn('server不会调用此函数')
     }