Overlay mode route changes completed
This commit is contained in:
@@ -34,7 +34,6 @@ const decrementScale = () => {
|
|||||||
|
|
||||||
const incrementScale = () => {
|
const incrementScale = () => {
|
||||||
setScale(layoutConfig.scale.value + 1);
|
setScale(layoutConfig.scale.value + 1);
|
||||||
console.log(layoutConfig.scale);
|
|
||||||
applyScale();
|
applyScale();
|
||||||
};
|
};
|
||||||
const applyScale = () => {
|
const applyScale = () => {
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import { useLayoutService } from '@/layout/composables/layoutService';
|
|||||||
|
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
|
|
||||||
const { layoutConfig, setActiveMenuItem } = useLayoutService();
|
const { layoutConfig, layoutState, setActiveMenuItem, onMenuToggle } = useLayoutService();
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
item: {
|
item: {
|
||||||
@@ -45,6 +45,9 @@ const itemClick = (event, item) => {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ((item.to || item.url) && (layoutState.staticMenuMobileActive.value || layoutState.overlayMenuActive.value)) {
|
||||||
|
onMenuToggle();
|
||||||
|
}
|
||||||
//execute command
|
//execute command
|
||||||
if (item.command) {
|
if (item.command) {
|
||||||
item.command({ originalEvent: event, item: item });
|
item.command({ originalEvent: event, item: item });
|
||||||
@@ -52,13 +55,6 @@ const itemClick = (event, item) => {
|
|||||||
|
|
||||||
if (item.items) setActiveMenuItem(isActiveMenu.value ? props.parentItemKey : itemKey);
|
if (item.items) setActiveMenuItem(isActiveMenu.value ? props.parentItemKey : itemKey);
|
||||||
else setActiveMenuItem(itemKey.value);
|
else setActiveMenuItem(itemKey.value);
|
||||||
|
|
||||||
/* activeIndex.value = index === activeIndex.value ? null : index;
|
|
||||||
|
|
||||||
/* emit('menuitem-click', {
|
|
||||||
originalEvent: event,
|
|
||||||
item: item
|
|
||||||
}); */
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const checkActiveRoute = (item) => {
|
const checkActiveRoute = (item) => {
|
||||||
|
|||||||
Reference in New Issue
Block a user