@fairys/taro-tools-react 1.0.8 → 1.0.10

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.d.ts

@@ -112,40 +112,40 @@ export interface PageDataOptions<T extends PageDataInstanceState = PageDataInsta
     defaultPageSize?: number;
 }
 /**初始化实例*/
-export declare function usePageDataInstance<T extends PageDataInstanceState = PageDataInstanceState>(instance?: PageDataInstance<T>): PageDataInstance<T>;
+export declare function usePageDataInstance<T extends PageDataInstanceState = PageDataInstanceState, M extends PageDataInstance<T> = PageDataInstance<T>>(instance?: M): M;
 /**页面级数据状态管理上下文*/
 export declare const PageDataInstanceContext: import("react").Context<PageDataInstance<PageDataInstanceState>>;
 /**获取上下文实例*/
-export declare const usePageDataInstanceContext: <T extends PageDataInstanceState = PageDataInstanceState>() => PageDataInstance<T>;
-export interface PageDataInstanceContextProviderProps<T extends PageDataInstanceState = PageDataInstanceState> extends PageDataOptions<T> {
-    instance?: PageDataInstance<T>;
+export declare const usePageDataInstanceContext: <T extends PageDataInstanceState = PageDataInstanceState, M extends PageDataInstance<T> = PageDataInstance<T>>() => M;
+export interface PageDataInstanceContextProviderProps<T extends PageDataInstanceState = PageDataInstanceState, M extends PageDataInstance<T> = PageDataInstance<T>> extends PageDataOptions<T> {
+    instance?: M;
     children: React.ReactNode;
     /**请求之前处理参数*/
-    onBefore?: PageDataInstance<T>['onBefore'];
+    onBefore?: M['onBefore'];
     /**请求接口*/
-    getList?: PageDataInstance<T>['getList'];
+    getList?: M['getList'];
     /**请求之后处理返回值进行存储*/
-    onAfter?: PageDataInstance<T>['onAfter'];
+    onAfter?: M['onAfter'];
     /** 额外数据处理*/
-    onExtraData?: PageDataInstance<T>['onExtraData'];
+    onExtraData?: M['onExtraData'];
     /** code!== 200 时 触发*/
-    onError?: PageDataInstance<T>['onError'];
+    onError?: M['onError'];
     /**获取弹框内重置参数*/
-    getResetValues?: PageDataInstance<T>['getResetValues'];
+    getResetValues?: M['getResetValues'];
     /**默认查询参数*/
-    defaultQuery?: PageDataInstance<T>['defaultQuery'];
+    defaultQuery?: M['defaultQuery'];
     /**那些字段取值对象 code值*/
-    codeFields?: PageDataInstance<T>['codeFields'];
+    codeFields?: M['codeFields'];
     /**那些字段取值对象的 value 值 */
-    valueFields?: PageDataInstance<T>['valueFields'];
+    valueFields?: M['valueFields'];
     /**是否是第一次加载*/
     isMountLoad?: boolean;
     /**页面标题*/
     title?: string;
 }
 /**页面级数据状态管理上下文提供者*/
-export declare function PageDataInstanceContextProvider<T extends PageDataInstanceState = PageDataInstanceState>(props: PageDataInstanceContextProviderProps<T>): import("react/jsx-runtime").JSX.Element;
+export declare function PageDataInstanceContextProvider<T extends PageDataInstanceState = PageDataInstanceState, M extends PageDataInstance<T> = PageDataInstance<T>>(props: PageDataInstanceContextProviderProps<T, M>): import("react/jsx-runtime").JSX.Element;
 /**
  * 页面级数据状态管理
  */
-export declare const usePageDataInstanceState: <T extends PageDataInstanceState = PageDataInstanceState>() => [T, PageDataInstance<T>, string | undefined];
+export declare const usePageDataInstanceState: <T extends PageDataInstanceState = PageDataInstanceState, M extends PageDataInstance<T> = PageDataInstance<T>>() => [T, M, string | undefined];

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.d.ts

@@ -59,35 +59,35 @@ export declare class PageInfoDataInstance<T extends PageInfoDataInstanceState =
     /**保存数据*/
     main_saveInfo: () => Promise<void>;
 }
