feat: 优化路由匹配方式

pumelotea · Dec 13, 2023 · 03d1a40 · 03d1a40 · vercel · Dec 13, 2023
1 parent f6d7b80
commit 03d1a40
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/src/global/router/config.js b/src/global/router/config.js
@@ -89,11 +89,20 @@ const whiteList = [
   '/error'
 ]
 
+function includes (matched) {
+  for (const matchedElement of matched) {
+    if (whiteList.includes(matchedElement.path)) {
+      return true
+    }
+  }
+  return false
+}
+
 export const needRouterLoading = ref(false)
 
 export const beforeEachHandler = (to, from, next) => {
   if (!security.getToken()) {
-    if (!whiteList.includes(to.path)) {
+    if (!includes(to.matched)) {
       needRouterLoading.value = false
       next('/login')
       return
@@ -103,7 +112,7 @@ export const beforeEachHandler = (to, from, next) => {
     return
   }
 
-  if (!whiteList.includes(to.path)) {
+  if (!includes(to.matched)) {
     needRouterLoading.value = !happyFramework.routerInitiated
     beforeInterceptor.filter(to, from, next)
   } else {