@@ -18,20 +18,21 @@ import { useBasicStore } from '@/store/basic'
18
18
export function filterAsyncRouter ( data ) {
19
19
const basicStore = useBasicStore ( )
20
20
const fileAfterRouter = filterAsyncRouterByReq ( data )
21
- console . log ( 'fileAfterRouter' , fileAfterRouter )
22
21
fileAfterRouter . forEach ( ( route ) => router . addRoute ( route ) )
23
22
basicStore . setFilterAsyncRoutes ( fileAfterRouter )
24
23
}
25
24
26
25
import ParentView from '@/components/ParentView/index.vue'
27
26
import InnerLink from '@/components/InnerLink/index.vue'
27
+ import { filterNull } from '@/hooks/use-common'
28
28
// @ts -ignore
29
29
const modules = import . meta. glob ( '../views/**/**.vue' )
30
30
export const filterAsyncRouterByReq = ( asyncRouterMap ) => {
31
31
return asyncRouterMap . filter ( ( route ) => {
32
32
// if (type && route.children) {
33
33
// route.children = filterChildren(route.children)
34
34
// }
35
+ console . log ( route )
35
36
if ( route . component ) {
36
37
// Layout ParentView 组件特殊处理
37
38
if ( route . component === 'Layout' ) {
@@ -50,12 +51,15 @@ export const filterAsyncRouterByReq = (asyncRouterMap) => {
50
51
delete route [ 'children' ]
51
52
delete route [ 'redirect' ]
52
53
}
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
+ }
55
60
return true
56
61
} )
57
62
}
58
-
59
63
// const filterChildren = (childrenMap, lastRouter = false) => {
60
64
// let children: any = []
61
65
// childrenMap.forEach((el) => {
0 commit comments