From 6fd2c572bd6cd81768d32b5565a50954835c7369 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bahad=C4=B1r=20Sofuo=C4=9Flu?= Date: Mon, 7 Nov 2022 15:29:37 +0300 Subject: [PATCH] Overlay mode route changes completed --- src/layout/AppConfig.vue | 1 - src/layout/AppMenuItem.vue | 12 ++++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/layout/AppConfig.vue b/src/layout/AppConfig.vue index 70afbac..9a54119 100644 --- a/src/layout/AppConfig.vue +++ b/src/layout/AppConfig.vue @@ -34,7 +34,6 @@ const decrementScale = () => { const incrementScale = () => { setScale(layoutConfig.scale.value + 1); - console.log(layoutConfig.scale); applyScale(); }; const applyScale = () => { diff --git a/src/layout/AppMenuItem.vue b/src/layout/AppMenuItem.vue index 9f321eb..635dd1e 100644 --- a/src/layout/AppMenuItem.vue +++ b/src/layout/AppMenuItem.vue @@ -5,7 +5,7 @@ import { useLayoutService } from '@/layout/composables/layoutService'; const route = useRoute(); -const { layoutConfig, setActiveMenuItem } = useLayoutService(); +const { layoutConfig, layoutState, setActiveMenuItem, onMenuToggle } = useLayoutService(); const props = defineProps({ item: { @@ -45,6 +45,9 @@ const itemClick = (event, item) => { return; } + if ((item.to || item.url) && (layoutState.staticMenuMobileActive.value || layoutState.overlayMenuActive.value)) { + onMenuToggle(); + } //execute command if (item.command) { item.command({ originalEvent: event, item: item }); @@ -52,13 +55,6 @@ const itemClick = (event, item) => { if (item.items) setActiveMenuItem(isActiveMenu.value ? props.parentItemKey : itemKey); else setActiveMenuItem(itemKey.value); - - /* activeIndex.value = index === activeIndex.value ? null : index; - - /* emit('menuitem-click', { - originalEvent: event, - item: item - }); */ }; const checkActiveRoute = (item) => {