Merge remote-tracking branch 'origin/main'

src/store/modules/auth/index.ts

@@ -51,16 +51,27 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
 
     clearAuthStorage();
 
-    authStore.$reset();
-    dictStore.resetDictCache();
-    objectContextStore.$reset();
+    // setup store 没有内置 $reset，需要显式重置内部状态，避免 token / userInfo 残留导致 isLogin 误判。
+    token.value = '';
+    Object.assign(userInfo, {
+      userId: '',
+      userName: '',
+      nickname: '',
+      roles: [],
+      buttons: []
+    });
 
-    if (!route.meta.constant) {
+    dictStore.resetDictCache();
+    objectContextStore.clearContext();
+
+    // 用路由名判断当前是否已在登录页，避免依赖 route.meta.constant ——
+    // workbench 等首页也是常量路由，原写法会让常量路由上的登出请求不跳转。
+    if (route.name !== 'login') {
       await toLogin();
     }
 
     tabStore.cacheTabs();
-    routeStore.resetStore();
+    await routeStore.resetStore();
   }
 
   /** Record the user ID of the previous login session Used to compare with the current user ID on next login */