diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue index 1567961..eb5df96 100644 --- a/src/components/Breadcrumb/index.vue +++ b/src/components/Breadcrumb/index.vue @@ -28,7 +28,7 @@ function getBreadcrumb() { if (index !== 0) item = item.slice(1) return item }) - getMatched(pathList, permissionStore.sidebarRouters, matched) + getMatched(pathList, permissionStore.defaultRoutes, matched) } else { matched = route.matched.filter((item) => item.meta && item.meta.title) } @@ -48,11 +48,13 @@ function findPathNum(str, char = "/") { return num } function getMatched(pathList, routeList, matched) { - let data = routeList.find((item) => item.path == pathList[0]) - matched.push(data) - if (data.children && pathList.length) { - pathList.shift() - getMatched(pathList, data.children, matched) + let data = routeList.find(item => item.path == pathList[0] || (item.name += '').toLowerCase() == pathList[0]) + if (data) { + matched.push(data) + if (data.children && pathList.length) { + pathList.shift() + getMatched(pathList, data.children, matched) + } } } function isDashboard(route) { diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue index b92ace2..7d292fa 100644 --- a/src/layout/components/Sidebar/SidebarItem.vue +++ b/src/layout/components/Sidebar/SidebarItem.vue @@ -57,11 +57,9 @@ function hasOneShowingChild(children = [], parent) { const showingChildren = children.filter(item => { if (item.hidden) { return false - } else { - // Temp set(will be used if only has one showing child) - onlyOneChild.value = item - return true } + onlyOneChild.value = item + return true }) // When there is only one child router, the child router is displayed by default diff --git a/src/plugins/cache.js b/src/plugins/cache.js index 6f71b8e..e912c9a 100644 --- a/src/plugins/cache.js +++ b/src/plugins/cache.js @@ -26,6 +26,7 @@ const sessionCache = { if (value != null) { return JSON.parse(value) } + return null }, remove (key) { sessionStorage.removeItem(key); @@ -59,6 +60,7 @@ const localCache = { if (value != null) { return JSON.parse(value) } + return null }, remove (key) { localStorage.removeItem(key); diff --git a/src/router/index.js b/src/router/index.js index b05d1c1..80a843f 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -166,9 +166,8 @@ const router = createRouter({ scrollBehavior(to, from, savedPosition) { if (savedPosition) { return savedPosition - } else { - return { top: 0 } } + return { top: 0 } }, }); diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index 01dd03a..5bdb7e7 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -443,8 +443,8 @@ function handleUpdate(row) { }); }); }); - title.value = "修改角色"; }); + title.value = "修改角色"; } /** 根据角色ID查询菜单树结构 */ @@ -558,8 +558,8 @@ function handleDataScope(row) { }); }); }); - title.value = "分配数据权限"; }); + title.value = "分配数据权限"; } /** 提交按钮(数据权限) */