@@ -18,20 +18,21 @@ import { useBasicStore } from '@/store/basic'
1818export function filterAsyncRouter ( data ) {
1919 const basicStore = useBasicStore ( )
2020 const fileAfterRouter = filterAsyncRouterByReq ( data )
21- console . log ( 'fileAfterRouter' , fileAfterRouter )
2221 fileAfterRouter . forEach ( ( route ) => router . addRoute ( route ) )
2322 basicStore . setFilterAsyncRoutes ( fileAfterRouter )
2423}
2524
2625import ParentView from '@/components/ParentView/index.vue'
2726import InnerLink from '@/components/InnerLink/index.vue'
27+ import { filterNull } from '@/hooks/use-common'
2828// @ts -ignore
2929const modules = import . meta. glob ( '../views/**/**.vue' )
3030export const filterAsyncRouterByReq = ( asyncRouterMap ) => {
3131 return asyncRouterMap . filter ( ( route ) => {
3232 // if (type && route.children) {
3333 // route.children = filterChildren(route.children)
3434 // }
35+ console . log ( route )
3536 if ( route . component ) {
3637 // Layout ParentView 组件特殊处理
3738 if ( route . component === 'Layout' ) {
@@ -50,12 +51,15 @@ export const filterAsyncRouterByReq = (asyncRouterMap) => {
5051 delete route [ 'children' ]
5152 delete route [ 'redirect' ]
5253 }
53- route . name = route . routeName
54- if ( route . metaExtra ) route . meta = Object . assign ( route . meta , JSON . parse ( JSON . parse ( route . metaExtra ) ) )
54+ if ( route . routeName ) {
55+ route . name = route . routeName
56+ }
57+ if ( route . metaExtra && JSON . parse ( route . metaExtra ) !== '{}' ) {
58+ route . meta = Object . assign ( route . meta , JSON . parse ( JSON . parse ( route . metaExtra ) ) )
59+ }
5560 return true
5661 } )
5762}
58-
5963// const filterChildren = (childrenMap, lastRouter = false) => {
6064// let children: any = []
6165// childrenMap.forEach((el) => {
0 commit comments