wenyongda/ZRAdmin-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update TopNav切换

Browse Source
This commit is contained in:
不做码农 2022-05-21 13:29:58 +08:00
parent 945f764249
commit 8e2cebc402
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/components/TopNav/index.vue
View File

@ -1,5 +1,11 @@
<template> <template>
<el-menu :default-active="activeMenu" :active-text-color="theme" mode="horizontal" background-color="transparent" @select="handleSelect" :ellipsis="false"> <el-menu
:default-active="activeMenu"
:active-text-color="theme"
mode="horizontal"
background-color="transparent"
@select="handleSelect"
:ellipsis="false">
<template v-for="(item, index) in topMenus"> <template v-for="(item, index) in topMenus">
<el-menu-item :style="{ '--theme': theme }" :index="item.path" :key="index" v-if="index < visibleNumber"> <el-menu-item :style="{ '--theme': theme }" :index="item.path" :key="index" v-if="index < visibleNumber">
<svg-icon :name="item.meta.icon" /> <svg-icon :name="item.meta.icon" />
@ -24,6 +30,7 @@
import { constantRoutes } from '@/router' import { constantRoutes } from '@/router'
import { isHttp } from '@/utils/validate' import { isHttp } from '@/utils/validate'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import { getNormalPath } from '@/utils/ruoyi'
// 顶部栏初始数 // 顶部栏初始数
const visibleNumber = ref(5) const visibleNumber = ref(5)
@ -64,10 +71,10 @@ const childrenMenus = computed(() => {
for (let item in router.children) { for (let item in router.children) {
if (router.children[item].parentPath === undefined) { if (router.children[item].parentPath === undefined) {
if (router.path === '/') { if (router.path === '/') {
router.children[item].path = '/redirect/' + router.children[item].path router.children[item].path = getNormalPath('/redirect/' + router.children[item].path)
} else { } else {
if (!isHttp(router.children[item].path)) { if (!isHttp(router.children[item].path)) {
router.children[item].path = router.path + '/' + router.children[item].path router.children[item].path = getNormalPath(router.path + '/' + router.children[item].path)
} }
} }
router.children[item].parentPath = router.path router.children[item].parentPath = router.path
@ -96,7 +103,6 @@ const activeMenu = computed(() => {
if (routes.length === 0) { if (routes.length === 0) {
activePath = currentIndex.value || defaultRouter.value activePath = currentIndex.value || defaultRouter.value
console.log('activePath', activePath)
activeRoutes(activePath) activeRoutes(activePath)
} }
return activePath return activePath
@ -170,12 +176,6 @@ onMounted(() => {
.el-menu--horizontal > .el-menu-item .svg-icon { .el-menu--horizontal > .el-menu-item .svg-icon {
margin-right: 5px; margin-right: 5px;
} }
// .topmenu-container.el-menu--horizontal > .el-menu-item.is-active,
// .el-menu--horizontal > .el-sub-menu.is-active .el-submenu__title {
// border-bottom: 0px solid #{"var(--theme)"} !important;
// color: #303133;
// }
/* sub-menu item */ /* sub-menu item */
.topmenu-container.el-menu--horizontal > .el-sub-menu .el-sub-menu__title { .topmenu-container.el-menu--horizontal > .el-sub-menu .el-sub-menu__title {
height: 50px !important; height: 50px !important;

2
src/layout/components/Settings/index.vue
View File

@ -124,6 +124,8 @@ const topNav = computed({
if (!val) { if (!val) {
store.dispatch('app/toggleSideBarHide', false) store.dispatch('app/toggleSideBarHide', false)
store.commit('SET_SIDEBAR_ROUTERS', store.state.permission.defaultRoutes) store.commit('SET_SIDEBAR_ROUTERS', store.state.permission.defaultRoutes)
// TODO 临时解决切换topnav路由跳转问题
setTimeout('window.location.reload()', 100)
} }
}, },
}) })