From 7969ee87094a2962d29962f5785b32bdf598f40d Mon Sep 17 00:00:00 2001
From: jingrow <support@jingrow.com>
Date: Wed, 21 Jan 2026 12:50:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=B3=E4=B8=8A=E8=A7=92=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=8C=BA=E5=9F=9F=E7=A7=BB=E5=88=B0=E5=B7=A6?=
 =?UTF-8?q?=E8=BE=B9=E6=A0=8F=E5=BA=95=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/layouts/AppHeader.vue      |  4 --
 src/app/layouts/AppSidebar.vue     | 13 +++++
 src/shared/components/UserMenu.vue | 88 +++++++++++++++++++++++-------
 3 files changed, 81 insertions(+), 24 deletions(-)

diff --git a/src/app/layouts/AppHeader.vue b/src/app/layouts/AppHeader.vue
index 31646d0..40dc7f3 100644
--- a/src/app/layouts/AppHeader.vue
+++ b/src/app/layouts/AppHeader.vue
@@ -43,9 +43,6 @@
             <Icon icon="tabler:search" />
           </template>
         </n-input>
-
-        <!-- 用户菜单 -->
-        <UserMenu />
       </n-space>
     </div>
   </div>
@@ -58,7 +55,6 @@ import { NButton, NBreadcrumb, NBreadcrumbItem, NSpace, NInput } from 'naive-ui'
 import { Icon } from '@iconify/vue'
 import { useAuthStore } from '../../shared/stores/auth'
 import { t } from '../../shared/i18n'
-import UserMenu from '../../shared/components/UserMenu.vue'
 
 const router = useRouter()
 const route = useRoute()
diff --git a/src/app/layouts/AppSidebar.vue b/src/app/layouts/AppSidebar.vue
index 1249d13..60f6b40 100644
--- a/src/app/layouts/AppSidebar.vue
+++ b/src/app/layouts/AppSidebar.vue
@@ -21,6 +21,11 @@
         @update:value="handleMenuSelect"
       />
     </div>
+
+    <!-- 用户菜单区域 -->
+    <div class="sidebar-footer">
+      <UserMenu :collapsed="collapsed" />
+    </div>
   </div>
 </template>
 
@@ -32,6 +37,7 @@ import { t } from '../../shared/i18n'
 import { useMenuStore, type AppMenuItem } from '../../shared/stores/menu'
 import { pageTypeToSlug } from '../../shared/utils/slug'
 import DynamicIcon from '../../core/components/DynamicIcon.vue'
+import UserMenu from '../../shared/components/UserMenu.vue'
 
 interface Props {
   collapsed: boolean
@@ -210,4 +216,11 @@ const handleMenuSelect = (key: string) => {
   color: #18a058 !important;
   transform: scale(1.1);
 }
+
+/* 侧边栏底部用户菜单区域 */
+.sidebar-footer {
+  flex-shrink: 0;
+  padding: 12px;
+  border-top: 1px solid var(--border-color);
+}
 </style>
diff --git a/src/shared/components/UserMenu.vue b/src/shared/components/UserMenu.vue
index 1d3335b..f1f8497 100644
--- a/src/shared/components/UserMenu.vue
+++ b/src/shared/components/UserMenu.vue
@@ -1,31 +1,52 @@
 <template>
-  <n-dropdown
-    trigger="click"
-    :options="userMenuOptions"
-    @select="handleUserMenuSelect"
-    class="user-menu-dropdown"
-  >
-    <n-button quaternary>
-      <n-avatar
-        round
-        size="small"
-      >
-        {{ user?.user?.charAt(0).toUpperCase() }}
-      </n-avatar>
-      <span class="username">{{ user?.user }}</span>
-      <Icon icon="tabler:chevron-down" />
-    </n-button>
-  </n-dropdown>
+  <div class="user-menu-wrapper">
+    <n-dropdown
+      trigger="click"
+      placement="top-start"
+      :options="userMenuOptions"
+      @select="handleUserMenuSelect"
+      :show-arrow="false"
+    >
+      <n-button quaternary block :class="{ 'collapsed-button': collapsed }">
+        <template v-if="collapsed">
+          <n-avatar
+            round
+            size="small"
+          >
+            {{ user?.user?.charAt(0).toUpperCase() }}
+          </n-avatar>
+        </template>
+        <template v-else>
+          <n-space align="center" :wrap="false" style="width: 100%">
+            <n-avatar
+              round
+              size="small"
+            >
+              {{ user?.user?.charAt(0).toUpperCase() }}
+            </n-avatar>
+            <span class="username">{{ user?.user }}</span>
+            <Icon icon="tabler:chevron-up" style="margin-left: auto" />
+          </n-space>
+        </template>
+      </n-button>
+    </n-dropdown>
+  </div>
 </template>
 
 <script setup lang="ts">
 import { computed, h } from 'vue'
 import { useRouter } from 'vue-router'
-import { NButton, NDropdown, NAvatar, useMessage } from 'naive-ui'
+import { NButton, NDropdown, NAvatar, NSpace, useMessage } from 'naive-ui'
 import { Icon } from '@iconify/vue'
 import { useAuthStore } from '../stores/auth'
 import { t } from '../i18n'
 
+interface Props {
+  collapsed?: boolean
+}
+
+defineProps<Props>()
+
 const router = useRouter()
 const message = useMessage()
 const authStore = useAuthStore()
@@ -71,9 +92,29 @@ const handleUserMenuSelect = async (key: string) => {
 </script>
 
 <style scoped>
+.user-menu-wrapper {
+  width: 100%;
+}
+
 .username {
-  margin-left: 8px;
+  flex: 1;
+  text-align: left;
   font-weight: 500;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+:deep(.n-button) {
+  padding: 8px 12px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+/* 折叠状态下的按钮样式 */
+:deep(.collapsed-button) {
+  padding: 4px !important;
 }
 
 /* 移动端隐藏用户名文字 */
@@ -86,7 +127,14 @@ const handleUserMenuSelect = async (key: string) => {
 
 <style>
 .n-dropdown-menu {
-  margin: 6px 12px !important;
+  width: auto !important;
+  min-width: 216px !important; /* 240px - 24px padding */
+}
+
+/* 侧边栏折叠时的下拉菜单宽度 */
+.n-layout-sider--collapsed .sidebar-footer + * .n-dropdown-menu,
+body:has(.n-layout-sider--collapsed) .sidebar-footer .n-dropdown-menu {
+  min-width: 40px !important; /* 64px - 24px padding */
 }
 </style>