@fairys/taro-tools-react 1.0.9 → 1.0.11

package/esm/context/global.setting.data.instance.d.ts

@@ -31,6 +31,8 @@ export interface GlobalSettingDataInstanceState {
     useAuthHasMenuPermission?: boolean;
     /**是否开启权限校验*/
     isEnableAuth?: boolean;
+    /**是否使用Taro自带的toast提示*/
+    isUseTaroToast?: boolean;
     /**数据默认值不使用*/
     __defaultValue?: string;
 }

package/esm/context/global.setting.data.instance.js

@@ -9,7 +9,8 @@ class GlobalSettingDataInstance extends ProxyInstanceObjectBase {
         loginPageRoute: 'pages/login/index',
         ignoreAuthRoutes: [],
         useAuthHasMenuPermission: true,
-        isEnableAuth: true
+        isEnableAuth: true,
+        isUseTaroToast: true
     };
     store = proxy({
         ...this.defaultStore

package/esm/context/page.data.instance.js

@@ -311,13 +311,13 @@ function PageDataInstanceContextProvider(props) {
     });
 }
 const usePageDataInstanceState = ()=>{
-    const PageMainDataInstance = usePageDataInstanceContext();
-    const store = useSnapshot(PageMainDataInstance.store, {
+    const pageMainDataInstance = usePageDataInstanceContext();
+    const store = useSnapshot(pageMainDataInstance.store, {
         sync: true
     });
     return [
         store,
-        PageMainDataInstance,
+        pageMainDataInstance,
         store.__defaultValue
     ];
 };

package/esm/context/page.info.data.instance.js

@@ -155,13 +155,13 @@ function PageInfoDataInstanceContextProvider(props) {
     });
 }
 const usePageInfoDataInstanceState = ()=>{
-    const PageInfoDataInstance = usePageInfoDataInstanceContext();
-    const store = useSnapshot(PageInfoDataInstance.store, {
+    const pageInfoDataInstance = usePageInfoDataInstanceContext();
+    const store = useSnapshot(pageInfoDataInstance.store, {
         sync: true
     });
     return [
         store,
-        PageInfoDataInstance,
+        pageInfoDataInstance,
         store.__defaultValue
     ];
 };

package/esm/utils/request.d.ts

@@ -46,8 +46,12 @@ export interface RequestInstanceCreateOptions {
             pathRewrite: Record<string, string>;
         }>;
     };
+    /**启用token校验*/
+    isEnableTokenAuth?: boolean;
 }
 export declare class RequestInstance {
+    /**启用token校验*/
+    isEnableTokenAuth?: boolean;
     /**请求IP地址*/
     IP?: string | ((url: string, module?: string, env?: string) => string);
     /**简单的代理配置*/

package/esm/utils/request.js

@@ -30,12 +30,18 @@ const requestResponseHandle = (result, options)=>{
         msg = codeMessage[result?.statusCode];
         console.log(error);
     }
-    if (msg && options?.isShowErrorMessage !== false) globalDataInstance.showMessage({
+    if (msg && options?.isShowErrorMessage !== false) if (globalSettingDataInstance.store.isUseTaroToast) taro.showToast({
+        title: msg || "\u8BF7\u6C42\u53D1\u751F\u9519\u8BEF",
+        duration: 3000,
+        icon: 'none'
+    });
+    else globalDataInstance.showMessage({
         content: msg || "\u8BF7\u6C42\u53D1\u751F\u9519\u8BEF",
         type: 'error'
     });
 };
 class RequestInstance {
+    isEnableTokenAuth = true;
     IP;
     proxy;
     commonOptions = {};
@@ -53,6 +59,7 @@ class RequestInstance {
             ...this.commonOptions,
             ...options.commonOptions
         };
+        this.isEnableTokenAuth = options.isEnableTokenAuth || true;
         return this;
     };
     getHttpPath = (url, module)=>{
@@ -110,8 +117,13 @@ class RequestInstance {
             ...header
         };
         if (token) newHeader[globalSettingDataInstance.store.headerTokenName || 'token'] = token;
-        else if (true !== isIgnoreToken) {
-            if (false !== isShowErrorMessage) globalDataInstance.showMessage({
+        else if (true !== isIgnoreToken && this.isEnableTokenAuth) {
+            if (false !== isShowErrorMessage) if (globalSettingDataInstance.store.isUseTaroToast) taro.showToast({
+                title: "\u672A\u767B\u5F55",
+                duration: 3000,
+                icon: 'none'
+            });
+            else globalDataInstance.showMessage({
                 content: "\u672A\u767B\u5F55",
                 type: 'error'
             });
@@ -144,7 +156,12 @@ class RequestInstance {
                 options?.success?.(result);
             },
             fail: (result)=>{
-                if (false !== isShowErrorMessage) globalDataInstance.showMessage({
+                if (false !== isShowErrorMessage) if (globalSettingDataInstance.store.isUseTaroToast) taro.showToast({
+                    title: result.errMsg || "\u8BF7\u6C42\u53D1\u751F\u9519\u8BEF",
+                    duration: 3000,
+                    icon: 'none'
+                });
+                else globalDataInstance.showMessage({
                     content: result.errMsg || "\u8BF7\u6C42\u53D1\u751F\u9519\u8BEF",
                     type: 'error'
                 });
@@ -233,7 +250,12 @@ class RequestInstance {
                 }
             },
             fail: (result)=>{
-                if (false !== isShowErrorMessage) globalDataInstance.showMessage({
+                if (false !== isShowErrorMessage) if (globalSettingDataInstance.store.isUseTaroToast) taro.showToast({
+                    title: result.errMsg || "\u8BF7\u6C42\u53D1\u751F\u9519\u8BEF",
+                    duration: 3000,
+                    icon: 'none'
+                });
+                else globalDataInstance.showMessage({
                     content: result.errMsg || "\u8BF7\u6C42\u53D1\u751F\u9519\u8BEF",
                     type: 'error'
                 });
@@ -279,7 +301,12 @@ class RequestInstance {
                 options?.success?.(result);
             },
             fail: (result)=>{
-                if (false !== isShowErrorMessage) globalDataInstance.showMessage({
+                if (false !== isShowErrorMessage) if (globalSettingDataInstance.store.isUseTaroToast) taro.showToast({
+                    title: result.errMsg || "\u8BF7\u6C42\u53D1\u751F\u9519\u8BEF",
+                    duration: 3000,
+                    icon: 'none'
+                });
+                else globalDataInstance.showMessage({
                     content: result.errMsg || "\u8BF7\u6C42\u53D1\u751F\u9519\u8BEF",
                     type: 'error'
                 });

package/lib/context/global.setting.data.instance.d.ts

@@ -31,6 +31,8 @@ export interface GlobalSettingDataInstanceState {
     useAuthHasMenuPermission?: boolean;
     /**是否开启权限校验*/
     isEnableAuth?: boolean;
+    /**是否使用Taro自带的toast提示*/
+    isUseTaroToast?: boolean;
     /**数据默认值不使用*/
     __defaultValue?: string;
 }

package/lib/context/global.setting.data.instance.js

@@ -39,7 +39,8 @@ class GlobalSettingDataInstance extends instance_js_namespaceObject.ProxyInstanc
         loginPageRoute: 'pages/login/index',
         ignoreAuthRoutes: [],
         useAuthHasMenuPermission: true,
-        isEnableAuth: true
+        isEnableAuth: true,
+        isUseTaroToast: true
     };
     store = (0, external_valtio_namespaceObject.proxy)({
         ...this.defaultStore

package/lib/context/page.data.instance.js

@@ -354,13 +354,13 @@ function PageDataInstanceContextProvider(props) {
     });
 }
 const usePageDataInstanceState = ()=>{
-    const PageMainDataInstance = usePageDataInstanceContext();
-    const store = (0, external_valtio_namespaceObject.useSnapshot)(PageMainDataInstance.store, {
+    const pageMainDataInstance = usePageDataInstanceContext();
+    const store = (0, external_valtio_namespaceObject.useSnapshot)(pageMainDataInstance.store, {
         sync: true
     });
     return [
         store,
-        PageMainDataInstance,
+        pageMainDataInstance,
         store.__defaultValue
     ];
 };

package/lib/context/page.info.data.instance.js

@@ -199,13 +199,13 @@ function PageInfoDataInstanceContextProvider(props) {
     });
 }
 const usePageInfoDataInstanceState = ()=>{
-    const PageInfoDataInstance = usePageInfoDataInstanceContext();
-    const store = (0, external_valtio_namespaceObject.useSnapshot)(PageInfoDataInstance.store, {
+    const pageInfoDataInstance = usePageInfoDataInstanceContext();
+    const store = (0, external_valtio_namespaceObject.useSnapshot)(pageInfoDataInstance.store, {
         sync: true
     });
     return [
         store,
-        PageInfoDataInstance,
+        pageInfoDataInstance,
         store.__defaultValue
     ];
 };

package/lib/utils/request.d.ts

@@ -46,8 +46,12 @@ export interface RequestInstanceCreateOptions {
             pathRewrite: Record<string, string>;
         }>;
     };
+    /**启用token校验*/
+    isEnableTokenAuth?: boolean;
 }
 export declare class RequestInstance {
+    /**启用token校验*/
+    isEnableTokenAuth?: boolean;
     /**请求IP地址*/
     IP?: string | ((url: string, module?: string, env?: string) => string);
     /**简单的代理配置*/

package/lib/utils/request.js

@@ -70,12 +70,18 @@ const requestResponseHandle = (result, options)=>{
         msg = codeMessage[result?.statusCode];
         console.log(error);
     }
-    if (msg && options?.isShowErrorMessage !== false) global_data_instance_js_namespaceObject.globalDataInstance.showMessage({
+    if (msg && options?.isShowErrorMessage !== false) if (global_setting_data_instance_js_namespaceObject.globalSettingDataInstance.store.isUseTaroToast) taro_default().showToast({
+        title: msg || "\u8BF7\u6C42\u53D1\u751F\u9519\u8BEF",
+        duration: 3000,
+        icon: 'none'
+    });
+    else global_data_instance_js_namespaceObject.globalDataInstance.showMessage({
         content: msg || "\u8BF7\u6C42\u53D1\u751F\u9519\u8BEF",
         type: 'error'
     });
 };
 class RequestInstance {
+    isEnableTokenAuth = true;
     IP;
     proxy;
     commonOptions = {};
@@ -93,6 +99,7 @@ class RequestInstance {
             ...this.commonOptions,
             ...options.commonOptions
         };
+        this.isEnableTokenAuth = options.isEnableTokenAuth || true;
         return this;
     };
     getHttpPath = (url, module)=>{
@@ -150,8 +157,13 @@ class RequestInstance {
             ...header
         };
         if (token) newHeader[global_setting_data_instance_js_namespaceObject.globalSettingDataInstance.store.headerTokenName || 'token'] = token;
-        else if (true !== isIgnoreToken) {
-            if (false !== isShowErrorMessage) global_data_instance_js_namespaceObject.globalDataInstance.showMessage({
+        else if (true !== isIgnoreToken && this.isEnableTokenAuth) {
+            if (false !== isShowErrorMessage) if (global_setting_data_instance_js_namespaceObject.globalSettingDataInstance.store.isUseTaroToast) taro_default().showToast({
+                title: "\u672A\u767B\u5F55",
+                duration: 3000,
+                icon: 'none'
+            });
+            else global_data_instance_js_namespaceObject.globalDataInstance.showMessage({
                 content: "\u672A\u767B\u5F55",
                 type: 'error'
             });
@@ -184,7 +196,12 @@ class RequestInstance {
                 options?.success?.(result);
             },
             fail: (result)=>{
-                if (false !== isShowErrorMessage) global_data_instance_js_namespaceObject.globalDataInstance.showMessage({
+                if (false !== isShowErrorMessage) if (global_setting_data_instance_js_namespaceObject.globalSettingDataInstance.store.isUseTaroToast) taro_default().showToast({
+                    title: result.errMsg || "\u8BF7\u6C42\u53D1\u751F\u9519\u8BEF",
+                    duration: 3000,
+                    icon: 'none'
+                });
+                else global_data_instance_js_namespaceObject.globalDataInstance.showMessage({
                     content: result.errMsg || "\u8BF7\u6C42\u53D1\u751F\u9519\u8BEF",
                     type: 'error'
                 });
@@ -273,7 +290,12 @@ class RequestInstance {
                 }
             },
             fail: (result)=>{
-                if (false !== isShowErrorMessage) global_data_instance_js_namespaceObject.globalDataInstance.showMessage({
+                if (false !== isShowErrorMessage) if (global_setting_data_instance_js_namespaceObject.globalSettingDataInstance.store.isUseTaroToast) taro_default().showToast({
+                    title: result.errMsg || "\u8BF7\u6C42\u53D1\u751F\u9519\u8BEF",
+                    duration: 3000,
+                    icon: 'none'
+                });
+                else global_data_instance_js_namespaceObject.globalDataInstance.showMessage({
                     content: result.errMsg || "\u8BF7\u6C42\u53D1\u751F\u9519\u8BEF",
                     type: 'error'
                 });
@@ -319,7 +341,12 @@ class RequestInstance {
                 options?.success?.(result);
             },
             fail: (result)=>{
-                if (false !== isShowErrorMessage) global_data_instance_js_namespaceObject.globalDataInstance.showMessage({
+                if (false !== isShowErrorMessage) if (global_setting_data_instance_js_namespaceObject.globalSettingDataInstance.store.isUseTaroToast) taro_default().showToast({
+                    title: result.errMsg || "\u8BF7\u6C42\u53D1\u751F\u9519\u8BEF",
+                    duration: 3000,
+                    icon: 'none'
+                });
+                else global_data_instance_js_namespaceObject.globalDataInstance.showMessage({
                     content: result.errMsg || "\u8BF7\u6C42\u53D1\u751F\u9519\u8BEF",
                     type: 'error'
                 });

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.9",
+  "version": "1.0.11",
   "main": "esm/index.js",
   "types": "esm/index.d.ts",
   "module": "esm/index.js",

package/src/context/global.data.instance.ts

@@ -6,6 +6,7 @@ import React from 'react';
 import type { FairysTaroMessageItemProps } from 'components/Mesage';
 import { ProxyInstanceObjectBase } from 'utils/valtio/instance';
 import { globalSettingDataInstance } from './global.setting.data.instance';
+import Taro from '@tarojs/taro';
 
 export interface MessageDataType extends FairysTaroMessageItemProps {
   /**用于唯一标识提示框(默认自动生成)*/

package/src/context/global.setting.data.instance.ts

@@ -33,6 +33,8 @@ export interface GlobalSettingDataInstanceState {
   useAuthHasMenuPermission?: boolean;
   /**是否开启权限校验*/
   isEnableAuth?: boolean;
+  /**是否使用Taro自带的toast提示*/
+  isUseTaroToast?: boolean;
   /**数据默认值不使用*/
   __defaultValue?: string;
 }
@@ -47,6 +49,7 @@ export class GlobalSettingDataInstance extends ProxyInstanceObjectBase<GlobalSet
     ignoreAuthRoutes: [],
     useAuthHasMenuPermission: true,
     isEnableAuth: true,
+    isUseTaroToast: true,
   };
   store = proxy<GlobalSettingDataInstanceState>({ ...this.defaultStore });
   /**

package/src/context/page.data.instance.tsx

@@ -492,7 +492,7 @@ export const usePageDataInstanceState = <
   T extends PageDataInstanceState = PageDataInstanceState,
   M extends PageDataInstance<T> = PageDataInstance<T>,
 >() => {
-  const PageMainDataInstance = usePageDataInstanceContext<T, M>();
-  const store = useSnapshot(PageMainDataInstance.store, { sync: true }) as T;
-  return [store, PageMainDataInstance, store.__defaultValue] as [T, M, string | undefined];
+  const pageMainDataInstance = usePageDataInstanceContext<T, M>();
+  const store = useSnapshot(pageMainDataInstance.store, { sync: true }) as T;
+  return [store, pageMainDataInstance, store.__defaultValue] as [T, M, string | undefined];
 };

package/src/context/page.info.data.instance.tsx

@@ -283,7 +283,7 @@ export const usePageInfoDataInstanceState = <
   T extends PageInfoDataInstanceState = PageInfoDataInstanceState,
   M extends PageInfoDataInstance<T> = PageInfoDataInstance<T>,
 >() => {
-  const PageInfoDataInstance = usePageInfoDataInstanceContext<T, M>();
-  const store = useSnapshot(PageInfoDataInstance.store, { sync: true }) as T;
-  return [store, PageInfoDataInstance, store.__defaultValue] as [T, M, string | undefined];
+  const pageInfoDataInstance = usePageInfoDataInstanceContext<T, M>();
+  const store = useSnapshot(pageInfoDataInstance.store, { sync: true }) as T;
+  return [store, pageInfoDataInstance, store.__defaultValue] as [T, M, string | undefined];
 };

package/src/utils/request.ts

@@ -64,10 +64,18 @@ const requestResponseHandle = (
     console.log(error);
   }
   if (msg && options?.isShowErrorMessage !== false) {
-    globalDataInstance.showMessage({
-      content: msg || '请求发生错误',
-      type: 'error',
-    });
+    if (globalSettingDataInstance.store.isUseTaroToast) {
+      Taro.showToast({
+        title: msg || '请求发生错误',
+        duration: 3000,
+        icon: 'none',
+      });
+    } else {
+      globalDataInstance.showMessage({
+        content: msg || '请求发生错误',
+        type: 'error',
+      });
+    }
   }
 };
 
@@ -94,9 +102,14 @@ export interface RequestInstanceCreateOptions {
     dev: Record<string, string | { target: string; pathRewrite: Record<string, string> }>;
     pro: Record<string, string | { target: string; pathRewrite: Record<string, string> }>;
   };
+  /**启用token校验*/
+  isEnableTokenAuth?: boolean;
 }
 
 export class RequestInstance {
+  /**启用token校验*/
+  public isEnableTokenAuth?: boolean = true;
+
   /**请求IP地址*/
   public IP?: string | ((url: string, module?: string, env?: string) => string);
   /**简单的代理配置*/
@@ -120,6 +133,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;
     return this;
   };
 
@@ -205,13 +219,21 @@ export class RequestInstance {
     if (token) {
       newHeader[globalSettingDataInstance.store.headerTokenName || 'token'] = token;
     } else {
-      if (isIgnoreToken !== true) {
+      if (isIgnoreToken !== true && this.isEnableTokenAuth) {
         // 跳转登录页
         if (isShowErrorMessage !== false) {
-          globalDataInstance.showMessage({
-            content: '未登录',
-            type: 'error',
-          });
+          if (globalSettingDataInstance.store.isUseTaroToast) {
+            Taro.showToast({
+              title: '未登录',
+              duration: 3000,
+              icon: 'none',
+            });
+          } else {
+            globalDataInstance.showMessage({
+              content: '未登录',
+              type: 'error',
+            });
+          }
         }
         options?.fail?.({ errMsg: '未登录' });
         globalDataInstance.toLoginPage();
@@ -250,10 +272,18 @@ export class RequestInstance {
       },
       fail: (result) => {
         if (isShowErrorMessage !== false) {
-          globalDataInstance.showMessage({
-            content: result.errMsg || '请求发生错误',
-            type: 'error',
-          });
+          if (globalSettingDataInstance.store.isUseTaroToast) {
+            Taro.showToast({
+              title: result.errMsg || '请求发生错误',
+              duration: 3000,
+              icon: 'none',
+            });
+          } else {
+            globalDataInstance.showMessage({
+              content: result.errMsg || '请求发生错误',
+              type: 'error',
+            });
+          }
         }
         options?.fail?.(result);
       },
@@ -358,10 +388,18 @@ export class RequestInstance {
       },
       fail: (result) => {
         if (isShowErrorMessage !== false) {
-          globalDataInstance.showMessage({
-            content: result.errMsg || '请求发生错误',
-            type: 'error',
-          });
+          if (globalSettingDataInstance.store.isUseTaroToast) {
+            Taro.showToast({
+              title: result.errMsg || '请求发生错误',
+              duration: 3000,
+              icon: 'none',
+            });
+          } else {
+            globalDataInstance.showMessage({
+              content: result.errMsg || '请求发生错误',
+              type: 'error',
+            });
+          }
         }
         options?.fail?.(result);
       },
@@ -415,10 +453,18 @@ export class RequestInstance {
       },
       fail: (result) => {
         if (isShowErrorMessage !== false) {
-          globalDataInstance.showMessage({
-            content: result.errMsg || '请求发生错误',
-            type: 'error',
-          });
+          if (globalSettingDataInstance.store.isUseTaroToast) {
+            Taro.showToast({
+              title: result.errMsg || '请求发生错误',
+              duration: 3000,
+              icon: 'none',
+            });
+          } else {
+            globalDataInstance.showMessage({
+              content: result.errMsg || '请求发生错误',
+              type: 'error',
+            });
+          }
         }
         options?.fail?.(result);
       },