diff --git a/src/layouts/components/Search/index.vue b/src/layouts/components/Search/index.vue index 4a87a362..595f3d4f 100755 --- a/src/layouts/components/Search/index.vue +++ b/src/layouts/components/Search/index.vue @@ -225,7 +225,6 @@ function keyEnter() { searchResultItemRef.value.find(item => Number.parseInt(item.dataset.index!) === actived.value)?.click() } } -// FIXME 列表数据变更后,快捷键滚动失效 function handleScroll() { if (searchResultRef.value) { const contentDom = searchResultRef.value.osInstance()!.elements().content diff --git a/src/layouts/components/SubSidebar/index.vue b/src/layouts/components/SubSidebar/index.vue index f26d999f..2279ff61 100755 --- a/src/layouts/components/SubSidebar/index.vue +++ b/src/layouts/components/SubSidebar/index.vue @@ -24,8 +24,11 @@ const enableSidebar = computed(() => { ['side', 'head', 'single'].includes(settingsStore.settings.menu.menuMode) && menuStore.sidebarMenus.length !== 0 && !( - !menuStore.sidebarMenus[0].children - || menuStore.sidebarMenus[0]?.children.every(item => item.meta?.sidebar === false) + menuStore.sidebarMenus.length === 1 + && ( + !menuStore.sidebarMenus[0].children + || menuStore.sidebarMenus[0]?.children.every(item => item.meta?.sidebar === false) + ) ) ) }) diff --git a/src/layouts/components/Topbar/Toolbar/index.vue b/src/layouts/components/Topbar/Toolbar/index.vue index 16a75be7..30b8e229 100755 --- a/src/layouts/components/Topbar/Toolbar/index.vue +++ b/src/layouts/components/Topbar/Toolbar/index.vue @@ -20,8 +20,11 @@ const enableSubMenuCollapseButton = computed(() => { ['side', 'head', 'single'].includes(settingsStore.settings.menu.menuMode) && settingsStore.settings.menu.enableSubMenuCollapseButton && !( - !menuStore.sidebarMenus[0].children - || menuStore.sidebarMenus[0]?.children.every(item => item.meta?.sidebar === false) + menuStore.sidebarMenus.length === 1 + && ( + !menuStore.sidebarMenus[0].children + || menuStore.sidebarMenus[0]?.children.every(item => item.meta?.sidebar === false) + ) ) ) })