@fairys/taro-tools-react 1.0.14 → 1.0.16

package/esm/components/MainPage/index.js

@@ -4,7 +4,7 @@ import clsx from "clsx";
 import { useMemo } from "react";
 const FairysTaroMainPage = (props)=>{
     const { className: itemClassName, children, ...rest } = props;
-    const cls = useMemo(()=>clsx('fairys_taro-ui-main-page fairystaro__text-red-100 fairystaro__box-border fairystaro__w-full fairystaro__h-full fairystaro__flex fairystaro__flex-col fairystaro__overflow-auto', itemClassName), [
+    const cls = useMemo(()=>clsx('fairys_taro-ui-main-page fairystaro__box-border fairystaro__w-full fairystaro__h-full fairystaro__flex fairystaro__flex-col fairystaro__overflow-auto', itemClassName), [
         itemClassName
     ]);
     return /*#__PURE__*/ jsx(View, {

package/esm/components/Mesage/index.js

@@ -1,7 +1,7 @@
 import { jsx, jsxs } from "react/jsx-runtime";
 import { Fragment, createElement, useMemo } from "react";
 import { View } from "@tarojs/components";
-import { useGlobalData } from "../../context/global.data.instance.js";
+import { useGlobalMessageData } from "../../context/global.message.data.instance.js";
 import { FairysTaroPortal } from "../Portal/index.js";
 import clsx from "clsx";
 const FairysTaroMessageItem = (props)=>{
@@ -99,7 +99,7 @@ const FairysTaroMessage = (props)=>{
 };
 const FairysTaroPortalMessage = (props)=>{
     const { className: messageClassName, ...rest } = props;
-    const [state] = useGlobalData();
+    const [state] = useGlobalMessageData();
     const messageData = state.messageData;
     const classNames = useMemo(()=>clsx('fairys_taro-ui-portal-message fairystaro__pointer-events-none fairystaro__position-fixed  fairystaro__top-0 fairystaro__right-0  fairystaro__bottom-0  fairystaro__left-0', messageClassName), [
         messageClassName

package/esm/components/Toast/index.js

@@ -1,9 +1,9 @@
 import { jsx } from "react/jsx-runtime";
 import { Toast } from "@nutui/nutui-react-taro";
 import { FairysTaroPortal } from "../Portal/index.js";
-import { useGlobalData } from "../../context/global.data.instance.js";
+import { useGlobalMessageData } from "../../context/global.message.data.instance.js";
 const FairysTaroToast = ()=>{
-    const [state, proxyInstance] = useGlobalData();
+    const [state, proxyInstance] = useGlobalMessageData();
     const toastConfig = state.toastData;
     return /*#__PURE__*/ jsx(FairysTaroPortal, {
         children: /*#__PURE__*/ jsx(Toast, {

package/esm/components/connectToastMessage/index.d.ts

@@ -7,4 +7,15 @@ export interface ConnectToastMessageOptions {
      */
     isRoot?: boolean;
 }
-export declare const connectToastMessage: (Component: React.FC, options?: ConnectToastMessageOptions) => (props: any) => import("react/jsx-runtime").JSX.Element;
+/**
+ * 高阶组件，用于为 React 组件连接 Toast 和 Message 功能
+ *
+ * 根据不同的运行环境（H5/微信小程序）和组件层级（根页面/子页面），
+ * 决定是否渲染 Toast 和 Message 组件，以避免功能冲突和界面遮挡
+ *
+ * @param Component - 需要被包装的 React 组件
+ * @param options - 配置选项
+ * @param options.isRoot - 是否为根页面组件，默认为 false
+ * @returns 返回一个经过优化的 React 组件，根据环境条件选择性渲染 Toast 和 Message
+ */
+export declare const connectToastMessage: (Component: React.FC, options?: ConnectToastMessageOptions) => React.MemoExoticComponent<(props: any) => import("react/jsx-runtime").JSX.Element>;

package/esm/components/connectToastMessage/index.js

@@ -1,10 +1,10 @@
 import { jsx, jsxs } from "react/jsx-runtime";
 import { FairysTaroPortalMessage } from "../Mesage/index.js";
 import { FairysTaroToast } from "../Toast/index.js";
-import { Fragment } from "react";
+import { Fragment, memo } from "react";
 const connectToastMessage = (Component, options = {})=>{
     const { isRoot = false } = options;
-    return (props)=>{
+    return /*#__PURE__*/ memo((props)=>{
         if ('weapp' === process.env.TARO_ENV) return /*#__PURE__*/ jsxs(Fragment, {
             children: [
                 /*#__PURE__*/ jsx(Component, {
@@ -23,6 +23,6 @@ const connectToastMessage = (Component, options = {})=>{
                 isRoot ? /*#__PURE__*/ jsx(FairysTaroPortalMessage, {}) : /*#__PURE__*/ jsx(Fragment, {})
             ]
         });
-    };
+    });
 };
 export { connectToastMessage };

package/esm/context/{global.data.instance.d.ts → global.message.data.instance.d.ts}

@@ -17,7 +17,7 @@ export interface MessageDataType extends FairysTaroMessageItemProps {
 }
 export interface ToastDataType extends Partial<TaroToastProps> {
 }
-export interface GlobalDataInstanceState {
+export interface GlobalMessageDataInstanceState {
     /**弹框提示框*/
     messageData?: MessageDataType[];
     /**提示框数据*/
@@ -25,8 +25,11 @@ export interface GlobalDataInstanceState {
     /**数据默认值不使用*/
     __defaultValue?: string;
 }
-export declare class GlobalDataInstance extends ProxyInstanceObjectBase<GlobalDataInstanceState> {
-    store: GlobalDataInstanceState;
+/**
+ * 全局消息数据实例
+ */
+export declare class GlobalMessageDataInstance extends ProxyInstanceObjectBase<GlobalMessageDataInstanceState> {
+    store: GlobalMessageDataInstanceState;
     /**用于提示信息*/
     showMessage: (options: Omit<MessageDataType, "__id"> & {
         __id?: string;
@@ -45,10 +48,10 @@ export declare class GlobalDataInstance extends ProxyInstanceObjectBase<GlobalDa
     toLoginPage: () => void;
 }
 /**
- * 全局数据实例
+ * 全局消息数据实例
  */
-export declare const globalDataInstance: GlobalDataInstance;
+export declare const globalMessageDataInstance: GlobalMessageDataInstance;
 /**
- * 全局数据状态管理
+ * 全局消息数据状态管理
  */
-export declare const useGlobalData: () => [GlobalDataInstanceState, GlobalDataInstance, string | undefined];
+export declare const useGlobalMessageData: () => [GlobalMessageDataInstanceState, GlobalMessageDataInstance, string | undefined];

package/esm/context/{global.data.instance.js → global.message.data.instance.js}

@@ -3,7 +3,7 @@ import utils_navigate from "../utils/navigate.js";
 import { createUseId } from "../utils/useId.js";
 import { ProxyInstanceObjectBase } from "../utils/valtio/instance.js";
 import { globalSettingDataInstance } from "./global.setting.data.instance.js";
-class GlobalDataInstance extends ProxyInstanceObjectBase {
+class GlobalMessageDataInstance extends ProxyInstanceObjectBase {
     store = proxy({
         messageData: ref([]),
         toastData: void 0
@@ -60,13 +60,13 @@ class GlobalDataInstance extends ProxyInstanceObjectBase {
         });
     };
 }
-const globalDataInstance = new GlobalDataInstance();
-const useGlobalData = ()=>{
-    const store = useSnapshot(globalDataInstance.store);
+const globalMessageDataInstance = new GlobalMessageDataInstance();
+const useGlobalMessageData = ()=>{
+    const store = useSnapshot(globalMessageDataInstance.store);
     return [
         store,
-        globalDataInstance,
+        globalMessageDataInstance,
         store.__defaultValue
     ];
 };
-export { GlobalDataInstance, globalDataInstance, useGlobalData };
+export { GlobalMessageDataInstance, globalMessageDataInstance, useGlobalMessageData };

package/esm/context/index.d.ts

@@ -1,4 +1,4 @@
-export * from './global.data.instance';
+export * from './global.message.data.instance';
 export * from './page.data.instance';
 export * from './page.info.data.instance';
 export * from './auth.data.instance';

package/esm/context/index.js

@@ -1,4 +1,4 @@
-export * from "./global.data.instance.js";
+export * from "./global.message.data.instance.js";
 export * from "./page.data.instance.js";
 export * from "./page.info.data.instance.js";
 export * from "./auth.data.instance.js";

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

@@ -3,7 +3,7 @@ import { proxy, ref as external_valtio_ref, useSnapshot } from "valtio";
 import { ProxyInstanceObjectBase } from "../utils/valtio/instance.js";
 import { createContext, useContext, useEffect, useMemo, useRef } from "react";
 import utils_navigate from "../utils/navigate.js";
-import { globalDataInstance } from "./global.data.instance.js";
+import { globalMessageDataInstance } from "./global.message.data.instance.js";
 import { globalSettingDataInstance } from "./global.setting.data.instance.js";
 import taro, { useDidShow } from "@tarojs/taro";
 class page_info_data_instance_PageInfoDataInstance extends ProxyInstanceObjectBase {
@@ -92,7 +92,7 @@ class page_info_data_instance_PageInfoDataInstance extends ProxyInstanceObjectBa
             taro.hideLoading();
             this.updatedLoading(false);
             if (result && result.code === globalSettingDataInstance.store.requestSuccessCode) {
-                if (this.requestSaveInfoConfig?.isShowSuccessMessage === false) globalDataInstance.showMessage({
+                if (this.requestSaveInfoConfig?.isShowSuccessMessage === false) globalMessageDataInstance.showMessage({
                     content: result.message || "\u4FDD\u5B58\u6210\u529F"
                 });
                 else taro.showToast({

package/esm/styles/index.css

@@ -189,11 +189,6 @@
   color: red;
 }
 
-.fairystaro__text-red-100 {
-  --un-text-opacity: 1;
-  color: rgb(254 226 226 / var(--un-text-opacity));
-}
-
 .fairystaro__font-bold {
   font-weight: 700;
 }

package/esm/utils/request.js

@@ -1,6 +1,6 @@
 import taro from "@tarojs/taro";
 import { globalSettingDataInstance } from "../context/global.setting.data.instance.js";
-import { globalDataInstance } from "../context/global.data.instance.js";
+import { globalMessageDataInstance } from "../context/global.message.data.instance.js";
 const codeMessage = {
     400: "\u53D1\u51FA\u7684\u8BF7\u6C42\u9519\u8BEF",
     401: "\u7528\u6237\u6CA1\u6709\u6743\u9650",
@@ -21,7 +21,7 @@ const requestResponseHandle = (result, options)=>{
         const code = result?.data?.code;
         if (401 === statusCode || 401 === code || code === globalSettingDataInstance.store.tokenExpiredCode) {
             msg = "\u8BF7\u91CD\u65B0\u767B\u5F55";
-            globalDataInstance.toLoginPage();
+            globalMessageDataInstance.toLoginPage();
         } else msg = [
             globalSettingDataInstance.store.requestSuccessCode,
             200
@@ -35,7 +35,7 @@ const requestResponseHandle = (result, options)=>{
         duration: 3000,
         icon: 'none'
     });
-    else globalDataInstance.showMessage({
+    else globalMessageDataInstance.showMessage({
         content: msg || "\u8BF7\u6C42\u53D1\u751F\u9519\u8BEF",
         type: 'error'
     });
@@ -123,14 +123,14 @@ class RequestInstance {
                 duration: 3000,
                 icon: 'none'
             });
-            else globalDataInstance.showMessage({
+            else globalMessageDataInstance.showMessage({
                 content: "\u672A\u767B\u5F55",
                 type: 'error'
             });
             options?.fail?.({
                 errMsg: "\u672A\u767B\u5F55"
             });
-            globalDataInstance.toLoginPage();
+            globalMessageDataInstance.toLoginPage();
             return;
         }
         return {
@@ -161,7 +161,7 @@ class RequestInstance {
                     duration: 3000,
                     icon: 'none'
                 });
-                else globalDataInstance.showMessage({
+                else globalMessageDataInstance.showMessage({
                     content: result.errMsg || "\u8BF7\u6C42\u53D1\u751F\u9519\u8BEF",
                     type: 'error'
                 });
@@ -255,7 +255,7 @@ class RequestInstance {
                     duration: 3000,
                     icon: 'none'
                 });
-                else globalDataInstance.showMessage({
+                else globalMessageDataInstance.showMessage({
                     content: result.errMsg || "\u8BF7\u6C42\u53D1\u751F\u9519\u8BEF",
                     type: 'error'
                 });
@@ -306,7 +306,7 @@ class RequestInstance {
                     duration: 3000,
                     icon: 'none'
                 });
-                else globalDataInstance.showMessage({
+                else globalMessageDataInstance.showMessage({
                     content: result.errMsg || "\u8BF7\u6C42\u53D1\u751F\u9519\u8BEF",
                     type: 'error'
                 });

package/lib/components/MainPage/index.js

@@ -45,7 +45,7 @@ var external_clsx_default = /*#__PURE__*/ __webpack_require__.n(external_clsx_na
 const external_react_namespaceObject = require("react");
 const FairysTaroMainPage = (props)=>{
     const { className: itemClassName, children, ...rest } = props;
-    const cls = (0, external_react_namespaceObject.useMemo)(()=>external_clsx_default()('fairys_taro-ui-main-page fairystaro__text-red-100 fairystaro__box-border fairystaro__w-full fairystaro__h-full fairystaro__flex fairystaro__flex-col fairystaro__overflow-auto', itemClassName), [
+    const cls = (0, external_react_namespaceObject.useMemo)(()=>external_clsx_default()('fairys_taro-ui-main-page fairystaro__box-border fairystaro__w-full fairystaro__h-full fairystaro__flex fairystaro__flex-col fairystaro__overflow-auto', itemClassName), [
         itemClassName
     ]);
     return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(components_namespaceObject.View, {

package/lib/components/Mesage/index.js

@@ -40,7 +40,7 @@ __webpack_require__.d(__webpack_exports__, {
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 const external_react_namespaceObject = require("react");
 const components_namespaceObject = require("@tarojs/components");
-const global_data_instance_js_namespaceObject = require("../../context/global.data.instance.js");
+const global_message_data_instance_js_namespaceObject = require("../../context/global.message.data.instance.js");
 const index_js_namespaceObject = require("../Portal/index.js");
 const external_clsx_namespaceObject = require("clsx");
 var external_clsx_default = /*#__PURE__*/ __webpack_require__.n(external_clsx_namespaceObject);
@@ -139,7 +139,7 @@ const FairysTaroMessage = (props)=>{
 };
 const FairysTaroPortalMessage = (props)=>{
     const { className: messageClassName, ...rest } = props;
-    const [state] = (0, global_data_instance_js_namespaceObject.useGlobalData)();
+    const [state] = (0, global_message_data_instance_js_namespaceObject.useGlobalMessageData)();
     const messageData = state.messageData;
     const classNames = (0, external_react_namespaceObject.useMemo)(()=>external_clsx_default()('fairys_taro-ui-portal-message fairystaro__pointer-events-none fairystaro__position-fixed  fairystaro__top-0 fairystaro__right-0  fairystaro__bottom-0  fairystaro__left-0', messageClassName), [
         messageClassName

package/lib/components/Toast/index.js

@@ -29,9 +29,9 @@ __webpack_require__.d(__webpack_exports__, {
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 const nutui_react_taro_namespaceObject = require("@nutui/nutui-react-taro");
 const index_js_namespaceObject = require("../Portal/index.js");
-const global_data_instance_js_namespaceObject = require("../../context/global.data.instance.js");
+const global_message_data_instance_js_namespaceObject = require("../../context/global.message.data.instance.js");
 const FairysTaroToast = ()=>{
-    const [state, proxyInstance] = (0, global_data_instance_js_namespaceObject.useGlobalData)();
+    const [state, proxyInstance] = (0, global_message_data_instance_js_namespaceObject.useGlobalMessageData)();
     const toastConfig = state.toastData;
     return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(index_js_namespaceObject.FairysTaroPortal, {
         children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(nutui_react_taro_namespaceObject.Toast, {

package/lib/components/connectToastMessage/index.d.ts

@@ -7,4 +7,15 @@ export interface ConnectToastMessageOptions {
      */
     isRoot?: boolean;
 }
-export declare const connectToastMessage: (Component: React.FC, options?: ConnectToastMessageOptions) => (props: any) => import("react/jsx-runtime").JSX.Element;
+/**
+ * 高阶组件，用于为 React 组件连接 Toast 和 Message 功能
+ *
+ * 根据不同的运行环境（H5/微信小程序）和组件层级（根页面/子页面），
+ * 决定是否渲染 Toast 和 Message 组件，以避免功能冲突和界面遮挡
+ *
+ * @param Component - 需要被包装的 React 组件
+ * @param options - 配置选项
+ * @param options.isRoot - 是否为根页面组件，默认为 false
+ * @returns 返回一个经过优化的 React 组件，根据环境条件选择性渲染 Toast 和 Message
+ */
+export declare const connectToastMessage: (Component: React.FC, options?: ConnectToastMessageOptions) => React.MemoExoticComponent<(props: any) => import("react/jsx-runtime").JSX.Element>;

package/lib/components/connectToastMessage/index.js

@@ -32,7 +32,7 @@ const external_Toast_index_js_namespaceObject = require("../Toast/index.js");
 const external_react_namespaceObject = require("react");
 const connectToastMessage = (Component, options = {})=>{
     const { isRoot = false } = options;
-    return (props)=>{
+    return /*#__PURE__*/ (0, external_react_namespaceObject.memo)((props)=>{
         if ('weapp' === process.env.TARO_ENV) return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsxs)(external_react_namespaceObject.Fragment, {
             children: [
                 /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(Component, {
@@ -51,7 +51,7 @@ const connectToastMessage = (Component, options = {})=>{
                 isRoot ? /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(index_js_namespaceObject.FairysTaroPortalMessage, {}) : /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_react_namespaceObject.Fragment, {})
             ]
         });
-    };
+    });
 };
 exports.connectToastMessage = __webpack_exports__.connectToastMessage;
 for(var __webpack_i__ in __webpack_exports__)if (-1 === [

package/lib/context/{global.data.instance.d.ts → global.message.data.instance.d.ts}

@@ -17,7 +17,7 @@ export interface MessageDataType extends FairysTaroMessageItemProps {
 }
 export interface ToastDataType extends Partial<TaroToastProps> {
 }
-export interface GlobalDataInstanceState {
+export interface GlobalMessageDataInstanceState {
     /**弹框提示框*/
     messageData?: MessageDataType[];
     /**提示框数据*/
@@ -25,8 +25,11 @@ export interface GlobalDataInstanceState {
     /**数据默认值不使用*/
     __defaultValue?: string;
 }
-export declare class GlobalDataInstance extends ProxyInstanceObjectBase<GlobalDataInstanceState> {
-    store: GlobalDataInstanceState;
+/**
+ * 全局消息数据实例
+ */
+export declare class GlobalMessageDataInstance extends ProxyInstanceObjectBase<GlobalMessageDataInstanceState> {
+    store: GlobalMessageDataInstanceState;
     /**用于提示信息*/
     showMessage: (options: Omit<MessageDataType, "__id"> & {
         __id?: string;
@@ -45,10 +48,10 @@ export declare class GlobalDataInstance extends ProxyInstanceObjectBase<GlobalDa
     toLoginPage: () => void;
 }
 /**
- * 全局数据实例
+ * 全局消息数据实例
  */
-export declare const globalDataInstance: GlobalDataInstance;
+export declare const globalMessageDataInstance: GlobalMessageDataInstance;
 /**
- * 全局数据状态管理
+ * 全局消息数据状态管理
  */
-export declare const useGlobalData: () => [GlobalDataInstanceState, GlobalDataInstance, string | undefined];
+export declare const useGlobalMessageData: () => [GlobalMessageDataInstanceState, GlobalMessageDataInstance, string | undefined];

package/lib/context/{global.data.instance.js → global.message.data.instance.js}

@@ -33,9 +33,9 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    useGlobalData: ()=>useGlobalData,
-    GlobalDataInstance: ()=>GlobalDataInstance,
-    globalDataInstance: ()=>globalDataInstance
+    globalMessageDataInstance: ()=>globalMessageDataInstance,
+    GlobalMessageDataInstance: ()=>GlobalMessageDataInstance,
+    useGlobalMessageData: ()=>useGlobalMessageData
 });
 const external_valtio_namespaceObject = require("valtio");
 const navigate_js_namespaceObject = require("../utils/navigate.js");
@@ -43,7 +43,7 @@ var navigate_js_default = /*#__PURE__*/ __webpack_require__.n(navigate_js_namesp
 const useId_js_namespaceObject = require("../utils/useId.js");
 const instance_js_namespaceObject = require("../utils/valtio/instance.js");
 const external_global_setting_data_instance_js_namespaceObject = require("./global.setting.data.instance.js");
-class GlobalDataInstance extends instance_js_namespaceObject.ProxyInstanceObjectBase {
+class GlobalMessageDataInstance extends instance_js_namespaceObject.ProxyInstanceObjectBase {
     store = (0, external_valtio_namespaceObject.proxy)({
         messageData: (0, external_valtio_namespaceObject.ref)([]),
         toastData: void 0
@@ -100,22 +100,22 @@ class GlobalDataInstance extends instance_js_namespaceObject.ProxyInstanceObject
         });
     };
 }
-const globalDataInstance = new GlobalDataInstance();
-const useGlobalData = ()=>{
-    const store = (0, external_valtio_namespaceObject.useSnapshot)(globalDataInstance.store);
+const globalMessageDataInstance = new GlobalMessageDataInstance();
+const useGlobalMessageData = ()=>{
+    const store = (0, external_valtio_namespaceObject.useSnapshot)(globalMessageDataInstance.store);
     return [
         store,
-        globalDataInstance,
+        globalMessageDataInstance,
         store.__defaultValue
     ];
 };
-exports.GlobalDataInstance = __webpack_exports__.GlobalDataInstance;
-exports.globalDataInstance = __webpack_exports__.globalDataInstance;
-exports.useGlobalData = __webpack_exports__.useGlobalData;
+exports.GlobalMessageDataInstance = __webpack_exports__.GlobalMessageDataInstance;
+exports.globalMessageDataInstance = __webpack_exports__.globalMessageDataInstance;
+exports.useGlobalMessageData = __webpack_exports__.useGlobalMessageData;
 for(var __webpack_i__ in __webpack_exports__)if (-1 === [
-    "GlobalDataInstance",
-    "globalDataInstance",
-    "useGlobalData"
+    "GlobalMessageDataInstance",
+    "globalMessageDataInstance",
+    "useGlobalMessageData"
 ].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
 Object.defineProperty(exports, '__esModule', {
     value: true

package/lib/context/index.d.ts

@@ -1,4 +1,4 @@
-export * from './global.data.instance';
+export * from './global.message.data.instance';
 export * from './page.data.instance';
 export * from './page.info.data.instance';
 export * from './auth.data.instance';

package/lib/context/index.js

@@ -3,10 +3,10 @@ var __webpack_modules__ = {
     "./auth.data.instance": function(module) {
         module.exports = require("./auth.data.instance.js");
     },
-    "./global.data.instance": function(module) {
-        module.exports = require("./global.data.instance.js");
+    "./global.message.data.instance": function(module) {
+        module.exports = require("./global.message.data.instance.js");
     },
-    "context/global.setting.data.instance": function(module) {
+    "./global.setting.data.instance": function(module) {
         module.exports = require("./global.setting.data.instance.js");
     },
     "./page.data.instance": function(module) {
@@ -59,10 +59,10 @@ function __webpack_require__(moduleId) {
 var __webpack_exports__ = {};
 (()=>{
     __webpack_require__.r(__webpack_exports__);
-    var _global_data_instance__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("./global.data.instance");
+    var _global_message_data_instance__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("./global.message.data.instance");
     var __WEBPACK_REEXPORT_OBJECT__ = {};
-    for(var __WEBPACK_IMPORT_KEY__ in _global_data_instance__WEBPACK_IMPORTED_MODULE_0__)if ("default" !== __WEBPACK_IMPORT_KEY__) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = (function(key) {
-        return _global_data_instance__WEBPACK_IMPORTED_MODULE_0__[key];
+    for(var __WEBPACK_IMPORT_KEY__ in _global_message_data_instance__WEBPACK_IMPORTED_MODULE_0__)if ("default" !== __WEBPACK_IMPORT_KEY__) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = (function(key) {
+        return _global_message_data_instance__WEBPACK_IMPORTED_MODULE_0__[key];
     }).bind(0, __WEBPACK_IMPORT_KEY__);
     __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
     var _page_data_instance__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("./page.data.instance");
@@ -83,7 +83,7 @@ var __webpack_exports__ = {};
         return _auth_data_instance__WEBPACK_IMPORTED_MODULE_3__[key];
     }).bind(0, __WEBPACK_IMPORT_KEY__);
     __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
-    var _global_setting_data_instance__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("context/global.setting.data.instance");
+    var _global_setting_data_instance__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("./global.setting.data.instance");
     var __WEBPACK_REEXPORT_OBJECT__ = {};
     for(var __WEBPACK_IMPORT_KEY__ in _global_setting_data_instance__WEBPACK_IMPORTED_MODULE_4__)if ("default" !== __WEBPACK_IMPORT_KEY__) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = (function(key) {
         return _global_setting_data_instance__WEBPACK_IMPORTED_MODULE_4__[key];

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

@@ -46,7 +46,7 @@ const instance_js_namespaceObject = require("../utils/valtio/instance.js");
 const external_react_namespaceObject = require("react");
 const navigate_js_namespaceObject = require("../utils/navigate.js");
 var navigate_js_default = /*#__PURE__*/ __webpack_require__.n(navigate_js_namespaceObject);
-const external_global_data_instance_js_namespaceObject = require("./global.data.instance.js");
+const external_global_message_data_instance_js_namespaceObject = require("./global.message.data.instance.js");
 const external_global_setting_data_instance_js_namespaceObject = require("./global.setting.data.instance.js");
 const taro_namespaceObject = require("@tarojs/taro");
 var taro_default = /*#__PURE__*/ __webpack_require__.n(taro_namespaceObject);
@@ -136,7 +136,7 @@ class page_info_data_instance_PageInfoDataInstance extends instance_js_namespace
             taro_default().hideLoading();
             this.updatedLoading(false);
             if (result && result.code === external_global_setting_data_instance_js_namespaceObject.globalSettingDataInstance.store.requestSuccessCode) {
-                if (this.requestSaveInfoConfig?.isShowSuccessMessage === false) external_global_data_instance_js_namespaceObject.globalDataInstance.showMessage({
+                if (this.requestSaveInfoConfig?.isShowSuccessMessage === false) external_global_message_data_instance_js_namespaceObject.globalMessageDataInstance.showMessage({
                     content: result.message || "\u4FDD\u5B58\u6210\u529F"
                 });
                 else taro_default().showToast({

package/lib/styles/index.css

@@ -189,11 +189,6 @@
   color: red;
 }
 
-.fairystaro__text-red-100 {
-  --un-text-opacity: 1;
-  color: rgb(254 226 226 / var(--un-text-opacity));
-}
-
 .fairystaro__font-bold {
   font-weight: 700;
 }

package/lib/utils/request.js

@@ -40,7 +40,7 @@ __webpack_require__.d(__webpack_exports__, {
 const taro_namespaceObject = require("@tarojs/taro");
 var taro_default = /*#__PURE__*/ __webpack_require__.n(taro_namespaceObject);
 const global_setting_data_instance_js_namespaceObject = require("../context/global.setting.data.instance.js");
-const global_data_instance_js_namespaceObject = require("../context/global.data.instance.js");
+const global_message_data_instance_js_namespaceObject = require("../context/global.message.data.instance.js");
 const codeMessage = {
     400: "\u53D1\u51FA\u7684\u8BF7\u6C42\u9519\u8BEF",
     401: "\u7528\u6237\u6CA1\u6709\u6743\u9650",
@@ -61,7 +61,7 @@ const requestResponseHandle = (result, options)=>{
         const code = result?.data?.code;
         if (401 === statusCode || 401 === code || code === global_setting_data_instance_js_namespaceObject.globalSettingDataInstance.store.tokenExpiredCode) {
             msg = "\u8BF7\u91CD\u65B0\u767B\u5F55";
-            global_data_instance_js_namespaceObject.globalDataInstance.toLoginPage();
+            global_message_data_instance_js_namespaceObject.globalMessageDataInstance.toLoginPage();
         } else msg = [
             global_setting_data_instance_js_namespaceObject.globalSettingDataInstance.store.requestSuccessCode,
             200
@@ -75,7 +75,7 @@ const requestResponseHandle = (result, options)=>{
         duration: 3000,
         icon: 'none'
     });
-    else global_data_instance_js_namespaceObject.globalDataInstance.showMessage({
+    else global_message_data_instance_js_namespaceObject.globalMessageDataInstance.showMessage({
         content: msg || "\u8BF7\u6C42\u53D1\u751F\u9519\u8BEF",
         type: 'error'
     });
@@ -163,14 +163,14 @@ class RequestInstance {
                 duration: 3000,
                 icon: 'none'
             });
-            else global_data_instance_js_namespaceObject.globalDataInstance.showMessage({
+            else global_message_data_instance_js_namespaceObject.globalMessageDataInstance.showMessage({
                 content: "\u672A\u767B\u5F55",
                 type: 'error'
             });
             options?.fail?.({
                 errMsg: "\u672A\u767B\u5F55"
             });
-            global_data_instance_js_namespaceObject.globalDataInstance.toLoginPage();
+            global_message_data_instance_js_namespaceObject.globalMessageDataInstance.toLoginPage();
             return;
         }
         return {
@@ -201,7 +201,7 @@ class RequestInstance {
                     duration: 3000,
                     icon: 'none'
                 });
-                else global_data_instance_js_namespaceObject.globalDataInstance.showMessage({
+                else global_message_data_instance_js_namespaceObject.globalMessageDataInstance.showMessage({
                     content: result.errMsg || "\u8BF7\u6C42\u53D1\u751F\u9519\u8BEF",
                     type: 'error'
                 });
@@ -295,7 +295,7 @@ class RequestInstance {
                     duration: 3000,
                     icon: 'none'
                 });
-                else global_data_instance_js_namespaceObject.globalDataInstance.showMessage({
+                else global_message_data_instance_js_namespaceObject.globalMessageDataInstance.showMessage({
                     content: result.errMsg || "\u8BF7\u6C42\u53D1\u751F\u9519\u8BEF",
                     type: 'error'
                 });
@@ -346,7 +346,7 @@ class RequestInstance {
                     duration: 3000,
                     icon: 'none'
                 });
-                else global_data_instance_js_namespaceObject.globalDataInstance.showMessage({
+                else global_message_data_instance_js_namespaceObject.globalMessageDataInstance.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.14",
+  "version": "1.0.16",
   "main": "esm/index.js",
   "types": "esm/index.d.ts",
   "module": "esm/index.js",

package/src/components/MainPage/index.tsx

@@ -10,7 +10,7 @@ export const FairysTaroMainPage = (props: FairysTaroMainPageProps) => {
   const cls = useMemo(
     () =>
       clsx(
-        'fairys_taro-ui-main-page fairystaro__text-red-100 fairystaro__box-border fairystaro__w-full fairystaro__h-full fairystaro__flex fairystaro__flex-col fairystaro__overflow-auto',
+        'fairys_taro-ui-main-page fairystaro__box-border fairystaro__w-full fairystaro__h-full fairystaro__flex fairystaro__flex-col fairystaro__overflow-auto',
         itemClassName,
       ),
     [itemClassName],

package/src/components/Mesage/index.tsx

@@ -1,9 +1,9 @@
 import { View, ViewProps } from '@tarojs/components';
 import { Fragment, useMemo } from 'react';
-import { useGlobalData } from 'context/global.data.instance';
+import { useGlobalMessageData } from 'context/global.message.data.instance';
 import { FairysTaroPortal } from 'components/Portal';
 import clsx from 'clsx';
-import type { MessageDataType } from 'context/global.data.instance';
+import type { MessageDataType } from 'context/global.message.data.instance';
 
 export interface FairysTaroMessageItemProps extends Omit<ViewProps, 'style'> {
   /**
@@ -190,7 +190,7 @@ export const FairysTaroMessage = (props: FairysTaroMessageProps) => {
 export const FairysTaroPortalMessage = (props: FairysTaroMessageProps) => {
   const { className: messageClassName, ...rest } = props;
 
-  const [state] = useGlobalData();
+  const [state] = useGlobalMessageData();
   const messageData = state.messageData;
   const classNames = useMemo(
     () =>

package/src/components/Toast/index.tsx

@@ -1,9 +1,9 @@
 import { Toast } from '@nutui/nutui-react-taro';
 import { FairysTaroPortal } from 'components/Portal';
-import { useGlobalData } from 'context/global.data.instance';
+import { useGlobalMessageData } from 'context/global.message.data.instance';
 
 export const FairysTaroToast = () => {
-  const [state, proxyInstance] = useGlobalData();
+  const [state, proxyInstance] = useGlobalMessageData();
   const toastConfig = state.toastData as any;
 
   return (

package/src/components/connectToastMessage/index.tsx

@@ -1,6 +1,6 @@
 import { FairysTaroPortalMessage } from 'components/Mesage';
 import { FairysTaroToast } from 'components/Toast';
-import React, { Fragment } from 'react';
+import React, { Fragment, memo } from 'react';
 
 export interface ConnectToastMessageOptions {
   /**
@@ -11,9 +11,20 @@ export interface ConnectToastMessageOptions {
   isRoot?: boolean;
 }
 
+/**
+ * 高阶组件，用于为 React 组件连接 Toast 和 Message 功能
+ *
+ * 根据不同的运行环境（H5/微信小程序）和组件层级（根页面/子页面），
+ * 决定是否渲染 Toast 和 Message 组件，以避免功能冲突和界面遮挡
+ *
+ * @param Component - 需要被包装的 React 组件
+ * @param options - 配置选项
+ * @param options.isRoot - 是否为根页面组件，默认为 false
+ * @returns 返回一个经过优化的 React 组件，根据环境条件选择性渲染 Toast 和 Message
+ */
 export const connectToastMessage = (Component: React.FC, options: ConnectToastMessageOptions = {}) => {
   const { isRoot = false } = options;
-  return (props: any) => {
+  return memo((props: any) => {
     // 在 h5 中，只有根页面才需要展示 message 组件 和 toast 组件，其他页面只是渲染组件就好
 
     // 微信中，根目录不显示 message 组件 和 toast 组件，因为会遮挡页面内容
@@ -37,5 +48,5 @@ export const connectToastMessage = (Component: React.FC, options: ConnectToastMe
         {isRoot ? <FairysTaroPortalMessage /> : <Fragment />}
       </Fragment>
     );
-  };
+  });
 };

package/src/context/{global.data.instance.ts → global.message.data.instance.ts}

@@ -6,7 +6,6 @@ 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 {
   /**用于唯一标识提示框(默认自动生成)*/
@@ -24,7 +23,7 @@ export interface MessageDataType extends FairysTaroMessageItemProps {
 
 export interface ToastDataType extends Partial<TaroToastProps> {}
 
-export interface GlobalDataInstanceState {
+export interface GlobalMessageDataInstanceState {
   /**弹框提示框*/
   messageData?: MessageDataType[];
   /**提示框数据*/
@@ -32,9 +31,11 @@ export interface GlobalDataInstanceState {
   /**数据默认值不使用*/
   __defaultValue?: string;
 }
-
-export class GlobalDataInstance extends ProxyInstanceObjectBase<GlobalDataInstanceState> {
-  store = proxy<GlobalDataInstanceState>({
+/**
+ * 全局消息数据实例
+ */
+export class GlobalMessageDataInstance extends ProxyInstanceObjectBase<GlobalMessageDataInstanceState> {
+  store = proxy<GlobalMessageDataInstanceState>({
     messageData: ref([]),
     toastData: undefined,
   });
@@ -101,18 +102,18 @@ export class GlobalDataInstance extends ProxyInstanceObjectBase<GlobalDataInstan
   };
 }
 /**
- * 全局数据实例
+ * 全局消息数据实例
  */
-export const globalDataInstance = new GlobalDataInstance();
+export const globalMessageDataInstance = new GlobalMessageDataInstance();
 
 /**
- * 全局数据状态管理
+ * 全局消息数据状态管理
  */
-export const useGlobalData = () => {
-  const store = useSnapshot(globalDataInstance.store);
-  return [store, globalDataInstance, store.__defaultValue] as [
-    GlobalDataInstanceState,
-    GlobalDataInstance,
+export const useGlobalMessageData = () => {
+  const store = useSnapshot(globalMessageDataInstance.store);
+  return [store, globalMessageDataInstance, store.__defaultValue] as [
+    GlobalMessageDataInstanceState,
+    GlobalMessageDataInstance,
     string | undefined,
   ];
 };

package/src/context/index.ts

@@ -1,4 +1,4 @@
-export * from './global.data.instance';
+export * from './global.message.data.instance';
 export * from './page.data.instance';
 export * from './page.info.data.instance';
 export * from './auth.data.instance';

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

@@ -2,7 +2,7 @@ import { proxy, ref, useSnapshot } from 'valtio';
 import { ProxyInstanceObjectBase } from 'utils/valtio/instance';
 import { createContext, useContext, useEffect, useMemo, useRef } from 'react';
 import navigate from '../utils/navigate';
-import { globalDataInstance } from './global.data.instance';
+import { globalMessageDataInstance } from './global.message.data.instance';
 import { globalSettingDataInstance } from './global.setting.data.instance';
 import { useDidShow } from '@tarojs/taro';
 import Taro from '@tarojs/taro';
@@ -146,7 +146,7 @@ export class PageInfoDataInstance<
       this.updatedLoading(false);
       if (result && result.code === globalSettingDataInstance.store.requestSuccessCode) {
         if (this.requestSaveInfoConfig?.isShowSuccessMessage === false) {
-          globalDataInstance.showMessage({ content: result.message || '保存成功' });
+          globalMessageDataInstance.showMessage({ content: result.message || '保存成功' });
         } else {
           Taro.showToast({ title: result.message || '保存成功', icon: 'none' });
         }

package/src/utils/request.ts

@@ -1,6 +1,6 @@
 import Taro from '@tarojs/taro';
 import { globalSettingDataInstance } from 'context/global.setting.data.instance';
-import { globalDataInstance } from 'context/global.data.instance';
+import { globalMessageDataInstance } from 'context/global.message.data.instance';
 
 const codeMessage = {
   400: '发出的请求错误',
@@ -53,7 +53,7 @@ const requestResponseHandle = (
       // 权限问题 ，重新登录
       msg = '请重新登录';
       /**重新跳转登录页面*/
-      globalDataInstance.toLoginPage();
+      globalMessageDataInstance.toLoginPage();
     } else if (![globalSettingDataInstance.store.requestSuccessCode, 200].includes(code)) {
       // 提示内容
       // @ts-ignore
@@ -73,7 +73,7 @@ const requestResponseHandle = (
         icon: 'none',
       });
     } else {
-      globalDataInstance.showMessage({
+      globalMessageDataInstance.showMessage({
         content: msg || '请求发生错误',
         type: 'error',
       });
@@ -231,14 +231,14 @@ export class RequestInstance {
               icon: 'none',
             });
           } else {
-            globalDataInstance.showMessage({
+            globalMessageDataInstance.showMessage({
               content: '未登录',
               type: 'error',
             });
           }
         }
         options?.fail?.({ errMsg: '未登录' });
-        globalDataInstance.toLoginPage();
+        globalMessageDataInstance.toLoginPage();
         return undefined;
       }
     }
@@ -281,7 +281,7 @@ export class RequestInstance {
               icon: 'none',
             });
           } else {
-            globalDataInstance.showMessage({
+            globalMessageDataInstance.showMessage({
               content: result.errMsg || '请求发生错误',
               type: 'error',
             });
@@ -397,7 +397,7 @@ export class RequestInstance {
               icon: 'none',
             });
           } else {
-            globalDataInstance.showMessage({
+            globalMessageDataInstance.showMessage({
               content: result.errMsg || '请求发生错误',
               type: 'error',
             });
@@ -462,7 +462,7 @@ export class RequestInstance {
               icon: 'none',
             });
           } else {
-            globalDataInstance.showMessage({
+            globalMessageDataInstance.showMessage({
               content: result.errMsg || '请求发生错误',
               type: 'error',
             });