@fairys/taro-tools-react 1.0.15 → 1.0.17

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

@@ -1,6 +1,9 @@
-import { ViewProps } from '@tarojs/components';
+import { ViewProps, ScrollViewProps } from '@tarojs/components';
 export interface FairysTaroMainPageProps extends ViewProps {
 }
+/**
+ * 主页面（如果外部使用scroll-view组件，需要设置高度，否则内容会出现滚动）
+ */
 export declare const FairysTaroMainPage: (props: FairysTaroMainPageProps) => import("react/jsx-runtime").JSX.Element;
 /**查询*/
 export declare const FairysTaroMainPageSearch: (props: FairysTaroMainPageProps) => import("react/jsx-runtime").JSX.Element;
@@ -8,3 +11,15 @@ export declare const FairysTaroMainPageSearch: (props: FairysTaroMainPageProps)
 export declare const FairysTaroMainPageBody: (props: FairysTaroMainPageProps) => import("react/jsx-runtime").JSX.Element;
 /**底部*/
 export declare const FairysTaroMainPageFooter: (props: FairysTaroMainPageProps) => import("react/jsx-runtime").JSX.Element;
+export interface FairysTaroMainPageScrollViewProps extends ScrollViewProps {
+    /**下拉刷新状态*/
+    refresherStatus?: boolean;
+    /**是否还有更多数据*/
+    hasMore?: boolean;
+    /**加载更多文本*/
+    loadMoreText?: React.ReactNode;
+}
+/**
+ * 主页面滚动视图
+ */
+export declare const FairysTaroMainPageScrollView: (props: FairysTaroMainPageScrollViewProps) => import("react/jsx-runtime").JSX.Element;

package/esm/components/MainPage/index.js

@@ -1,7 +1,7 @@
-import { jsx } from "react/jsx-runtime";
-import { View } from "@tarojs/components";
+import { jsx, jsxs } from "react/jsx-runtime";
+import { ScrollView, View } from "@tarojs/components";
 import clsx from "clsx";
-import { useMemo } from "react";
+import { Fragment, useMemo } from "react";
 const FairysTaroMainPage = (props)=>{
     const { className: itemClassName, children, ...rest } = props;
     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), [
@@ -46,4 +46,29 @@ const FairysTaroMainPageFooter = (props)=>{
         children: children
     });
 };
-export { FairysTaroMainPage, FairysTaroMainPageBody, FairysTaroMainPageFooter, FairysTaroMainPageSearch };
+const FairysTaroMainPageScrollView = (props)=>{
+    const { className: itemClassName, children, refresherStatus, hasMore = true, loadMoreText, onScrollToLower, ...rest } = props;
+    const cls = useMemo(()=>clsx('fairys_taro-ui-main-page-scroll-view fairystaro__box-border fairystaro__w-screen fairystaro__h-screen', itemClassName), [
+        itemClassName
+    ]);
+    return /*#__PURE__*/ jsxs(ScrollView, {
+        scrollY: true,
+        refresherEnabled: true,
+        enhanced: true,
+        usingSticky: true,
+        refresherTriggered: refresherStatus,
+        className: cls,
+        ...rest,
+        onScrollToLower: (...args)=>{
+            if (hasMore) onScrollToLower?.(...args);
+        },
+        children: [
+            children,
+            loadMoreText ? /*#__PURE__*/ jsx(View, {
+                className: "fairys_taro-ui-main-page-scroll-view-load-more",
+                children: loadMoreText
+            }) : /*#__PURE__*/ jsx(Fragment, {})
+        ]
+    });
+};
+export { FairysTaroMainPage, FairysTaroMainPageBody, FairysTaroMainPageFooter, FairysTaroMainPageScrollView, FairysTaroMainPageSearch };

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