-export interface PageInfoDataOptions<T extends PageInfoDataInstanceState = PageInfoDataInstanceState> {
+export interface PageInfoDataOptions<T extends PageInfoDataInstanceState = PageInfoDataInstanceState, M extends PageInfoDataInstance<T> = PageInfoDataInstance<T>> {
     /**详情查询请求配置*/
-    requestInfoConfig?: PageInfoDataInstance<T>['requestInfoConfig'];
+    requestInfoConfig?: M['requestInfoConfig'];
     /**详情保存请求配置*/
-    requestSaveInfoConfig?: PageInfoDataInstance<T>['requestSaveInfoConfig'];
+    requestSaveInfoConfig?: M['requestSaveInfoConfig'];
     /**初始值*/
     initialValues?: Partial<T>;
     /**editFormData是否使用valtio proxy 存储*/
     isProxy?: boolean;
 }
 /**初始化实例*/
-export declare const usePageInfoDataInstance: <T extends PageInfoDataInstanceState = PageInfoDataInstanceState>(instance?: PageInfoDataInstance<T>) => PageInfoDataInstance<T>;
+export declare const usePageInfoDataInstance: <T extends PageInfoDataInstanceState = PageInfoDataInstanceState, M extends PageInfoDataInstance<T> = PageInfoDataInstance<T>>(instance?: M) => M;
 /**页面级数据状态管理上下文*/
 export declare const PageInfoDataInstanceContext: import("react").Context<PageInfoDataInstance<PageInfoDataInstanceState>>;
 /**获取上下文实例*/
-export declare const usePageInfoDataInstanceContext: <T extends PageInfoDataInstanceState = PageInfoDataInstanceState>() => PageInfoDataInstance<T>;
-export interface PageInfoDataInstanceContextProviderProps<T extends PageInfoDataInstanceState = PageInfoDataInstanceState> extends PageInfoDataOptions<T> {
-    instance?: PageInfoDataInstance<T>;
+export declare const usePageInfoDataInstanceContext: <T extends PageInfoDataInstanceState = PageInfoDataInstanceState, M extends PageInfoDataInstance<T> = PageInfoDataInstance<T>>() => M;
+export interface PageInfoDataInstanceContextProviderProps<T extends PageInfoDataInstanceState = PageInfoDataInstanceState, M extends PageInfoDataInstance<T> = PageInfoDataInstance<T>> extends PageInfoDataOptions<T, M> {
+    instance?: M;
     children: React.ReactNode;
     /**页面标题*/
     title?: string;
     /**页面一加载是否请求详情接口*/
     isMountRequestInfo?: boolean;
     /**自定义hooks,挂载参数和设置完初始值后执行*/
-    useHooks?: (instance: PageInfoDataInstance<T>) => void;
+    useHooks?: (instance: M) => void;
 }
 /**页面级数据状态管理上下文提供者*/
-export declare function PageInfoDataInstanceContextProvider<T extends PageInfoDataInstanceState = PageInfoDataInstanceState>(props: PageInfoDataInstanceContextProviderProps<T>): import("react/jsx-runtime").JSX.Element;
+export declare function PageInfoDataInstanceContextProvider<T extends PageInfoDataInstanceState = PageInfoDataInstanceState, M extends PageInfoDataInstance<T> = PageInfoDataInstance<T>>(props: PageInfoDataInstanceContextProviderProps<T, M>): import("react/jsx-runtime").JSX.Element;
 /**
  * 页面级数据状态管理
  */
-export declare const usePageInfoDataInstanceState: <T extends PageInfoDataInstanceState = PageInfoDataInstanceState>() => [T, PageInfoDataInstance<T>, string | undefined];
+export declare const usePageInfoDataInstanceState: <T extends PageInfoDataInstanceState = PageInfoDataInstanceState, M extends PageInfoDataInstance<T> = PageInfoDataInstance<T>>() => [T, M, string | undefined];

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.js

@@ -30,7 +30,12 @@ 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'
     });
