@fairys/taro-tools-react 1.0.3 → 1.0.5

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

@@ -144,23 +144,47 @@ export class AuthDataInstance<T = any> {
    * @param menuPermission 菜单权限
    * @returns 是否有指定菜单权限
    */
-  hasMenuPermission(menuPermission: string): boolean {
+  hasMenuPermission = (menuPermission: string): boolean => {
     if (!globalSettingDataInstance.store.isEnableAuth) {
       return true;
     }
     return this.menusPermissions.includes(menuPermission);
-  }
+  };
 
   /**
    * 判断是否有指定权限
    * @param permission 权限
    * @returns 是否有指定权限
    */
-  hasPermission(permission: string): boolean {
+  hasPermission = (permission: string): boolean => {
     if (!globalSettingDataInstance.store.isEnableAuth) {
       return true;
     }
     return this.permissions.includes(permission);
+  };
+
+  /**
+   * 清除登录凭证（token）、权限列表、菜单权限列表、用户信息
+   */
+  clear = () => {
+    this.token = '';
+    this.permissions = [];
+    this.menusPermissions = [];
+    this.userInfo = undefined;
+  };
+
+  /**
+   * 初始化认证数据实例
+   */
+  constructor() {
+    try {
+      this.store.userInfo = this.userInfo;
+      this.store.token = this.token;
+      this.store.permissions = this.permissions;
+      this.store.menusPermissions = this.menusPermissions;
+    } catch (error) {
+      console.error('初始化认证数据实例失败', error);
+    }
   }
 }
 

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/index.ts

@@ -1,4 +1,5 @@
 export * from './global.data.instance';
 export * from './page.data.instance';
 export * from './page.info.data.instance';
+export * from './auth.data.instance';
 export * from './global.setting.data.instance';

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);
     }