npm - @fairys/taro-tools-react - Versions diffs - 1.0.12 → 1.0.13 - Mend

@fairys/taro-tools-react 1.0.12 → 1.0.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/esm/utils/request.d.ts CHANGED Viewed

@@ -16,6 +16,8 @@ export interface DownloadFileOptions extends Taro.downloadFile.Option, TaroReque
 export interface UploadFileOptions extends Taro.uploadFile.Option, TaroRequestOption {
     /**上传进度回调*/
     onProgress?: Taro.UploadTask.OnProgressUpdateCallback;
+    /**数据类型*/
+    dataType?: 'json' | 'text';
 }
 export interface RequestInstanceCreateOptions {
     /**
@@ -124,6 +126,8 @@ export declare class RequestInstance {
         url: string;
         /**上传进度回调*/
         onProgress?: Taro.UploadTask.OnProgressUpdateCallback;
+        /**数据类型*/
+        dataType?: "json" | "text";
         filePath: string;
         name: string;
         formData?: TaroGeneral.IAnyObject;
@@ -174,9 +178,9 @@ export declare class RequestInstance {
     /**下载文件*/
     downloadFile: (options: DownloadFileOptions) => Promise<Taro.downloadFile.FileSuccessCallbackResult>;
     /**上传文件(返回 Taro.UploadTask.UploadTaskPromise ，可显示上传进度)*/
-    uploadFileTask: (options: UploadFileOptions) => Taro.UploadTask.UploadTaskPromise;
+    uploadFileTask: (options: Omit<UploadFileOptions, "dataType">) => Taro.UploadTask.UploadTaskPromise;
     /**上传文件*/
-    uploadFile: (options: UploadFileOptions) => Promise<Taro.uploadFile.SuccessCallbackResult>;
+    uploadFile: (options: UploadFileOptions) => Promise<string | Record<string, any> | Taro.uploadFile.SuccessCallbackResult>;
 }
 /** 请求*/
 export declare const request: RequestInstance;

package/esm/utils/request.js CHANGED Viewed

@@ -316,12 +316,22 @@ class RequestInstance {
         if ('function' == typeof onProgress && uploadTask) uploadTask.onProgressUpdate(onProgress);
         return uploadTask;
     };
-    uploadFile = (options)=>new Promise((resolve, reject)=>{
+    uploadFile = (options)=>{
+        const { dataType = 'json', ...rest } = options;
+        return new Promise((resolve, reject)=>{
             this.uploadFileTask({
-                ...options,
+                ...rest,
                 success: (result)=>{
                     options?.success?.(result);
-                    resolve(result);
+                    if ('json' === dataType) {
+                        let resultData = result.data;
+                        try {
+                            resultData = JSON.parse(result.data);
+                        } catch (error) {
+                            console.log("\u4E0A\u4F20\u6587\u4EF6\u89E3\u6790\u6570\u636E\u5931\u8D25", error);
+                        }
+                        resolve(resultData);
+                    } else resolve(result);
                 },
                 fail: (result)=>{
                     options?.fail?.(result);
@@ -329,6 +339,7 @@ class RequestInstance {
                 }
             });
         });
+    };
 }
 const request_request = new RequestInstance();
 const utils_request = request_request;

package/lib/utils/request.d.ts CHANGED Viewed

@@ -16,6 +16,8 @@ export interface DownloadFileOptions extends Taro.downloadFile.Option, TaroReque
 export interface UploadFileOptions extends Taro.uploadFile.Option, TaroRequestOption {
     /**上传进度回调*/
     onProgress?: Taro.UploadTask.OnProgressUpdateCallback;
+    /**数据类型*/
+    dataType?: 'json' | 'text';
 }
 export interface RequestInstanceCreateOptions {
     /**
@@ -124,6 +126,8 @@ export declare class RequestInstance {
         url: string;
         /**上传进度回调*/
         onProgress?: Taro.UploadTask.OnProgressUpdateCallback;
+        /**数据类型*/
+        dataType?: "json" | "text";
         filePath: string;
         name: string;
         formData?: TaroGeneral.IAnyObject;
@@ -174,9 +178,9 @@ export declare class RequestInstance {
     /**下载文件*/
     downloadFile: (options: DownloadFileOptions) => Promise<Taro.downloadFile.FileSuccessCallbackResult>;
     /**上传文件(返回 Taro.UploadTask.UploadTaskPromise ，可显示上传进度)*/
-    uploadFileTask: (options: UploadFileOptions) => Taro.UploadTask.UploadTaskPromise;
+    uploadFileTask: (options: Omit<UploadFileOptions, "dataType">) => Taro.UploadTask.UploadTaskPromise;
     /**上传文件*/
-    uploadFile: (options: UploadFileOptions) => Promise<Taro.uploadFile.SuccessCallbackResult>;
+    uploadFile: (options: UploadFileOptions) => Promise<string | Record<string, any> | Taro.uploadFile.SuccessCallbackResult>;
 }
 /** 请求*/
 export declare const request: RequestInstance;

package/lib/utils/request.js CHANGED Viewed

@@ -356,12 +356,22 @@ class RequestInstance {
         if ('function' == typeof onProgress && uploadTask) uploadTask.onProgressUpdate(onProgress);
         return uploadTask;
     };
-    uploadFile = (options)=>new Promise((resolve, reject)=>{
+    uploadFile = (options)=>{
+        const { dataType = 'json', ...rest } = options;
+        return new Promise((resolve, reject)=>{
             this.uploadFileTask({
-                ...options,
+                ...rest,
                 success: (result)=>{
                     options?.success?.(result);
-                    resolve(result);
+                    if ('json' === dataType) {
+                        let resultData = result.data;
+                        try {
+                            resultData = JSON.parse(result.data);
+                        } catch (error) {
+                            console.log("\u4E0A\u4F20\u6587\u4EF6\u89E3\u6790\u6570\u636E\u5931\u8D25", error);
+                        }
+                        resolve(resultData);
+                    } else resolve(result);
                 },
                 fail: (result)=>{
                     options?.fail?.(result);
@@ -369,6 +379,7 @@ class RequestInstance {
                 }
             });
         });
+    };
 }
 const request_request = new RequestInstance();
 const utils_request = request_request;

package/package.json CHANGED Viewed

@@ -3,7 +3,7 @@
   "author": "SunLxy <1011771396@qq.com>",
   "description": "框架组件库",
   "homepage": "https://github.com/autumn-fairy-tales/fairys-taro-react",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "main": "esm/index.js",
   "types": "esm/index.d.ts",
   "module": "esm/index.js",

package/src/utils/request.ts CHANGED Viewed

@@ -33,6 +33,8 @@ export interface DownloadFileOptions extends Taro.downloadFile.Option, TaroReque
 export interface UploadFileOptions extends Taro.uploadFile.Option, TaroRequestOption {
   /**上传进度回调*/
   onProgress?: Taro.UploadTask.OnProgressUpdateCallback;
+  /**数据类型*/
+  dataType?: 'json' | 'text';
 }
 /**处理提示信息*/
 const requestResponseHandle = (
@@ -433,7 +435,7 @@ export class RequestInstance {
   };
   /**上传文件(返回 Taro.UploadTask.UploadTaskPromise ，可显示上传进度)*/
-  uploadFileTask = (options: UploadFileOptions) => {
+  uploadFileTask = (options: Omit<UploadFileOptions, 'dataType'>) => {
     const { isShowErrorMessage } = options;
     const formattedOptions = this.formatRequestOptions(options);
     if (!formattedOptions) {
@@ -476,13 +478,27 @@ export class RequestInstance {
     return uploadTask;
   };
   /**上传文件*/
-  uploadFile = (options: UploadFileOptions): Promise<Taro.uploadFile.SuccessCallbackResult> => {
+  uploadFile = (
+    options: UploadFileOptions,
+  ): Promise<string | Record<string, any> | Taro.uploadFile.SuccessCallbackResult> => {
+    const { dataType = 'json', ...rest } = options;
     return new Promise((resolve, reject) => {
       this.uploadFileTask({
-        ...options,
+        ...rest,
         success: (result) => {
           options?.success?.(result);
-          resolve(result);
+          if (dataType === 'json') {
+            let resultData = result.data;
+            try {
+              resultData = JSON.parse(result.data);
+            } catch (error) {
+              // 解析失败，保持原始数据
+              console.log('上传文件解析数据失败', error);
+            }
+            resolve(resultData);
+          } else {
+            resolve(result);
+          }
         },
         fail: (result) => {
           options?.fail?.(result);