diff --git a/.npmrc b/.npmrc index daf66a1..bdce400 100644 --- a/.npmrc +++ b/.npmrc @@ -5,3 +5,4 @@ strict-peer-dependencies=false registry = https://registry.npmmirror.com + diff --git a/src/layout/app-main/Navbar.vue b/src/layout/app-main/Navbar.vue index d5eaf00..ca90f84 100644 --- a/src/layout/app-main/Navbar.vue +++ b/src/layout/app-main/Navbar.vue @@ -16,7 +16,7 @@
+ @@ -73,7 +74,7 @@ const toggleSideBar = () => { const router = useRouter() const route = useRoute() const loginOut = () => { - elMessage('退出登录成功', 'success') + elMessage('退出登录成功') router.push(`/login?redirect=${route.path}`) nextTick(() => { resetState() @@ -88,7 +89,7 @@ const loginOut = () => { position: relative; background: var(--nav-bar-background); box-shadow: var(--nav-bar-box-shadow); - z-index: 1; + z-index: 0; } //logo diff --git a/src/layout/app-main/TagsView.vue b/src/layout/app-main/TagsView.vue index 4821399..05113b8 100644 --- a/src/layout/app-main/TagsView.vue +++ b/src/layout/app-main/TagsView.vue @@ -2,31 +2,36 @@ @@ -53,21 +58,21 @@ const state = reactive({ const { visitedViews } = storeToRefs(useTagsViewStore()) watch( - () => route.path, - () => { - addTags() - } + () => route.path, + () => { + addTags() + } ) watch( - () => state.visible, - (value) => { - if (value) { - document.body.addEventListener('click', closeMenu) - } else { - document.body.removeEventListener('click', closeMenu) + () => state.visible, + (value) => { + if (value) { + document.body.addEventListener('click', closeMenu) + } else { + document.body.removeEventListener('click', closeMenu) + } } - } ) onMounted(() => { initTags() @@ -140,7 +145,7 @@ const openMenu = (tag, e) => { } else { state.left = left } - state.top = e.clientY + state.top =16 state.visible = true state.selectedTag = tag } @@ -159,9 +164,9 @@ const closeSelectedTag = (view) => { if (routerLevel === 2) { basicStore.delCachedView(view.name) } - // if (routerLevel === 3) { - // basicStore.setCacheViewDeep(view.name) - // } + if (routerLevel === 3) { + basicStore.delCacheViewDeep(view.name) + } } }) } @@ -215,14 +220,24 @@ const { visible, top, left, selectedTag } = toRefs(state)