Browse Source
fix: Fix layout change, ensure div[ref="asideRef"] is contained within <aside> (#7551)
pull/7553/head
zouawen
1 month ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with
60 additions and
55 deletions
-
packages/@core/ui-kit/layout-ui/src/components/layout-sidebar.vue
|
|
|
@ -264,6 +264,13 @@ function handleMouseleave() { |
|
|
|
class="h-full transition-all duration-150" |
|
|
|
></div> |
|
|
|
<aside |
|
|
|
:style="style" |
|
|
|
class="fixed left-0 top-0 h-full transition-all duration-150" |
|
|
|
@mouseenter="handleMouseenter" |
|
|
|
@mouseleave="handleMouseleave" |
|
|
|
> |
|
|
|
<div |
|
|
|
class="h-full" |
|
|
|
:class="[ |
|
|
|
theme, |
|
|
|
{ |
|
|
|
@ -271,10 +278,7 @@ function handleMouseleave() { |
|
|
|
'border-r border-border bg-sidebar': !isSidebarMixed, |
|
|
|
}, |
|
|
|
]" |
|
|
|
:style="style" |
|
|
|
class="fixed left-0 top-0 h-full transition-all duration-150" |
|
|
|
@mouseenter="handleMouseenter" |
|
|
|
@mouseleave="handleMouseleave" |
|
|
|
:style="{ width: `${width}px` }" |
|
|
|
> |
|
|
|
<SidebarFixedButton |
|
|
|
v-if="!collapse && !isSidebarMixed && showFixedButton" |
|
|
|
@ -292,7 +296,7 @@ function handleMouseleave() { |
|
|
|
v-if="showCollapseButton && !isSidebarMixed" |
|
|
|
v-model:collapsed="collapse" |
|
|
|
/> |
|
|
|
</aside> |
|
|
|
</div> |
|
|
|
<div |
|
|
|
v-if="isSidebarMixed" |
|
|
|
ref="asideRef" |
|
|
|
@ -326,4 +330,5 @@ function handleMouseleave() { |
|
|
|
<slot name="extra"></slot> |
|
|
|
</VbenScrollbar> |
|
|
|
</div> |
|
|
|
</aside> |
|
|
|
</template> |
|
|
|
|