Skip to content

Commit 658b51a

Browse files
committed
1 parent b5832c3 commit 658b51a

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

src/layouts/components/Header/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const { switchTo } = useMenu()
1919
<component :is="useSlots('header-start')" />
2020
<Logo class="title" />
2121
<component :is="useSlots('header-after-logo')" />
22-
<FaScrollArea :scrollbar="false" mask horizontal gradient-color="var(--g-header-bg)" class="menu-container h-full flex-1">
22+
<FaScrollArea :scrollbar="false" mask horizontal gradient-color="var(--g-header-bg)" class="menu-container h-full flex-1 overscroll-contain">
2323
<!-- 顶部模式 -->
2424
<div class="menu h-full flex of-hidden transition-all">
2525
<template v-for="(item, index) in menuStore.allMenus" :key="index">

src/layouts/components/MainSidebar/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ onUnmounted(() => {
3838
<component :is="useSlots('main-sidebar-top')" />
3939
<Logo :show-title="false" class="sidebar-logo" />
4040
<component :is="useSlots('main-sidebar-after-logo')" />
41-
<FaScrollArea :scrollbar="false" mask gradient-color="var(--g-main-sidebar-bg)" class="menu flex-1">
41+
<FaScrollArea :scrollbar="false" mask gradient-color="var(--g-main-sidebar-bg)" class="menu flex-1 overscroll-contain">
4242
<!-- 侧边栏模式(含主导航) -->
4343
<div class="w-full flex flex-col of-hidden py-1 transition-all -mt-2">
4444
<template v-for="(item, index) in menuStore.allMenus" :key="index">

src/layouts/components/Menu/sub.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ function handleMouseleave() {
214214
'bg-[var(--g-sub-sidebar-bg)]': rootMenu.isMenuPopup,
215215
'border shadow-xl fixed z-3000 w-[200px]': rootMenu.isMenuPopup,
216216
'mx-1': rootMenu.isMenuPopup && (rootMenu.props.mode === 'vertical' || level !== 0),
217-
'py-1': rootMenu.isMenuPopup,
217+
'py-1 overscroll-contain': rootMenu.isMenuPopup,
218218
})"
219219
>
220220
<template v-for="item in menu.children" :key="item.path ?? rootMenu.getUseId(item)">

src/layouts/components/SubSidebar/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ watch(() => menuStore.actived, (val, oldVal) => {
5454
}"
5555
/>
5656
<component :is="useSlots('sub-sidebar-after-logo')" />
57-
<FaScrollArea :scrollbar="false" mask gradient-color="var(--g-sub-sidebar-bg)" class="flex-1">
57+
<FaScrollArea :scrollbar="false" mask gradient-color="var(--g-sub-sidebar-bg)" class="flex-1 overscroll-contain">
5858
<TransitionGroup :name="transitionName">
5959
<template v-for="(mainItem, mainIndex) in menuStore.allMenus" :key="mainIndex">
6060
<div v-show="mainIndex === menuStore.actived">

src/ui/components/FaScrollArea/scroll-area/ScrollArea.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ defineExpose({
2828

2929
<template>
3030
<ScrollAreaRoot v-bind="delegatedProps" :class="cn('relative overflow-hidden', props.class)">
31-
<ScrollAreaViewport ref="viewportRef" class="scroll-area-viewport h-full w-full overscroll-contain rounded-[inherit]" @scroll="onScroll" @wheel="onWheel">
31+
<ScrollAreaViewport ref="viewportRef" class="scroll-area-viewport h-full w-full rounded-[inherit]" @scroll="onScroll" @wheel="onWheel">
3232
<slot />
3333
</ScrollAreaViewport>
3434
<ScrollBar :class="{ 'opacity-0 pointer-events-none': !props.scrollbar }" />

0 commit comments

Comments
 (0)