We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent 1dd7a03 commit 8cbb340Copy full SHA for 8cbb340
1 file changed
src/router/extensions.ts
@@ -66,13 +66,15 @@ declare module 'vue-router' {
66
67
function extendClose(router: Router) {
68
router.close = function (to: RouteLocationRaw) {
69
- const settingsStore = useSettingsStore(pinia)
70
- if (settingsStore.settings.tabbar.enable) {
71
- const tabId = getId(router)
72
- const tabbarStore = useTabbarStore(pinia)
73
- tabbarStore.remove(tabId)
74
- }
75
- return router.push(to)
+ const currentRoute = router.currentRoute.value
+ const tabId = getId(router)
+ return router.push(to).then(() => {
+ const settingsStore = useSettingsStore(pinia)
+ if (settingsStore.settings.tabbar.enable && currentRoute.meta.tabMerge !== 'activeMenu') {
+ const tabbarStore = useTabbarStore(pinia)
+ tabbarStore.remove(tabId)
76
+ }
77
+ })
78
}
79
80
0 commit comments