Merge branch 'fork/Lmx1220/main'

# Conflicts: # pnpm-lock.yaml
2026-03-15 03:53:43 +08:00
parent e39a432210 556a3c0fab
commit 1f2df3e944
10 changed files with 79 additions and 44 deletions
--- a/packages/@core/ui-kit/layout-ui/src/components/layout-sidebar.vue
+++ b/packages/@core/ui-kit/layout-ui/src/components/layout-sidebar.vue
@@ -307,14 +307,14 @@ onUnmounted(() => {
  <aside
    ref="asideRef"
    :style="style"
-    class="fixed top-0 left-0 h-full transition-all duration-150"
+    class="fixed left-0 top-0 h-full transition-all duration-150"
+    :class="theme"
    @mouseenter="handleMouseenter"
    @mouseleave="handleMouseleave"
  >
    <div
      class="h-full"
      :class="[
-        theme,
        {
          'bg-sidebar-deep': isSidebarMixed,
          'border-r border-border bg-sidebar': !isSidebarMixed,