fixed: flipped-aurora#825

piexlmax · piexlmax · commit aeabe8ccb7c4 · 2021-12-26T22:59:17.000+08:00
diff --git a/web/src/permission.js b/web/src/permission.js
@@ -6,52 +6,72 @@ let asyncRouterFlag = 0
 const whiteList = ['Login', 'Init']
 
 const getRouter = async() => {
-  await store.dispatch('router/SetAsyncRouter')
-  await store.dispatch('user/GetUserInfo')
-  const asyncRouters = store.getters['router/asyncRouters']
-  asyncRouters.forEach(asyncRouter => {
-    router.addRoute(asyncRouter)
-  })
+    await store.dispatch('router/SetAsyncRouter')
+    await store.dispatch('user/GetUserInfo')
+    const asyncRouters = store.getters['router/asyncRouters']
+    asyncRouters.forEach(asyncRouter => {
+        router.addRoute(asyncRouter)
+    })
 }
 
-router.beforeEach(async(to, from, next) => {
-  const token = store.getters['user/token']
-  // 在白名单中的判断情况
-  document.title = getPageTitle(to.meta.title)
-  if (whiteList.indexOf(to.name) > -1) {
-    if (token) {
-      if (!asyncRouterFlag) {
-        asyncRouterFlag++
-        await getRouter()
-      }
-      next({ name: store.getters['user/userInfo'].authority.defaultRouter })
-    } else {
-      next()
+async function handleKeepAlive(to) {
+    if (to.matched && to.matched.length > 2) {
+        for (let i = 1; i < to.matched.length; i++) {
+            const element = to.matched[i - 1]
+            if (element.name === "layout") {
+                to.matched.splice(i, 1)
+                await handleKeepAlive(to)
+            }
+            // 如果没有按需加载完成则等待加载
+            if (typeof element.components.default === 'function') {
+                await element.components.default()
+                await handleKeepAlive(to)
+            }
+        }
     }
-  } else {
-    // 不在白名单中并且已经登陆的时候
-    if (token) {
-      // 添加flag防止多次获取动态路由和栈溢出
-      if (!asyncRouterFlag) {
-        asyncRouterFlag++
-        await getRouter()
-        next({ ...to, replace: true })
-      } else {
-        if (to.matched.length) {
-          next()
+}
+
+router.beforeEach(async(to, from, next) => {
+    to.meta.matcheds =JSON.parse(JSON.stringify(to.matched)) 
+    handleKeepAlive(to)
+    const token = store.getters['user/token']
+        // 在白名单中的判断情况
+    document.title = getPageTitle(to.meta.title)
+    if (whiteList.indexOf(to.name) > -1) {
+        if (token) {
+            if (!asyncRouterFlag) {
+                asyncRouterFlag++
+                await getRouter()
+            }
+            next({ name: store.getters['user/userInfo'].authority.defaultRouter })
         } else {
-          next({ path: '/layout/404' })
+            next()
         }
-      }
-    }
-    // 不在白名单中并且未登陆的时候
-    if (!token) {
-      next({
-        name: 'Login',
-        query: {
-          redirect: document.location.hash
+    } else {
+        // 不在白名单中并且已经登陆的时候
+        if (token) {
+            // 添加flag防止多次获取动态路由和栈溢出
+            if (!asyncRouterFlag) {
+                asyncRouterFlag++
+                await getRouter()
+
+                next({...to, replace: true })
+            } else {
+                if (to.matched.length) {
+                    next()
+                } else {
+                    next({ path: '/layout/404' })
+                }
+            }
+        }
+        // 不在白名单中并且未登陆的时候
+        if (!token) {
+            next({
+                name: 'Login',
+                query: {
+                    redirect: document.location.hash
+                }
+            })
         }
-      })
     }
-  }
-})
+})
diff --git a/web/src/view/layout/index.vue b/web/src/view/layout/index.vue
@@ -152,7 +152,7 @@ export default {
       return this.$route.meta.title || '当前页面'
     },
     matched() {
-      return this.$route.matched
+      return this.$route.meta.matcheds
     }
   },
   created() {

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ export default {`
`152`	`152`	`return this.$route.meta.title \|\| '当前页面'`
`153`	`153`	`},`
`154`	`154`	`matched() {`
`155`		`- return this.$route.matched`
	`155`	`+ return this.$route.meta.matcheds`
`156`	`156`	`}`
`157`	`157`	`},`
`158`	`158`	`created() {`