Skip to content

Commit 6d50982

Browse files
committed
fix: 修复一个菜单切换的问题
1 parent 0ba2fb2 commit 6d50982

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

frontend/src/layout/ViewMenu.vue

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,16 @@ import { Folder, Timer, Notification, Setting } from '@element-plus/icons-vue'
3030
3131
import { useMenuStore } from '@/store/menu'
3232
import { useLikeStore } from '@/store/like'
33+
import { useUserStore } from '@/store/user'
3334
3435
const menu = useMenuStore()
3536
const like = useLikeStore()
37+
const user = useUserStore()
3638
3739
onMounted(() => {
38-
if (like.cfg.folderActive) {
40+
const query = new URLSearchParams(window.location.search).get('path') || ''
41+
42+
if ((!query || !user.cfg.folderNotOpenInQuery) && user.cfg.folderDefOpen) {
3943
menu.toggle('folder')
4044
}
4145
})

frontend/src/store/user.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,7 @@ export const useUserStore = defineStore('user', () => {
8787
cfg.value = Object.assign(cfg.value, cloneDeep(result1) as LikeModel)
8888
}
8989

90-
const query = new URLSearchParams(window.location.search).get('path') || ''
91-
92-
if ((!query || !cfg.value.folderNotOpenInQuery) && cfg.value.folderDefOpen) {
93-
like.cfg.folderActive = cfg.value.folderDefOpen
94-
}
90+
like.cfg.folderActive = cfg.value.folderDefOpen || cfg.value.dir[0] || ''
9591

9692
initialized.value = true
9793
}

0 commit comments

Comments
 (0)