@fairys/taro-tools-react 1.0.15 → 1.0.17

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';
@@ -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();
   };
 
@@ -146,7 +152,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',
       });
@@ -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;
@@ -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',
             });