@@ -2,6 +2,10 @@ import { ProxyInstanceObjectBase } from '../utils/valtio/instance';
 export interface PageDataInstanceState extends Record<string, any> {
     /**loading存储*/
     loading?: Record<string, boolean>;
+    /**下拉刷新状态*/
+    refresherStatus?: boolean;
+    /**上拉加载*/
+    loadMoreStatus?: boolean;
     /**当前页*/
     page?: number;
     /**分页数*/
@@ -37,6 +41,10 @@ export interface PageDataInstanceState extends Record<string, any> {
         query?: Record<string, any>;
         [s: string]: any;
     }[];
+    /**tab多页签下拉刷新状态*/
+    tabRefresherStatus?: Record<string, boolean>;
+    /**tab多页签上拉加载状态*/
+    tabLoadMoreStatus?: Record<string, boolean>;
     /**是否是tab多页签*/
     isTabs?: boolean;
     /**是否展开查询条件*/
@@ -84,7 +92,11 @@ export declare class PageDataInstance<T extends PageDataInstanceState = PageData
     updatedSearch: (value?: Record<string, any>) => void;
     /**更新页面级的 pageLoading */
     updatedPageLoading: (loading?: boolean) => void;
-    /**更新页面级的 loadMore */
+    /**
+     * 更新加载状态对象
+     *
+     * @param value - 包含页面键和对应加载状态的键值对对象
+     */
     updatedLoading: (value: Record<string, boolean>) => void;
     /**内置——查询列表*/
     main_getList: () => Promise<void>;

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

@@ -30,6 +30,10 @@ class page_data_instance_PageDataInstance extends ProxyInstanceObjectBase {
         loading: {
             pageLoading: false
         },
+        tabRefresherStatus: {},
+        refresherStatus: false,
+        loadMoreStatus: false,
+        tabLoadMoreStatus: {},
         hasLastPage: false
     };
     store = proxy({
@@ -126,6 +130,16 @@ class page_data_instance_PageDataInstance extends ProxyInstanceObjectBase {
                 page: this.store[pageField] || 1,
                 pageSize: this.store[pageSizeField] || this.store.defaultPageSize || 20
             };
+            if (1 === payload.page) if (this.store.isTabs) {
+                const tabKey = this.store.tabKey;
+                if (!this.store.tabRefresherStatus) this.store.tabRefresherStatus = {};
+                this.store.tabRefresherStatus[tabKey] = true;
+            } else this.store.refresherStatus = true;
+            else if (this.store.isTabs) {
+                const tabKey = this.store.tabKey;
+                if (!this.store.tabLoadMoreStatus) this.store.tabLoadMoreStatus = {};
+                this.store.tabLoadMoreStatus[tabKey] = true;
+            } else this.store.loadMoreStatus = true;
             let newParams = this.formateParams({
                 ...payload
             });
@@ -167,6 +181,16 @@ class page_data_instance_PageDataInstance extends ProxyInstanceObjectBase {
             this.store.loading.loadMore = false;
             this.updatedPageLoading(false);
         }
+        if (this.store.isTabs) {
+            const tabKey = this.store.tabKey;
+            if (!this.store.tabRefresherStatus) this.store.tabRefresherStatus = {};
+            if (!this.store.tabLoadMoreStatus) this.store.tabLoadMoreStatus = {};
+            this.store.tabLoadMoreStatus[tabKey] = false;
+            this.store.tabRefresherStatus[tabKey] = false;
+        } else {
+            this.store.refresherStatus = false;
+            this.store.loadMoreStatus = false;
+        }
         taro.hideLoading();
     };
     main_onPageChange = (page)=>{

package/esm/context/page.info.data.instance.d.ts

@@ -8,6 +8,8 @@ export interface PageInfoDataInstanceState extends Record<string, any> {
     editType?: 'add' | 'edit' | 'info';
     /**查询详情是否成功*/
     isInfoSuccess?: boolean;
+    /**下拉刷新状态*/
+    refresherStatus?: boolean;
     /**数据默认值不使用*/
     __defaultValue?: string;
 }

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 {
@@ -14,6 +14,7 @@ class page_info_data_instance_PageInfoDataInstance extends ProxyInstanceObjectBa
         editType: 'add',
         editFormData: external_valtio_ref({}),
         isInfoSuccess: false,
+        refresherStatus: false,
         loading: {
             pageLoading: false
         }
@@ -56,6 +57,7 @@ class page_info_data_instance_PageInfoDataInstance extends ProxyInstanceObjectBa
         taro.showLoading({
             title: "\u52A0\u8F7D\u4E2D..."
         });
+        this.store.refresherStatus = true;
         try {
             this.updatedLoading(true);
             let newParams = {};
@@ -78,6 +80,7 @@ class page_info_data_instance_PageInfoDataInstance extends ProxyInstanceObjectBa
             console.log(error);
             this.updatedLoading(false);
         }
+        this.store.refresherStatus = false;
         taro.hideLoading();
     };
     main_saveInfo = async ()=>{
@@ -92,7 +95,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

@@ -83,6 +83,10 @@
   height: 100%;
 }
 
+.fairystaro__h-screen {
+  height: 100vh;
+}
+
 .fairystaro__max-h-full {
   max-height: 100%;
 }
@@ -95,6 +99,10 @@
   width: 100%;
 }
 
+.fairystaro__w-screen {
+  width: 100vw;
+}
+
 .fairystaro__flex {
   display: flex;
 }

package/esm/utils/request.d.ts

@@ -41,11 +41,11 @@ export interface RequestInstanceCreateOptions {
         };
         dev: Record<string, string | {
             target: string;
-            pathRewrite: Record<string, string>;
+            pathRewrite?: Record<string, string>;
         }>;
         pro: Record<string, string | {
             target: string;
-            pathRewrite: Record<string, string>;
+            pathRewrite?: Record<string, string>;
         }>;
     };
     /**启用token校验*/

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

@@ -1,6 +1,9 @@
-import { ViewProps } from '@tarojs/components';
+import { ViewProps, ScrollViewProps } from '@tarojs/components';
 export interface FairysTaroMainPageProps extends ViewProps {
 }
+/**
+ * 主页面（如果外部使用scroll-view组件，需要设置高度，否则内容会出现滚动）
+ */
 export declare const FairysTaroMainPage: (props: FairysTaroMainPageProps) => import("react/jsx-runtime").JSX.Element;
 /**查询*/
 export declare const FairysTaroMainPageSearch: (props: FairysTaroMainPageProps) => import("react/jsx-runtime").JSX.Element;
@@ -8,3 +11,15 @@ export declare const FairysTaroMainPageSearch: (props: FairysTaroMainPageProps)
 export declare const FairysTaroMainPageBody: (props: FairysTaroMainPageProps) => import("react/jsx-runtime").JSX.Element;
 /**底部*/
 export declare const FairysTaroMainPageFooter: (props: FairysTaroMainPageProps) => import("react/jsx-runtime").JSX.Element;
+export interface FairysTaroMainPageScrollViewProps extends ScrollViewProps {
+    /**下拉刷新状态*/
+    refresherStatus?: boolean;
+    /**是否还有更多数据*/
+    hasMore?: boolean;
+    /**加载更多文本*/
+    loadMoreText?: React.ReactNode;
+}
+/**
+ * 主页面滚动视图
+ */
+export declare const FairysTaroMainPageScrollView: (props: FairysTaroMainPageScrollViewProps) => import("react/jsx-runtime").JSX.Element;

package/lib/components/MainPage/index.js

@@ -34,6 +34,7 @@ var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     FairysTaroMainPageFooter: ()=>FairysTaroMainPageFooter,
+    FairysTaroMainPageScrollView: ()=>FairysTaroMainPageScrollView,
     FairysTaroMainPage: ()=>FairysTaroMainPage,
     FairysTaroMainPageSearch: ()=>FairysTaroMainPageSearch,
     FairysTaroMainPageBody: ()=>FairysTaroMainPageBody
@@ -87,14 +88,41 @@ const FairysTaroMainPageFooter = (props)=>{
         children: children
     });
 };
