@fairys/taro-tools-react 1.0.4 → 1.0.6

package/src/context/global.data.instance.ts

@@ -75,8 +75,19 @@ export class GlobalDataInstance extends ProxyInstanceObjectBase<GlobalDataInstan
     this.store.toastData = ref({ ...this.store.toastData, visible: false });
   };
 
+  /**
+   * 跳转登录页面前执行
+   */
+  onBeforetToLoginPage?: () => boolean | void;
   /**跳转登录页面*/
   toLoginPage = () => {
+    if (this.onBeforetToLoginPage) {
+      const f = this.onBeforetToLoginPage();
+      if (f === false) {
+        // 如果返回false则不跳转登录页面
+        return;
+      }
+    }
     const loginPageRoute = globalSettingDataInstance.store.loginPageRoute || '';
     const isLoginPage = navigate.isCurrentPage(loginPageRoute || '');
     const _loginPageRoute = `${loginPageRoute || ''}`.replace(/^\//, '');

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

@@ -188,7 +188,7 @@ export interface PageInfoDataOptions<T extends PageInfoDataInstanceState = PageI
 
 /**初始化实例*/
 export const usePageInfoDataInstance = <T extends PageInfoDataInstanceState = PageInfoDataInstanceState>(
-  instance: PageInfoDataInstance<T>,
+  instance?: PageInfoDataInstance<T>,
 ) => {
   const ref = useRef<PageInfoDataInstance<T>>();
   if (!ref.current) {

package/src/utils/navigate.ts

@@ -17,6 +17,7 @@ class NavigateInstance {
     if (useAuthHasMenuPermission && typeof isAuthFunction !== 'function' && isEnableAuth) {
       isAuthFunction = authDataInstance.hasMenuPermission;
     }
+
     if (url && typeof isAuthFunction === 'function' && !isIgnoreAuthRoutes && isEnableAuth) {
       isAuthTo = await isAuthFunction(url);
     }