Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin

2024-08-21 19:45:28 +08:00
parent b1a1bad9ee c3631ef555
commit cce35ec6c4
33 changed files with 286 additions and 254 deletions
--- a/apps/web-antd/src/api/request.ts
+++ b/apps/web-antd/src/api/request.ts
@@ -62,7 +62,10 @@ function createRequestClient(baseURL: string) {
    const accessStore = useAccessStore();
    const authStore = useAuthStore();
    accessStore.setAccessToken(null);
-    if (preferences.app.loginExpiredMode === 'modal') {
+    if (
+      preferences.app.loginExpiredMode === 'modal' &&
+      accessStore.isAccessChecked
+    ) {
      accessStore.setLoginExpired(true);
    } else {
      await authStore.logout();