hjq/PixelAI-admin
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 一级菜单重定向为空，分栏模式下，点击一次菜单时现在会切换子菜单列表，而不是打开空白页

Browse Source
This commit is contained in:
许俊杰 2023-03-19 17:53:29 +08:00
parent ccca4cd355
commit a91f84e3a1
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/layout/component/columnsAside.vue
View File

@ -48,7 +48,6 @@
import { reactive, ref, onMounted, nextTick, watch, onUnmounted } from 'vue'; import { reactive, ref, onMounted, nextTick, watch, onUnmounted } from 'vue';
import { useRoute, useRouter, onBeforeRouteUpdate, RouteRecordRaw } from 'vue-router'; import { useRoute, useRouter, onBeforeRouteUpdate, RouteRecordRaw } from 'vue-router';
import { storeToRefs } from 'pinia'; import { storeToRefs } from 'pinia';
import pinia from '/@/stores/index';
import { useRoutesList } from '/@/stores/routesList'; import { useRoutesList } from '/@/stores/routesList';
import { useThemeConfig } from '/@/stores/themeConfig'; import { useThemeConfig } from '/@/stores/themeConfig';
import mittBus from '/@/utils/mitt'; import mittBus from '/@/utils/mitt';
@ -81,8 +80,22 @@ const setColumnsAsideMove = (k: number) => {
// 菜单高亮点击事件 // 菜单高亮点击事件
const onColumnsAsideMenuClick = async (v: RouteItem) => { const onColumnsAsideMenuClick = async (v: RouteItem) => {
let { path, redirect } = v; let { path, redirect } = v;
if (redirect) router.push(redirect); if (redirect) {
else router.push(path); onColumnsAsideDown(v.k);
if (route.path.startsWith(redirect)) mittBus.emit('setSendColumnsChildren', setSendChildren(redirect));
else router.push(redirect);
} else {
if (!v.children) {
router.push(path);
} else {
// 显示子级菜单
const resData: MittMenu = setSendChildren(path);
if (Object.keys(resData).length <= 0) return false;
onColumnsAsideDown(resData.item?.k);
mittBus.emit('setSendColumnsChildren', resData);
}
}
// 一个路由设置自动收起菜单 // 一个路由设置自动收起菜单
// https://gitee.com/lyt-top/vue-next-admin/issues/I6HW7H // https://gitee.com/lyt-top/vue-next-admin/issues/I6HW7H
if (!v.children) themeConfig.value.isCollapse = true; if (!v.children) themeConfig.value.isCollapse = true;
@ -123,7 +136,10 @@ const setFilterRoutes = () => {
// 刷新时，初始化一个路由设置自动收起菜单 // 刷新时，初始化一个路由设置自动收起菜单
// https://gitee.com/lyt-top/vue-next-admin/issues/I6HW7H // https://gitee.com/lyt-top/vue-next-admin/issues/I6HW7H
resData.children.length <= 1 ? (themeConfig.value.isCollapse = true) : (themeConfig.value.isCollapse = false); resData.children.length <= 1 ? (themeConfig.value.isCollapse = true) : (themeConfig.value.isCollapse = false);
// 延迟 500 毫秒更新，防止 aside.vue 组件 setSendColumnsChildren 还没有注册
setTimeout(() => {
mittBus.emit('setSendColumnsChildren', resData); mittBus.emit('setSendColumnsChildren', resData);
}, 500);
}; };
// 传送当前子级数据到菜单中 // 传送当前子级数据到菜单中
const setSendChildren = (path: string) => { const setSendChildren = (path: string) => {
@ -181,10 +197,10 @@ onBeforeRouteUpdate((to) => {
}); });
// 监听布局配置信息的变化，动态增加菜单高亮位置移动像素 // 监听布局配置信息的变化，动态增加菜单高亮位置移动像素
watch( watch(
pinia.state, [() => themeConfig.value.columnsAsideStyle, isColumnsMenuHover, isColumnsNavHover],
(val) => { () => {
val.themeConfig.themeConfig.columnsAsideStyle === 'columnsRound' ? (state.difference = 3) : (state.difference = 0); themeConfig.value.columnsAsideStyle === 'columnsRound' ? (state.difference = 3) : (state.difference = 0);
if (!val.routesList.isColumnsMenuHover && !val.routesList.isColumnsNavHover) { if (!isColumnsMenuHover.value && !isColumnsNavHover.value) {
state.liHoverIndex = null; state.liHoverIndex = null;
mittBus.emit('setSendColumnsChildren', setSendChildren(route.path)); mittBus.emit('setSendColumnsChildren', setSendChildren(route.path));
} else { } else {