diff --git a/src/layout/components/columns/ma-columns-menu.vue b/src/layout/components/columns/ma-columns-menu.vue
index 0be8a550..62d4056e 100644
--- a/src/layout/components/columns/ma-columns-menu.vue
+++ b/src/layout/components/columns/ma-columns-menu.vue
@@ -18,7 +18,10 @@
>
{
+ keepAliveStore.menuLoader = false
+ loadMenu(bigMenu, index)
+ }"
>
{
+ keepAliveStore.menuLoader = true
initMenu(true)
})
watch(() => route, v => {
+ keepAliveStore.menuLoader = false
initMenu(false)
}, { deep: true })
@@ -74,6 +80,7 @@
} else {
current = 'home'
}
+ console.log(current)
if (userStore.routers && userStore.routers.length > 0) {
userStore.routers.map((item, index) => {
if (item.name == current) loadMenu(item, index, init)
@@ -87,7 +94,7 @@
return
}
if (bigMenu.children.length > 0) {
- if (bigMenu.redirect && isInit) {
+ if (bigMenu.redirect && isInit && !keepAliveStore.menuLoader) {
router.push(bigMenu.redirect)
}
MaMenuRef.value.loadChildMenu(bigMenu)
diff --git a/src/layout/components/mixed/index.vue b/src/layout/components/mixed/index.vue
index 23867771..6aa469dc 100644
--- a/src/layout/components/mixed/index.vue
+++ b/src/layout/components/mixed/index.vue
@@ -15,7 +15,10 @@
{{ $title }}
-
+ {
+ keepAliveStore.menuLoader = false
+ loadMenu(bigMenu, index)
+ }" ref="topMenuRef" />
@@ -42,7 +45,7 @@