diff --git a/src/layouts/components/SubSidebar/index.vue b/src/layouts/components/SubSidebar/index.vue index 72ba2aa2..94881494 100755 --- a/src/layouts/components/SubSidebar/index.vue +++ b/src/layouts/components/SubSidebar/index.vue @@ -43,38 +43,40 @@ watch(() => menuStore.actived, (val, oldVal) => { diff --git a/src/layouts/index.vue b/src/layouts/index.vue index 51096c63..f5b6ef2c 100755 --- a/src/layouts/index.vue +++ b/src/layouts/index.vue @@ -185,7 +185,9 @@ const enableAppSetting = import.meta.env.VITE_APP_SETTING transition: width 0.3s, transform 0.3s, box-shadow 0.3s, top 0.3s; &:has(> .main-sidebar-container.main-sidebar-enter-active), - &:has(> .main-sidebar-container.main-sidebar-leave-active) { + &:has(> .main-sidebar-container.main-sidebar-leave-active), + &:has(> .sub-sidebar-container.sub-sidebar-enter-active), + &:has(> .sub-sidebar-container.sub-sidebar-leave-active) { overflow: hidden; } } diff --git a/src/ui/components/FaSmartFixedBlock/index.vue b/src/ui/components/FaSmartFixedBlock/index.vue index 8f5bb324..a3b0634b 100644 --- a/src/ui/components/FaSmartFixedBlock/index.vue +++ b/src/ui/components/FaSmartFixedBlock/index.vue @@ -22,7 +22,7 @@ defineProps<{ width: calc(100% - var(--g-main-sidebar-actual-width) - var(--g-sub-sidebar-actual-width)); padding-right: var(--scrollbar-width, 0); transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); - transition: width 0.3s, max-width 0.3s, transform 0.3s; + transition: width 0.3s, max-width 0.3s, transform 0.3s, top 0.3s; &.top { top: var(--g-header-actual-height);