@fairys/taro-tools-react 1.0.15 → 1.0.17

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,8 +3,8 @@ 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");
     },
     "./global.setting.data.instance": function(module) {
         module.exports = require("./global.setting.data.instance.js");
@@ -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");

package/lib/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/lib/context/page.data.instance.js

@@ -73,6 +73,10 @@ class page_data_instance_PageDataInstance extends instance_js_namespaceObject.Pr
         loading: {
             pageLoading: false
         },
+        tabRefresherStatus: {},
+        refresherStatus: false,
+        loadMoreStatus: false,
+        tabLoadMoreStatus: {},
         hasLastPage: false
     };
     store = (0, external_valtio_namespaceObject.proxy)({
@@ -169,6 +173,16 @@ class page_data_instance_PageDataInstance extends instance_js_namespaceObject.Pr
                 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
             });
@@ -210,6 +224,16 @@ class page_data_instance_PageDataInstance extends instance_js_namespaceObject.Pr
             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_default().hideLoading();
     };
     main_onPageChange = (page)=>{

package/lib/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/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);
@@ -58,6 +58,7 @@ class page_info_data_instance_PageInfoDataInstance extends instance_js_namespace
         editType: 'add',
         editFormData: (0, external_valtio_namespaceObject.ref)({}),
         isInfoSuccess: false,
+        refresherStatus: false,
         loading: {
             pageLoading: false
         }
@@ -100,6 +101,7 @@ class page_info_data_instance_PageInfoDataInstance extends instance_js_namespace
         taro_default().showLoading({
             title: "\u52A0\u8F7D\u4E2D..."
         });
+        this.store.refresherStatus = true;
         try {
             this.updatedLoading(true);
             let newParams = {};
@@ -122,6 +124,7 @@ class page_info_data_instance_PageInfoDataInstance extends instance_js_namespace
             console.log(error);
             this.updatedLoading(false);
         }
+        this.store.refresherStatus = false;
         taro_default().hideLoading();
     };
     main_saveInfo = async ()=>{
@@ -136,7 +139,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

@@ -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/lib/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/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.15",
+  "version": "1.0.17",
   "main": "esm/index.js",
   "types": "esm/index.d.ts",
   "module": "esm/index.js",

package/src/components/MainPage/index.tsx

@@ -1,9 +1,12 @@
-import { ViewProps, View } from '@tarojs/components';
+import { ViewProps, View, ScrollView, ScrollViewProps } from '@tarojs/components';
 import clsx from 'clsx';
-import { useMemo } from 'react';
+import { Fragment, useMemo } from 'react';
 
 export interface FairysTaroMainPageProps extends ViewProps {}
 
+/**
+ * 主页面（如果外部使用scroll-view组件，需要设置高度，否则内容会出现滚动）
+ */
 export const FairysTaroMainPage = (props: FairysTaroMainPageProps) => {
   const { className: itemClassName, children, ...rest } = props;
 
@@ -70,3 +73,60 @@ export const FairysTaroMainPageFooter = (props: FairysTaroMainPageProps) => {
     </View>
   );
 };
+
+export interface FairysTaroMainPageScrollViewProps extends ScrollViewProps {
+  /**下拉刷新状态*/
+  refresherStatus?: boolean;
+  /**是否还有更多数据*/
+  hasMore?: boolean;
+  /**加载更多文本*/
+  loadMoreText?: React.ReactNode;
+}
+
+/**
+ * 主页面滚动视图
+ */
+export const FairysTaroMainPageScrollView = (props: FairysTaroMainPageScrollViewProps) => {
+  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 (
+    <ScrollView
+      scrollY
+      refresherEnabled
+      enhanced
+      usingSticky
+      refresherTriggered={refresherStatus}
+      className={cls}
+      {...rest}
+      onScrollToLower={(...args) => {
+        if (hasMore) {
+          onScrollToLower?.(...args);
+        }
+      }}
+    >
+      {children}
+      {loadMoreText ? (
+        <View className="fairys_taro-ui-main-page-scroll-view-load-more">{loadMoreText}</View>
+      ) : (
+        <Fragment />
+      )}
+    </ScrollView>
+  );
+};

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.data.instance.tsx

@@ -7,6 +7,10 @@ import Taro, { useDidShow } from '@tarojs/taro';
 export interface PageDataInstanceState extends Record<string, any> {
   /**loading存储*/
   loading?: Record<string, boolean>;
+  /**下拉刷新状态*/
+  refresherStatus?: boolean;
+  /**上拉加载*/
+  loadMoreStatus?: boolean;
   /**当前页*/
   page?: number;
   /**分页数*/
@@ -42,6 +46,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;
   /**是否展开查询条件*/
@@ -95,6 +103,14 @@ export class PageDataInstance<
     selectedRowKeys: ref([]),
     /**加载状态*/
     loading: { pageLoading: false },
+    /**tab多页签下拉刷新状态*/
+    tabRefresherStatus: {},
+    /**下拉刷新状态*/
+    refresherStatus: false,
+    /**上拉加载*/
+    loadMoreStatus: false,
+    /**tab多页签上拉加载状态*/
+    tabLoadMoreStatus: {},
     /**是否最后一页*/
     hasLastPage: false,
   } as unknown as T;
@@ -151,7 +167,6 @@ export class PageDataInstance<
       this.store.search[key] = value[key];
     }
   };
-
   /**更新页面级的 pageLoading */
   updatedPageLoading = (loading: boolean = true) => {
     if (typeof this.store?.loading === 'object') {
@@ -160,7 +175,11 @@ export class PageDataInstance<
       this.store.loading = { pageLoading: loading };
     }
   };
-  /**更新页面级的 loadMore */
+  /**
+   * 更新加载状态对象
+   *
+   * @param value - 包含页面键和对应加载状态的键值对对象
+   */
   updatedLoading = (value: Record<string, boolean>) => {
     if (typeof this.store?.loading === 'object') {
       this.store.loading = { ...this.store.loading, ...value };
@@ -209,6 +228,27 @@ export class PageDataInstance<
         page: this.store[pageField] || 1,
         pageSize: this.store[pageSizeField] || this.store.defaultPageSize || 20,
       };
+      if (payload.page === 1) {
+        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 }) as any;
       if (this.onBefore) {
         newParams = this.onBefore(payload, this.store, this);
@@ -252,6 +292,20 @@ export class PageDataInstance<
       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();
   };
   /**内置——翻页*/