yudao
/
admin-vben
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vben.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: sidebar scrolling does not meet expectations (#4241)

pull/48/MERGE
Vben 2024-08-26 22:09:18 +08:00 committed by GitHub
parent 54a622ad05
commit 87cc8a154c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/@core/composables/src/use-content-style.ts
View File

@ -28,7 +28,7 @@ function useContentStyle() {
position: 'fixed', position: 'fixed',
top: `${top}px`, top: `${top}px`,
width: `${width}px`, width: `${width}px`,
zIndex: 1000, zIndex: 150,
}; };
}); });

5
packages/@core/ui-kit/layout-ui/src/components/layout-sidebar.vue
View File

@ -4,6 +4,8 @@ import { computed, shallowRef, useSlots, watchEffect } from 'vue';
import { VbenScrollbar } from '@vben-core/shadcn-ui'; import { VbenScrollbar } from '@vben-core/shadcn-ui';
import { useScrollLock } from '@vueuse/core';
import { SidebarCollapseButton, SidebarFixedButton } from './widgets'; import { SidebarCollapseButton, SidebarFixedButton } from './widgets';
interface Props { interface Props {
@ -102,6 +104,7 @@ const expandOnHovering = defineModel<boolean>('expandOnHovering');
const expandOnHover = defineModel<boolean>('expandOnHover'); const expandOnHover = defineModel<boolean>('expandOnHover');
const extraVisible = defineModel<boolean>('extraVisible'); const extraVisible = defineModel<boolean>('extraVisible');
const isLocked = useScrollLock(document.body);
const slots = useSlots(); const slots = useSlots();
const asideRef = shallowRef<HTMLDivElement | null>(); const asideRef = shallowRef<HTMLDivElement | null>();
@ -214,6 +217,7 @@ function handleMouseenter() {
if (!expandOnHovering.value) { if (!expandOnHovering.value) {
collapse.value = false; collapse.value = false;
} }
isLocked.value = true;
expandOnHovering.value = true; expandOnHovering.value = true;
} }
@ -224,6 +228,7 @@ function handleMouseleave() {
return; return;
} }
isLocked.value = false;
expandOnHovering.value = false; expandOnHovering.value = false;
collapse.value = true; collapse.value = true;
extraVisible.value = false; extraVisible.value = false;