@fairys/taro-tools-react 1.0.11 → 1.0.13

package/esm/utils/request.d.ts

@@ -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

@@ -59,7 +59,7 @@ class RequestInstance {
             ...this.commonOptions,
             ...options.commonOptions
         };
-        this.isEnableTokenAuth = options.isEnableTokenAuth || true;
+        this.isEnableTokenAuth = 'boolean' == typeof options.isEnableTokenAuth ? options.isEnableTokenAuth : true;
         return this;
     };
     getHttpPath = (url, module)=>{
@@ -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/esm/utils/valtio/index.d.ts

@@ -7,3 +7,7 @@ export declare const useValtioInstaceState: <T extends object = any, K extends P
 } = {
     new (...args: any[]): K;
 }>(Instance: M) => readonly [import("valtio").Snapshot<T>, K, any];
+/**
+ * 创建valtio proxy 状态管理
+ */
+export declare const useValtioProxyState: <T extends object>(inital?: T) => readonly [import("valtio").Snapshot<T>, T, any];

package/esm/utils/valtio/index.js

@@ -1,5 +1,5 @@
 import { useRef } from "react";
-import { useSnapshot } from "valtio";
+import { proxy, useSnapshot } from "valtio";
 import { ProxyInstanceObjectBase } from "./instance.js";
 export * from "./instance.js";
 const useValtioState = (inital)=>{
@@ -20,4 +20,13 @@ const useValtioInstaceState = (Instance)=>{
         state.__defaultValue
     ];
 };
-export { useValtioInstaceState, useValtioState };
+const useValtioProxyState = (inital)=>{
+    const instance = useRef(proxy(inital || {})).current;
+    const state = useSnapshot(instance);
+    return [
+        state,
+        instance,
+        state.__defaultValue
+    ];
+};
+export { useValtioInstaceState, useValtioProxyState, useValtioState };

package/lib/utils/request.d.ts

@@ -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

@@ -99,7 +99,7 @@ class RequestInstance {
             ...this.commonOptions,
             ...options.commonOptions
         };
-        this.isEnableTokenAuth = options.isEnableTokenAuth || true;
+        this.isEnableTokenAuth = 'boolean' == typeof options.isEnableTokenAuth ? options.isEnableTokenAuth : true;
         return this;
     };
     getHttpPath = (url, module)=>{
@@ -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/lib/utils/valtio/index.d.ts

@@ -7,3 +7,7 @@ export declare const useValtioInstaceState: <T extends object = any, K extends P
 } = {
     new (...args: any[]): K;
 }>(Instance: M) => readonly [import("valtio").Snapshot<T>, K, any];
+/**
+ * 创建valtio proxy 状态管理
+ */
+export declare const useValtioProxyState: <T extends object>(inital?: T) => readonly [import("valtio").Snapshot<T>, T, any];

package/lib/utils/valtio/index.js

@@ -55,6 +55,7 @@ var __webpack_exports__ = {};
     __webpack_require__.r(__webpack_exports__);
     __webpack_require__.d(__webpack_exports__, {
         useValtioInstaceState: ()=>useValtioInstaceState,
+        useValtioProxyState: ()=>useValtioProxyState,
         useValtioState: ()=>useValtioState
     });
     var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("react");
@@ -62,8 +63,9 @@ var __webpack_exports__ = {};
     var _instance__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("./instance");
     var __WEBPACK_REEXPORT_OBJECT__ = {};
     for(var __WEBPACK_IMPORT_KEY__ in _instance__WEBPACK_IMPORTED_MODULE_2__)if ([
-        "useValtioInstaceState",
+        "useValtioProxyState",
         "default",
+        "useValtioInstaceState",
         "useValtioState"
     ].indexOf(__WEBPACK_IMPORT_KEY__) < 0) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = (function(key) {
         return _instance__WEBPACK_IMPORTED_MODULE_2__[key];
@@ -87,11 +89,22 @@ var __webpack_exports__ = {};
             state.__defaultValue
         ];
     };
+    const useValtioProxyState = (inital)=>{
+        const instance = (0, react__WEBPACK_IMPORTED_MODULE_0__.useRef)((0, valtio__WEBPACK_IMPORTED_MODULE_1__.proxy)(inital || {})).current;
+        const state = (0, valtio__WEBPACK_IMPORTED_MODULE_1__.useSnapshot)(instance);
+        return [
+            state,
+            instance,
+            state.__defaultValue
+        ];
+    };
 })();
 exports.useValtioInstaceState = __webpack_exports__.useValtioInstaceState;
+exports.useValtioProxyState = __webpack_exports__.useValtioProxyState;
 exports.useValtioState = __webpack_exports__.useValtioState;
 for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "useValtioInstaceState",
+    "useValtioProxyState",
     "useValtioState"
 ].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
 Object.defineProperty(exports, '__esModule', {

package/package.json

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

package/src/utils/request.ts

@@ -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 = (
@@ -133,7 +135,7 @@ export class RequestInstance {
     this.IP = options.IP || this.IP;
     this.proxy = options.proxy || this.proxy;
     this.commonOptions = { ...this.commonOptions, ...options.commonOptions };
-    this.isEnableTokenAuth = options.isEnableTokenAuth || true;
+    this.isEnableTokenAuth = typeof options.isEnableTokenAuth === 'boolean' ? options.isEnableTokenAuth : true;
     return this;
   };
 
@@ -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);

package/src/utils/valtio/index.ts

@@ -1,5 +1,5 @@
 import { useRef } from 'react';
-import { useSnapshot } from 'valtio';
+import { useSnapshot, proxy } from 'valtio';
 import { ProxyInstanceObjectBase } from './instance';
 export * from './instance';
 
@@ -21,3 +21,12 @@ export const useValtioInstaceState = <
   const state = useSnapshot(instance.store);
   return [state, instance, (state as any).__defaultValue] as const;
 };
+
+/**
+ * 创建valtio proxy 状态管理
+ */
+export const useValtioProxyState = <T extends object>(inital?: T) => {
+  const instance = useRef(proxy(inital || ({} as T))).current;
+  const state = useSnapshot(instance);
+  return [state, instance, (state as any).__defaultValue] as const;
+};