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

2024-09-20 08:06:53 +08:00
parent d61b86a88c a634ec3692
commit 587355dbaf
69 changed files with 2200 additions and 1218 deletions
--- a/apps/web-naive/package.json
+++ b/apps/web-naive/package.json
@@ -40,10 +40,10 @@
    "@vben/styles": "workspace:*",
    "@vben/types": "workspace:*",
    "@vben/utils": "workspace:*",
-    "@vueuse/core": "^11.1.0",
-    "naive-ui": "^2.39.0",
-    "pinia": "2.2.2",
-    "vue": "^3.5.6",
-    "vue-router": "^4.4.5"
+    "@vueuse/core": "catalog:",
+    "naive-ui": "catalog:",
+    "pinia": "catalog:",
+    "vue": "catalog:",
+    "vue-router": "catalog:"
  }
 }
--- a/apps/web-naive/src/store/auth.ts
+++ b/apps/web-naive/src/store/auth.ts
@@ -77,7 +77,11 @@ export const useAuthStore = defineStore('auth', () => {
  }

  async function logout(redirect: boolean = true) {
-    await logoutApi();
+    try {
+      await logoutApi();
+    } catch {
+      // 不做任何处理
+    }
    resetAllStores();
    accessStore.setLoginExpired(false);