+const FairysTaroMainPageScrollView = (props)=>{
+    const { className: itemClassName, children, refresherStatus, hasMore = true, loadMoreText, onScrollToLower, ...rest } = props;
+    const cls = (0, external_react_namespaceObject.useMemo)(()=>external_clsx_default()('fairys_taro-ui-main-page-scroll-view fairystaro__box-border fairystaro__w-screen fairystaro__h-screen', itemClassName), [
+        itemClassName
+    ]);
+    return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsxs)(components_namespaceObject.ScrollView, {
+        scrollY: true,
+        refresherEnabled: true,
+        enhanced: true,
+        usingSticky: true,
+        refresherTriggered: refresherStatus,
+        className: cls,
+        ...rest,
+        onScrollToLower: (...args)=>{
+            if (hasMore) onScrollToLower?.(...args);
+        },
+        children: [
+            children,
+            loadMoreText ? /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(components_namespaceObject.View, {
+                className: "fairys_taro-ui-main-page-scroll-view-load-more",
+                children: loadMoreText
+            }) : /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_react_namespaceObject.Fragment, {})
+        ]
+    });
+};
 exports.FairysTaroMainPage = __webpack_exports__.FairysTaroMainPage;
 exports.FairysTaroMainPageBody = __webpack_exports__.FairysTaroMainPageBody;
 exports.FairysTaroMainPageFooter = __webpack_exports__.FairysTaroMainPageFooter;
+exports.FairysTaroMainPageScrollView = __webpack_exports__.FairysTaroMainPageScrollView;
 exports.FairysTaroMainPageSearch = __webpack_exports__.FairysTaroMainPageSearch;
 for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "FairysTaroMainPage",
     "FairysTaroMainPageBody",
     "FairysTaroMainPageFooter",
+    "FairysTaroMainPageScrollView",
     "FairysTaroMainPageSearch"
 ].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
 Object.defineProperty(exports, '__esModule', {

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];