@fairys/taro-tools-react 1.0.16 → 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/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

@@ -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 ()=>{

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/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/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

@@ -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 ()=>{

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/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.16",
+  "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/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();
   };
   /**内置——翻页*/

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

@@ -16,6 +16,8 @@ export interface PageInfoDataInstanceState extends Record<string, any> {
   editType?: 'add' | 'edit' | 'info';
   /**查询详情是否成功*/
   isInfoSuccess?: boolean;
+  /**下拉刷新状态*/
+  refresherStatus?: boolean;
   /**数据默认值不使用*/
   __defaultValue?: string;
 }
@@ -32,6 +34,8 @@ export class PageInfoDataInstance<
     editFormData: ref({}),
     /**查询详情是否成功*/
     isInfoSuccess: false,
+    /**下拉刷新状态*/
+    refresherStatus: false,
     /**加载状态*/
     loading: { pageLoading: false },
   } as unknown as T;
@@ -104,6 +108,7 @@ export class PageInfoDataInstance<
       return;
     }
     Taro.showLoading({ title: '加载中...' });
+    this.store.refresherStatus = true;
     try {
       this.updatedLoading(true);
       let newParams = {} as any;
@@ -127,6 +132,7 @@ export class PageInfoDataInstance<
       console.log(error);
       this.updatedLoading(false);
     }
+    this.store.refresherStatus = false;
     Taro.hideLoading();
   };
 

package/src/utils/request.ts

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