mirror of
https://gitee.com/ssssssss-team/magic-boot.git
synced 2025-02-21 02:12:50 +08:00
修复 菜单管理 同名 导致路由问题
This commit is contained in:
parent
a74b8009d7
commit
a303950eee
@ -5,7 +5,7 @@
|
||||
"groupId" : "67b2ce258e24491194b74992958c74aa",
|
||||
"name" : "当前用户菜单",
|
||||
"createTime" : null,
|
||||
"updateTime" : 1649558286068,
|
||||
"updateTime" : 1656340766427,
|
||||
"lock" : "0",
|
||||
"createBy" : null,
|
||||
"updateBy" : null,
|
||||
@ -557,7 +557,7 @@ var userId = StpUtil.getLoginId()
|
||||
var menus = db.select("""
|
||||
select
|
||||
sm.id,
|
||||
sm.name,
|
||||
sm.name title,
|
||||
sm.pid,
|
||||
sm.is_show,
|
||||
sm.url,
|
||||
@ -579,7 +579,7 @@ for(menu in menus){
|
||||
menu.component = (menu.url || "Layout");
|
||||
menu.path = (menu.component == 'Layout' ? "/" : menu.component);
|
||||
menu.meta = {}
|
||||
menu.meta.title = menu.name
|
||||
menu.meta.title = menu.title
|
||||
menu.meta.icon = menu.icon
|
||||
menu.meta.keepAlive = (menu.keepAlive == '1' ? true : false)
|
||||
}
|
||||
|
3
magic-boot-ui/src/layout/empty.vue
Normal file
3
magic-boot-ui/src/layout/empty.vue
Normal file
@ -0,0 +1,3 @@
|
||||
<template>
|
||||
空页面
|
||||
</template>
|
@ -8,17 +8,17 @@
|
||||
>
|
||||
<el-tab-pane
|
||||
v-for="(view, key) in global.visitedViews" :key="key"
|
||||
:label="view.name"
|
||||
:label="view.meta.title"
|
||||
:name="view.path"
|
||||
:closable="!(view.path == '/home')"
|
||||
>
|
||||
<template #label>
|
||||
<el-dropdown trigger="contextmenu">
|
||||
<div class="el-tabs__item is-top is-closable is-focus" style="padding: 0px;" v-if="$route.path != view.path">
|
||||
{{ view.name }}
|
||||
{{ view.meta.title }}
|
||||
</div>
|
||||
<div class="el-tabs__item is-top is-active is-closable is-focus" style="padding: 0px;" v-else>
|
||||
{{ view.name }}
|
||||
{{ view.meta.title }}
|
||||
</div>
|
||||
<template #dropdown>
|
||||
<el-dropdown-menu>
|
||||
|
@ -17,8 +17,8 @@ export const filterAsyncRouter = (routers, level) => {
|
||||
router.path = "/" + common.uuid()
|
||||
router.component = level > 0 ? layoutModules[`../layout/none.vue`] : loadLayoutView(component)
|
||||
} else {
|
||||
router.path = router.path = router.path.startsWith('/') ? router.path : '/' + router.path
|
||||
router.component = loadView(component)
|
||||
router.path = router.path.startsWith('/') ? router.path : '/' + router.path
|
||||
router.component = loadView(component) || layoutModules[`../layout/empty.vue`]
|
||||
}
|
||||
}
|
||||
if (router.children && router.children.length) {
|
||||
|
Loading…
Reference in New Issue
Block a user