@@ -111,7 +116,12 @@ class RequestInstance {
         };
         if (token) newHeader[globalSettingDataInstance.store.headerTokenName || 'token'] = token;
         else if (true !== isIgnoreToken) {
-            if (false !== isShowErrorMessage) globalDataInstance.showMessage({
+            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 +154,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 +248,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 +299,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.d.ts

@@ -112,40 +112,40 @@ export interface PageDataOptions<T extends PageDataInstanceState = PageDataInsta
     defaultPageSize?: number;
 }
 /**初始化实例*/
-export declare function usePageDataInstance<T extends PageDataInstanceState = PageDataInstanceState>(instance?: PageDataInstance<T>): PageDataInstance<T>;
+export declare function usePageDataInstance<T extends PageDataInstanceState = PageDataInstanceState, M extends PageDataInstance<T> = PageDataInstance<T>>(instance?: M): M;
 /**页面级数据状态管理上下文*/
 export declare const PageDataInstanceContext: import("react").Context<PageDataInstance<PageDataInstanceState>>;
 /**获取上下文实例*/
-export declare const usePageDataInstanceContext: <T extends PageDataInstanceState = PageDataInstanceState>() => PageDataInstance<T>;
-export interface PageDataInstanceContextProviderProps<T extends PageDataInstanceState = PageDataInstanceState> extends PageDataOptions<T> {
-    instance?: PageDataInstance<T>;
+export declare const usePageDataInstanceContext: <T extends PageDataInstanceState = PageDataInstanceState, M extends PageDataInstance<T> = PageDataInstance<T>>() => M;
+export interface PageDataInstanceContextProviderProps<T extends PageDataInstanceState = PageDataInstanceState, M extends PageDataInstance<T> = PageDataInstance<T>> extends PageDataOptions<T> {
+    instance?: M;
     children: React.ReactNode;
     /**请求之前处理参数*/
-    onBefore?: PageDataInstance<T>['onBefore'];
+    onBefore?: M['onBefore'];
     /**请求接口*/
-    getList?: PageDataInstance<T>['getList'];
+    getList?: M['getList'];
     /**请求之后处理返回值进行存储*/
-    onAfter?: PageDataInstance<T>['onAfter'];
+    onAfter?: M['onAfter'];
     /** 额外数据处理*/
-    onExtraData?: PageDataInstance<T>['onExtraData'];
+    onExtraData?: M['onExtraData'];
     /** code!== 200 时 触发*/
-    onError?: PageDataInstance<T>['onError'];
+    onError?: M['onError'];
     /**获取弹框内重置参数*/
-    getResetValues?: PageDataInstance<T>['getResetValues'];
+    getResetValues?: M['getResetValues'];
     /**默认查询参数*/
-    defaultQuery?: PageDataInstance<T>['defaultQuery'];
+    defaultQuery?: M['defaultQuery'];
     /**那些字段取值对象 code值*/
-    codeFields?: PageDataInstance<T>['codeFields'];
+    codeFields?: M['codeFields'];
     /**那些字段取值对象的 value 值 */
-    valueFields?: PageDataInstance<T>['valueFields'];
+    valueFields?: M['valueFields'];
     /**是否是第一次加载*/
     isMountLoad?: boolean;
     /**页面标题*/
     title?: string;
 }
 /**页面级数据状态管理上下文提供者*/
-export declare function PageDataInstanceContextProvider<T extends PageDataInstanceState = PageDataInstanceState>(props: PageDataInstanceContextProviderProps<T>): import("react/jsx-runtime").JSX.Element;
+export declare function PageDataInstanceContextProvider<T extends PageDataInstanceState = PageDataInstanceState, M extends PageDataInstance<T> = PageDataInstance<T>>(props: PageDataInstanceContextProviderProps<T, M>): import("react/jsx-runtime").JSX.Element;
 /**
  * 页面级数据状态管理
  */
-export declare const usePageDataInstanceState: <T extends PageDataInstanceState = PageDataInstanceState>() => [T, PageDataInstance<T>, string | undefined];
+export declare const usePageDataInstanceState: <T extends PageDataInstanceState = PageDataInstanceState, M extends PageDataInstance<T> = PageDataInstance<T>>() => [T, M, string | undefined];

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.d.ts

@@ -59,35 +59,35 @@ export declare class PageInfoDataInstance<T extends PageInfoDataInstanceState =
     /**保存数据*/
     main_saveInfo: () => Promise<void>;
 }
-export interface PageInfoDataOptions<T extends PageInfoDataInstanceState = PageInfoDataInstanceState> {
+export interface PageInfoDataOptions<T extends PageInfoDataInstanceState = PageInfoDataInstanceState, M extends PageInfoDataInstance<T> = PageInfoDataInstance<T>> {
     /**详情查询请求配置*/
-    requestInfoConfig?: PageInfoDataInstance<T>['requestInfoConfig'];
+    requestInfoConfig?: M['requestInfoConfig'];
     /**详情保存请求配置*/
-    requestSaveInfoConfig?: PageInfoDataInstance<T>['requestSaveInfoConfig'];
+    requestSaveInfoConfig?: M['requestSaveInfoConfig'];
     /**初始值*/
     initialValues?: Partial<T>;
     /**editFormData是否使用valtio proxy 存储*/
     isProxy?: boolean;
 }
 /**初始化实例*/
-export declare const usePageInfoDataInstance: <T extends PageInfoDataInstanceState = PageInfoDataInstanceState>(instance?: PageInfoDataInstance<T>) => PageInfoDataInstance<T>;
+export declare const usePageInfoDataInstance: <T extends PageInfoDataInstanceState = PageInfoDataInstanceState, M extends PageInfoDataInstance<T> = PageInfoDataInstance<T>>(instance?: M) => M;
 /**页面级数据状态管理上下文*/
 export declare const PageInfoDataInstanceContext: import("react").Context<PageInfoDataInstance<PageInfoDataInstanceState>>;
 /**获取上下文实例*/
-export declare const usePageInfoDataInstanceContext: <T extends PageInfoDataInstanceState = PageInfoDataInstanceState>() => PageInfoDataInstance<T>;
-export interface PageInfoDataInstanceContextProviderProps<T extends PageInfoDataInstanceState = PageInfoDataInstanceState> extends PageInfoDataOptions<T> {
-    instance?: PageInfoDataInstance<T>;
+export declare const usePageInfoDataInstanceContext: <T extends PageInfoDataInstanceState = PageInfoDataInstanceState, M extends PageInfoDataInstance<T> = PageInfoDataInstance<T>>() => M;
+export interface PageInfoDataInstanceContextProviderProps<T extends PageInfoDataInstanceState = PageInfoDataInstanceState, M extends PageInfoDataInstance<T> = PageInfoDataInstance<T>> extends PageInfoDataOptions<T, M> {
+    instance?: M;
     children: React.ReactNode;
     /**页面标题*/
     title?: string;
     /**页面一加载是否请求详情接口*/
     isMountRequestInfo?: boolean;
     /**自定义hooks,挂载参数和设置完初始值后执行*/
-    useHooks?: (instance: PageInfoDataInstance<T>) => void;
+    useHooks?: (instance: M) => void;
 }
 /**页面级数据状态管理上下文提供者*/
-export declare function PageInfoDataInstanceContextProvider<T extends PageInfoDataInstanceState = PageInfoDataInstanceState>(props: PageInfoDataInstanceContextProviderProps<T>): import("react/jsx-runtime").JSX.Element;
+export declare function PageInfoDataInstanceContextProvider<T extends PageInfoDataInstanceState = PageInfoDataInstanceState, M extends PageInfoDataInstance<T> = PageInfoDataInstance<T>>(props: PageInfoDataInstanceContextProviderProps<T, M>): import("react/jsx-runtime").JSX.Element;
 /**
  * 页面级数据状态管理
  */
-export declare const usePageInfoDataInstanceState: <T extends PageInfoDataInstanceState = PageInfoDataInstanceState>() => [T, PageInfoDataInstance<T>, string | undefined];
+export declare const usePageInfoDataInstanceState: <T extends PageInfoDataInstanceState = PageInfoDataInstanceState, M extends PageInfoDataInstance<T> = PageInfoDataInstance<T>>() => [T, M, string | undefined];

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.js

@@ -70,7 +70,12 @@ 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'
     });
@@ -151,7 +156,12 @@ class RequestInstance {
         };
         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({
+            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 +194,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 +288,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 +339,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.8",
+  "version": "1.0.10",
   "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

@@ -373,12 +373,13 @@ export interface PageDataOptions<T extends PageDataInstanceState = PageDataInsta
 }
 
 /**初始化实例*/
-export function usePageDataInstance<T extends PageDataInstanceState = PageDataInstanceState>(
-  instance?: PageDataInstance<T>,
-) {
-  const ref = useRef<PageDataInstance<T>>();
+export function usePageDataInstance<
+  T extends PageDataInstanceState = PageDataInstanceState,
+  M extends PageDataInstance<T> = PageDataInstance<T>,
+>(instance?: M) {
+  const ref = useRef<M>();
   if (!ref.current) {
-    ref.current = instance || new PageDataInstance<T>();
+    ref.current = instance || (new PageDataInstance<T>() as M);
   }
   return ref.current;
 }
@@ -387,33 +388,38 @@ export function usePageDataInstance<T extends PageDataInstanceState = PageDataIn
 export const PageDataInstanceContext = createContext<PageDataInstance>(new PageDataInstance());
 
 /**获取上下文实例*/
-export const usePageDataInstanceContext = <T extends PageDataInstanceState = PageDataInstanceState>() => {
-  const PageDataInstance = useContext(PageDataInstanceContext) as PageDataInstance<T>;
+export const usePageDataInstanceContext = <
+  T extends PageDataInstanceState = PageDataInstanceState,
+  M extends PageDataInstance<T> = PageDataInstance<T>,
+>() => {
+  const PageDataInstance = useContext(PageDataInstanceContext) as M;
   return PageDataInstance;
 };
 
-export interface PageDataInstanceContextProviderProps<T extends PageDataInstanceState = PageDataInstanceState>
-  extends PageDataOptions<T> {
-  instance?: PageDataInstance<T>;
+export interface PageDataInstanceContextProviderProps<
+  T extends PageDataInstanceState = PageDataInstanceState,
+  M extends PageDataInstance<T> = PageDataInstance<T>,
+> extends PageDataOptions<T> {
+  instance?: M;
   children: React.ReactNode;
   /**请求之前处理参数*/
-  onBefore?: PageDataInstance<T>['onBefore'];
+  onBefore?: M['onBefore'];
   /**请求接口*/
-  getList?: PageDataInstance<T>['getList'];
+  getList?: M['getList'];
   /**请求之后处理返回值进行存储*/
-  onAfter?: PageDataInstance<T>['onAfter'];
+  onAfter?: M['onAfter'];
   /** 额外数据处理*/
-  onExtraData?: PageDataInstance<T>['onExtraData'];
+  onExtraData?: M['onExtraData'];
   /** code!== 200 时 触发*/
-  onError?: PageDataInstance<T>['onError'];
+  onError?: M['onError'];
   /**获取弹框内重置参数*/
-  getResetValues?: PageDataInstance<T>['getResetValues'];
+  getResetValues?: M['getResetValues'];
   /**默认查询参数*/
-  defaultQuery?: PageDataInstance<T>['defaultQuery'];
+  defaultQuery?: M['defaultQuery'];
   /**那些字段取值对象 code值*/
-  codeFields?: PageDataInstance<T>['codeFields'];
+  codeFields?: M['codeFields'];
   /**那些字段取值对象的 value 值 */
-  valueFields?: PageDataInstance<T>['valueFields'];
+  valueFields?: M['valueFields'];
   /**是否是第一次加载*/
   isMountLoad?: boolean;
   /**页面标题*/
@@ -421,9 +427,10 @@ export interface PageDataInstanceContextProviderProps<T extends PageDataInstance
 }
 
 /**页面级数据状态管理上下文提供者*/
-export function PageDataInstanceContextProvider<T extends PageDataInstanceState = PageDataInstanceState>(
-  props: PageDataInstanceContextProviderProps<T>,
-) {
+export function PageDataInstanceContextProvider<
+  T extends PageDataInstanceState = PageDataInstanceState,
+  M extends PageDataInstance<T> = PageDataInstance<T>,
+>(props: PageDataInstanceContextProviderProps<T, M>) {
   const {
     instance,
     children,
@@ -481,8 +488,11 @@ export function PageDataInstanceContextProvider<T extends PageDataInstanceState
 /**
  * 页面级数据状态管理
  */
-export const usePageDataInstanceState = <T extends PageDataInstanceState = PageDataInstanceState>() => {
-  const PageMainDataInstance = usePageDataInstanceContext<T>();
-  const store = useSnapshot(PageMainDataInstance.store, { sync: true }) as T;
-  return [store, PageMainDataInstance, store.__defaultValue] as [T, PageDataInstance<T>, string | undefined];
+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];
 };

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

@@ -176,11 +176,14 @@ export class PageInfoDataInstance<
   };
 }
 
-export interface PageInfoDataOptions<T extends PageInfoDataInstanceState = PageInfoDataInstanceState> {
+export interface PageInfoDataOptions<
+  T extends PageInfoDataInstanceState = PageInfoDataInstanceState,
+  M extends PageInfoDataInstance<T> = PageInfoDataInstance<T>,
+> {
   /**详情查询请求配置*/
-  requestInfoConfig?: PageInfoDataInstance<T>['requestInfoConfig'];
+  requestInfoConfig?: M['requestInfoConfig'];
   /**详情保存请求配置*/
-  requestSaveInfoConfig?: PageInfoDataInstance<T>['requestSaveInfoConfig'];
+  requestSaveInfoConfig?: M['requestSaveInfoConfig'];
   /**初始值*/
   initialValues?: Partial<T>;
   /**editFormData是否使用valtio proxy 存储*/
@@ -188,15 +191,18 @@ export interface PageInfoDataOptions<T extends PageInfoDataInstanceState = PageI
 }
 
 /**初始化实例*/
-export const usePageInfoDataInstance = <T extends PageInfoDataInstanceState = PageInfoDataInstanceState>(
-  instance?: PageInfoDataInstance<T>,
+export const usePageInfoDataInstance = <
+  T extends PageInfoDataInstanceState = PageInfoDataInstanceState,
+  M extends PageInfoDataInstance<T> = PageInfoDataInstance<T>,
+>(
+  instance?: M,
 ) => {
-  const ref = useRef<PageInfoDataInstance<T>>();
+  const ref = useRef<M>();
   if (!ref.current) {
     if (instance) {
       ref.current = instance;
     } else {
-      ref.current = new PageInfoDataInstance<T>();
+      ref.current = new PageInfoDataInstance<T>() as M;
     }
   }
   return ref.current;
@@ -206,28 +212,33 @@ export const usePageInfoDataInstance = <T extends PageInfoDataInstanceState = Pa
 export const PageInfoDataInstanceContext = createContext<PageInfoDataInstance>(new PageInfoDataInstance());
 
 /**获取上下文实例*/
-export const usePageInfoDataInstanceContext = <T extends PageInfoDataInstanceState = PageInfoDataInstanceState>() => {
-  const PageInfoDataInstance = useContext(PageInfoDataInstanceContext) as PageInfoDataInstance<T>;
+export const usePageInfoDataInstanceContext = <
+  T extends PageInfoDataInstanceState = PageInfoDataInstanceState,
+  M extends PageInfoDataInstance<T> = PageInfoDataInstance<T>,
+>() => {
+  const PageInfoDataInstance = useContext(PageInfoDataInstanceContext) as M;
   return PageInfoDataInstance;
 };
 
 export interface PageInfoDataInstanceContextProviderProps<
   T extends PageInfoDataInstanceState = PageInfoDataInstanceState,
-> extends PageInfoDataOptions<T> {
-  instance?: PageInfoDataInstance<T>;
+  M extends PageInfoDataInstance<T> = PageInfoDataInstance<T>,
+> extends PageInfoDataOptions<T, M> {
+  instance?: M;
   children: React.ReactNode;
   /**页面标题*/
   title?: string;
   /**页面一加载是否请求详情接口*/
   isMountRequestInfo?: boolean;
   /**自定义hooks,挂载参数和设置完初始值后执行*/
-  useHooks?: (instance: PageInfoDataInstance<T>) => void;
+  useHooks?: (instance: M) => void;
 }
 
 /**页面级数据状态管理上下文提供者*/
-export function PageInfoDataInstanceContextProvider<T extends PageInfoDataInstanceState = PageInfoDataInstanceState>(
-  props: PageInfoDataInstanceContextProviderProps<T>,
-) {
+export function PageInfoDataInstanceContextProvider<
+  T extends PageInfoDataInstanceState = PageInfoDataInstanceState,
+  M extends PageInfoDataInstance<T> = PageInfoDataInstance<T>,
+>(props: PageInfoDataInstanceContextProviderProps<T, M>) {
   const {
     instance,
     children,
@@ -268,8 +279,11 @@ export function PageInfoDataInstanceContextProvider<T extends PageInfoDataInstan
 /**
  * 页面级数据状态管理
  */
-export const usePageInfoDataInstanceState = <T extends PageInfoDataInstanceState = PageInfoDataInstanceState>() => {
-  const PageInfoDataInstance = usePageInfoDataInstanceContext<T>();
-  const store = useSnapshot(PageInfoDataInstance.store, { sync: true }) as T;
-  return [store, PageInfoDataInstance, store.__defaultValue] as [T, PageInfoDataInstance<T>, string | undefined];
+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];
 };

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',
+      });
+    }
   }
 };
 
@@ -208,10 +216,18 @@ export class RequestInstance {
       if (isIgnoreToken !== true) {
         // 跳转登录页
         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 +266,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 +382,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 +447,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);
       },