mirror of
https://gitee.com/dapppp/ruoyi-plus-vben5.git
synced 2026-04-10 15:43:16 +08:00
fix: Fix layout change, ensure div[ref="asideRef"] is contained within <aside> (#7551)
This commit is contained in:
@@ -264,6 +264,13 @@ function handleMouseleave() {
|
|||||||
class="h-full transition-all duration-150"
|
class="h-full transition-all duration-150"
|
||||||
></div>
|
></div>
|
||||||
<aside
|
<aside
|
||||||
|
:style="style"
|
||||||
|
class="fixed left-0 top-0 h-full transition-all duration-150"
|
||||||
|
@mouseenter="handleMouseenter"
|
||||||
|
@mouseleave="handleMouseleave"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="h-full"
|
||||||
:class="[
|
:class="[
|
||||||
theme,
|
theme,
|
||||||
{
|
{
|
||||||
@@ -271,10 +278,7 @@ function handleMouseleave() {
|
|||||||
'border-r border-border bg-sidebar': !isSidebarMixed,
|
'border-r border-border bg-sidebar': !isSidebarMixed,
|
||||||
},
|
},
|
||||||
]"
|
]"
|
||||||
:style="style"
|
:style="{ width: `${width}px` }"
|
||||||
class="fixed left-0 top-0 h-full transition-all duration-150"
|
|
||||||
@mouseenter="handleMouseenter"
|
|
||||||
@mouseleave="handleMouseleave"
|
|
||||||
>
|
>
|
||||||
<SidebarFixedButton
|
<SidebarFixedButton
|
||||||
v-if="!collapse && !isSidebarMixed && showFixedButton"
|
v-if="!collapse && !isSidebarMixed && showFixedButton"
|
||||||
@@ -292,7 +296,7 @@ function handleMouseleave() {
|
|||||||
v-if="showCollapseButton && !isSidebarMixed"
|
v-if="showCollapseButton && !isSidebarMixed"
|
||||||
v-model:collapsed="collapse"
|
v-model:collapsed="collapse"
|
||||||
/>
|
/>
|
||||||
</aside>
|
</div>
|
||||||
<div
|
<div
|
||||||
v-if="isSidebarMixed"
|
v-if="isSidebarMixed"
|
||||||
ref="asideRef"
|
ref="asideRef"
|
||||||
@@ -326,4 +330,5 @@ function handleMouseleave() {
|
|||||||
<slot name="extra"></slot>
|
<slot name="extra"></slot>
|
||||||
</VbenScrollbar>
|
</VbenScrollbar>
|
||||||
</div>
|
</div>
|
||||||
|
</aside>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
Reference in New Issue
Block a user