From d7e3a153dc97752b3a3e95988dba843ed7437653 Mon Sep 17 00:00:00 2001
From: Asoka <iiloli@88.com>
Date: Wed, 4 Jun 2025 17:36:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E6=A0=8F=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/navBars/topBar/user.vue | 74 +++++++++++-------------------
 src/stores/themeConfig.ts          |  2 +-
 2 files changed, 28 insertions(+), 48 deletions(-)

diff --git a/src/layout/navBars/topBar/user.vue b/src/layout/navBars/topBar/user.vue
index 700a7fc..305063a 100644
--- a/src/layout/navBars/topBar/user.vue
+++ b/src/layout/navBars/topBar/user.vue
@@ -1,51 +1,6 @@
 <template>
   <div class="layout-navbars-breadcrumb-user pr15" :style="{ flex: layoutUserFlexNum }">
-    <el-dropdown :show-timeout="70" :hide-timeout="50" trigger="click" @command="onComponentSizeChange">
-      <div class="layout-navbars-breadcrumb-user-icon">
-        <i class="iconfont icon-ziti" :title="$t('message.user.title0')"></i>
-      </div>
-      <template #dropdown>
-        <el-dropdown-menu>
-          <el-dropdown-item command="large" :disabled="state.disabledSize === 'large'">{{ $t('message.user.dropdownLarge') }}</el-dropdown-item>
-          <el-dropdown-item command="default" :disabled="state.disabledSize === 'default'">{{ $t('message.user.dropdownDefault') }}</el-dropdown-item>
-          <el-dropdown-item command="small" :disabled="state.disabledSize === 'small'">{{ $t('message.user.dropdownSmall') }}</el-dropdown-item>
-        </el-dropdown-menu>
-      </template>
-    </el-dropdown>
-    <el-dropdown :show-timeout="70" :hide-timeout="50" trigger="click" @command="onLanguageChange">
-      <div class="layout-navbars-breadcrumb-user-icon">
-        <i class="iconfont icon-diqiu" :title="$t('message.user.title1')"></i>
-      </div>
-      <template #dropdown>
-        <el-dropdown-menu>
-          <el-dropdown-item command="zh-cn" :disabled="state.disabledI18n === 'zh-cn'">简体中文</el-dropdown-item>
-          <el-dropdown-item command="en" :disabled="state.disabledI18n === 'en'">English</el-dropdown-item>
-          <el-dropdown-item command="zh-tw" :disabled="state.disabledI18n === 'zh-tw'">繁體中文</el-dropdown-item>
-        </el-dropdown-menu>
-      </template>
-    </el-dropdown>
-    <div class="layout-navbars-breadcrumb-user-icon" @click="onSearchClick">
-      <el-icon :title="$t('message.user.title2')">
-        <ele-Search />
-      </el-icon>
-    </div>
-    <div class="layout-navbars-breadcrumb-user-icon" @click="onLayoutSetingClick">
-      <i class="icon-skin iconfont" :title="$t('message.user.title3')"></i>
-    </div>
-    <div class="layout-navbars-breadcrumb-user-icon" @click="onMsgClick">
-      <el-badge :is-dot="state.unread">
-        <el-icon :title="$t('message.user.title4')">
-          <ele-Bell />
-        </el-icon>
-      </el-badge>
-    </div>
-    <div class="layout-navbars-breadcrumb-user-icon mr10" @click="onScreenfullClick">
-      <i
-        class="iconfont"
-        :title="state.isScreenfull ? $t('message.user.title6') : $t('message.user.title5')"
-        :class="!state.isScreenfull ? 'icon-fullscreen' : 'icon-tuichuquanping'"
-      ></i>
-    </div>
+
     <el-dropdown :show-timeout="70" :hide-timeout="50" @command="onHandleCommandClick">
       <span class="layout-navbars-breadcrumb-user-link">
         <img :src="avatar" class="layout-navbars-breadcrumb-user-link-photo mr5" />
@@ -56,13 +11,34 @@
       </span>
       <template #dropdown>
         <el-dropdown-menu>
-          <el-dropdown-item command="/platform/workbench">{{ $t('工作台') }}</el-dropdown-item>
           <el-dropdown-item command="/personal">{{ $t('message.user.dropdown2') }}</el-dropdown-item>
           <el-dropdown-item command="/site-msg">{{ $t('站内信') }}</el-dropdown-item>
           <el-dropdown-item divided command="logOut">{{ $t('message.user.dropdown5') }}</el-dropdown-item>
         </el-dropdown-menu>
       </template>
     </el-dropdown>
+
+    <el-dropdown :show-timeout="70" :hide-timeout="50" trigger="click" @command="onLanguageChange">
+      <div class="layout-navbars-breadcrumb-user-icon">
+        <i class="iconfont icon-diqiu" :title="$t('message.user.title1')"></i>
+        <span class="current-lang">{{ state.disabledI18n === 'zh-cn' ? '简体中文' : state.disabledI18n === 'en' ? 'English' : '繁體中文' }}</span>
+      </div>
+      <template #dropdown>
+        <el-dropdown-menu>
+          <el-dropdown-item command="zh-cn" :disabled="state.disabledI18n === 'zh-cn'">简体中文</el-dropdown-item>
+          <el-dropdown-item command="en" :disabled="state.disabledI18n === 'en'">English</el-dropdown-item>
+          <el-dropdown-item command="zh-tw" :disabled="state.disabledI18n === 'zh-tw'">繁體中文</el-dropdown-item>
+        </el-dropdown-menu>
+      </template>
+    </el-dropdown>
+
+    <div class="layout-navbars-breadcrumb-user-icon" @click="onMsgClick">
+      <el-badge :is-dot="state.unread">
+        <el-icon :title="$t('message.user.title4')">
+          <ele-Bell />
+        </el-icon>
+      </el-badge>
+    </div>
     <Search ref="searchRef" />
     <Msg ref="msgRef" />
   </div>
@@ -277,6 +253,10 @@ onMounted(() => {
         animation: logoAnimation 0.3s ease-in-out;
       }
     }
+    gap: 5px;
+    .current-lang {
+      font-size: 14px;
+    }
   }
   :deep(.el-dropdown) {
     color: var(--next-bg-topBarColor);
diff --git a/src/stores/themeConfig.ts b/src/stores/themeConfig.ts
index d5de45b..abd7d92 100644
--- a/src/stores/themeConfig.ts
+++ b/src/stores/themeConfig.ts
@@ -119,7 +119,7 @@ export const useThemeConfig = defineStore('themeConfig', {
       // 分栏高亮风格：可选值"<columns-round|columns-card>"，默认 columns-round
       columnsAsideStyle: 'columns-round',
       // 分栏布局风格：可选值"<columns-horizontal|columns-vertical>"，默认 columns-horizontal
-      columnsAsideLayout: 'columns-vertical',
+      columnsAsideLayout: 'columns-horizontal',
 
       /**
        * 布局切换