@fairys/taro-tools-react 0.0.2 → 0.0.4

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

@@ -129,7 +129,7 @@ export class PageInfoDataInstance<
         return;
       }
       this.updatedLoading(true);
-      const newParams = await this.requestSaveInfoConfig?.onSaveBefore?.(this.store);
+      const newParams = (await this.requestSaveInfoConfig?.onSaveBefore?.(this.store)) || this.store.editFormData || {};
       const result = await this.requestSaveInfoConfig.onSaveInfo?.(newParams);
       this.updatedLoading(false);
       if (result && result.code === globalSettingDataInstance.store.requestSuccessCode) {
@@ -178,5 +178,5 @@ export const usePageInfoData = <T extends PageInfoDataInstanceState = PageInfoDa
 ) => {
   const pageDataInstance = useRef(new PageInfoDataInstance<T>(options)).current;
   const store = useSnapshot(pageDataInstance.store) as T;
-  return [store, pageDataInstance, store.__defaultValue] as const;
+  return [store, pageDataInstance, store.__defaultValue] as [T, PageInfoDataInstance<T>, string | undefined];
 };

package/src/utils/navigate.ts

@@ -1,17 +1,28 @@
 import Taro from '@tarojs/taro';
+import { globalSettingDataInstance } from 'context/global.setting.data.instance';
+import { authDataInstance } from 'context/auth.data.instance';
 
 class NavigateInstance {
-  /**判断是否已登录(方法需要在项目入口文件中进行挂载)*/
+  /**判断是否已登录(方法需要在项目入口文件中进行挂载,如果不挂载,默认使用 authDataInstance.hasMenuPermission 判断是否有菜单权限)*/
   public isAuth: (url: string) => Promise<boolean> | boolean;
-
   private _isAuth = async (url?: string) => {
     let isAuthTo = true;
-    if (url && typeof this.isAuth === 'function') {
-      isAuthTo = await this.isAuth(url);
+    // 判断是否跳转忽略权限校验的路由
+    const isIgnoreAuthRoutes = globalSettingDataInstance.isIgnoreAuthRoutes(url);
+    // 判断是否使用 authDataInstance中的hasMenuPermission 判断是否有菜单权限
+    const useAuthHasMenuPermission = globalSettingDataInstance.store.useAuthHasMenuPermission;
+    // 判断是否开启权限校验
+    const isEnableAuth = globalSettingDataInstance.store.isEnableAuth;
+    let isAuthFunction = this.isAuth;
+    if (useAuthHasMenuPermission && typeof isAuthFunction !== 'function' && isEnableAuth) {
+      isAuthFunction = authDataInstance.hasMenuPermission;
+    }
+    if (url && typeof isAuthFunction === 'function' && !isIgnoreAuthRoutes && isEnableAuth) {
+      isAuthTo = await isAuthFunction(url);
     }
     if (isAuthTo === false) {
       // 无权访问页面
-      Taro.showToast({ title: '无权访问', icon: 'none' });
+      Taro.showToast({ title: `${url} 无权访问`, icon: 'none' });
       return false;
     }
     return true;

package/src/utils/request.ts

@@ -3,8 +3,6 @@ import { globalSettingDataInstance } from 'context/global.setting.data.instance'
 import { globalDataInstance } from 'context/global.data.instance';
 
 const codeMessage = {
-  // 200: '服务器成功返回请求的数据',
-  // 201: '新建或修改数据成功',
   400: '发出的请求错误',
   401: '用户没有权限',
   403: '用户访问被禁止',
@@ -34,7 +32,7 @@ const requestResponseHandle = (result: Taro.request.SuccessCallbackResult<any>,
     const statusCode = result.statusCode;
     const code = result?.data?.code;
     if (result?.data) {
-      if (statusCode === 401 || code === 401) {
+      if (statusCode === 401 || code === 401 || code === globalSettingDataInstance.store.tokenExpiredCode) {
         // 权限问题 ，重新登录
         msg = '请重新登录';
         /**重新跳转登录页面*/
@@ -59,22 +57,11 @@ const requestResponseHandle = (result: Taro.request.SuccessCallbackResult<any>,
 };
 
 export interface RequestInstanceCreateOptions {
-  /**
-   * 本地存储token字段名
-   * @default token
-   */
-  tokenFieldName?: string;
-  /**
-   * 请求头token字段名
-   * @default token
-   */
-  headerTokenName?: string;
   /**
    * 公共请求配置
    * @default {}
    */
   commonOptions?: Omit<Taro.request.Option<any, any>, 'url'>;
-
   /**
    * 请求IP地址
    * @default ''
@@ -85,6 +72,10 @@ export interface RequestInstanceCreateOptions {
    * @default {}
    */
   proxy?: {
+    default?: {
+      dev?: string;
+      pro?: string;
+    };
     dev: Record<string, string | { target: string; pathRewrite: Record<string, string> }>;
     pro: Record<string, string | { target: string; pathRewrite: Record<string, string> }>;
   };
@@ -95,16 +86,7 @@ export class RequestInstance {
   public IP?: string | ((url: string, module?: string, env?: string) => string);
   /**简单的代理配置*/
   public proxy?: RequestInstanceCreateOptions['proxy'];
-  /**
-   * 本地存储token字段名
-   * @default token
-   */
-  public tokenFieldName = 'token';
-  /**
-   * 请求头token字段名
-   * @default token
-   */
-  public headerTokenName = 'token';
+
   /**公共请求配置*/
   public commonOptions: Omit<Taro.request.Option<any, any>, 'url'> = {};
 
@@ -122,8 +104,6 @@ export class RequestInstance {
   extends = (options: RequestInstanceCreateOptions = {}) => {
     this.IP = options.IP || this.IP;
     this.proxy = options.proxy || this.proxy;
-    this.tokenFieldName = options.tokenFieldName || this.tokenFieldName;
-    this.headerTokenName = options.headerTokenName || this.headerTokenName;
     this.commonOptions = { ...this.commonOptions, ...options.commonOptions };
     return this;
   };
@@ -169,6 +149,9 @@ export class RequestInstance {
           }
         }
     }
+    if (!host) {
+      host = this.proxy?.default?.[process.env.NODE_ENV === 'production' ? 'pro' : 'dev'] || '';
+    }
     if (!host) {
       host = this.getHttpPath(url, module);
     }
@@ -195,10 +178,10 @@ export class RequestInstance {
   /**发送请求，返回 Taro.RequestTask */
   requestBase = (options: RequestInstanceOptions) => {
     const { data, header = {}, module, isIgnoreToken, isShowErrorMessage, ...restOptions } = options;
-    const token = Taro.getStorageSync(this.tokenFieldName || 'token');
+    const token = Taro.getStorageSync(globalSettingDataInstance.store.tokenFieldName || 'token');
     const newHeader = { ...header };
     if (token) {
-      newHeader[this.headerTokenName || 'token'] = token;
+      newHeader[globalSettingDataInstance.store.headerTokenName || 'token'] = token;
     } else {
       if (isIgnoreToken !== true) {
         // 跳转登录页