From 8e7a5d1ec3a1168503e02304f9d56acc7472dc8d Mon Sep 17 00:00:00 2001
From: zouawen <846027729@qq.com>
Date: Thu, 12 Feb 2026 22:22:34 +0800
Subject: [PATCH] fix: Fix layout change, ensure div[ref="asideRef"] is
 contained within <aside> (#7551)

---
 .../src/components/layout-sidebar.vue         | 117 +++++++++---------
 1 file changed, 61 insertions(+), 56 deletions(-)

diff --git a/packages/@core/ui-kit/layout-ui/src/components/layout-sidebar.vue b/packages/@core/ui-kit/layout-ui/src/components/layout-sidebar.vue
index 6193517a..76ba74d1 100644
--- a/packages/@core/ui-kit/layout-ui/src/components/layout-sidebar.vue
+++ b/packages/@core/ui-kit/layout-ui/src/components/layout-sidebar.vue
@@ -264,66 +264,71 @@ function handleMouseleave() {
     class="h-full transition-all duration-150"
   ></div>
   <aside
-    :class="[
-      theme,
-      {
-        'bg-sidebar-deep': isSidebarMixed,
-        '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"
   >
-    <SidebarFixedButton
-      v-if="!collapse && !isSidebarMixed && showFixedButton"
-      v-model:expand-on-hover="expandOnHover"
-    />
-    <div v-if="slots.logo" :style="headerStyle">
-      <slot name="logo"></slot>
-    </div>
-    <VbenScrollbar :style="contentStyle" shadow shadow-border>
-      <slot></slot>
-    </VbenScrollbar>
-
-    <div :style="collapseStyle"></div>
-    <SidebarCollapseButton
-      v-if="showCollapseButton && !isSidebarMixed"
-      v-model:collapsed="collapse"
-    />
-  </aside>
-  <div
-    v-if="isSidebarMixed"
-    ref="asideRef"
-    :class="[
-      themeSub,
-      {
-        'border-l': extraVisible,
-      },
-    ]"
-    :style="extraStyle"
-    class="fixed top-0 h-full overflow-hidden border-r border-border bg-sidebar transition-all duration-200"
-  >
-    <SidebarCollapseButton
-      v-if="isSidebarMixed && expandOnHover"
-      v-model:collapsed="extraCollapse"
-    />
-
-    <SidebarFixedButton
-      v-if="!extraCollapse"
-      v-model:expand-on-hover="expandOnHover"
-    />
-    <div v-if="!extraCollapse" :style="extraTitleStyle" class="pl-2">
-      <slot name="extra-title"></slot>
-    </div>
-    <VbenScrollbar
-      :style="extraContentStyle"
-      class="border-border py-2"
-      shadow
-      shadow-border
+    <div
+      class="h-full"
+      :class="[
+        theme,
+        {
+          'bg-sidebar-deep': isSidebarMixed,
+          'border-r border-border bg-sidebar': !isSidebarMixed,
+        },
+      ]"
+      :style="{ width: `${width}px` }"
     >
-      <slot name="extra"></slot>
-    </VbenScrollbar>
-  </div>
+      <SidebarFixedButton
+        v-if="!collapse && !isSidebarMixed && showFixedButton"
+        v-model:expand-on-hover="expandOnHover"
+      />
+      <div v-if="slots.logo" :style="headerStyle">
+        <slot name="logo"></slot>
+      </div>
+      <VbenScrollbar :style="contentStyle" shadow shadow-border>
+        <slot></slot>
+      </VbenScrollbar>
+
+      <div :style="collapseStyle"></div>
+      <SidebarCollapseButton
+        v-if="showCollapseButton && !isSidebarMixed"
+        v-model:collapsed="collapse"
+      />
+    </div>
+    <div
+      v-if="isSidebarMixed"
+      ref="asideRef"
+      :class="[
+        themeSub,
+        {
+          'border-l': extraVisible,
+        },
+      ]"
+      :style="extraStyle"
+      class="fixed top-0 h-full overflow-hidden border-r border-border bg-sidebar transition-all duration-200"
+    >
+      <SidebarCollapseButton
+        v-if="isSidebarMixed && expandOnHover"
+        v-model:collapsed="extraCollapse"
+      />
+
+      <SidebarFixedButton
+        v-if="!extraCollapse"
+        v-model:expand-on-hover="expandOnHover"
+      />
+      <div v-if="!extraCollapse" :style="extraTitleStyle" class="pl-2">
+        <slot name="extra-title"></slot>
+      </div>
+      <VbenScrollbar
+        :style="extraContentStyle"
+        class="border-border py-2"
+        shadow
+        shadow-border
+      >
+        <slot name="extra"></slot>
+      </VbenScrollbar>
+    </div>
+  </aside>
 </template>