From 4b042f2a0bc71bf93fdb02a408d9404596cc3001 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Thu, 13 Feb 2025 21:28:46 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20:recycle:=20=E5=AF=BC=E8=88=AA?=
 =?UTF-8?q?=E6=A0=8F=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../NavBar/components/NavbarRight.vue         | 75 ++++++++++++++++---
 .../NavBar/components/UserProfile.vue         | 62 ---------------
 src/layout/components/Sidebar/index.vue       |  2 +-
 src/layout/index.vue                          |  4 +-
 4 files changed, 68 insertions(+), 75 deletions(-)
 delete mode 100644 src/layout/components/NavBar/components/UserProfile.vue

diff --git a/src/layout/components/NavBar/components/NavbarRight.vue b/src/layout/components/NavBar/components/NavbarRight.vue
index b5693a96..a1489693 100644
--- a/src/layout/components/NavBar/components/NavbarRight.vue
+++ b/src/layout/components/NavBar/components/NavbarRight.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="navbar__right">
-    <!-- 非手机设备（窄屏）才显示 -->
-    <template v-if="!isMobile">
+    <!-- 桌面端显示 -->
+    <template v-if="isDesktop">
       <!-- 搜索 -->
       <MenuSearch />
 
@@ -19,7 +19,22 @@
     </template>
 
     <!-- 用户头像（个人中心、注销登录等） -->
-    <UserProfile />
+    <el-dropdown trigger="click">
+      <div class="user-profile">
+        <img class="user-profile__avatar" :src="userStore.userInfo.avatar" />
+        <span class="user-profile__name">{{ userStore.userInfo.username }}</span>
+      </div>
+      <template #dropdown>
+        <el-dropdown-menu>
+          <el-dropdown-item @click="handleProfileClick">
+            {{ $t("navbar.profile") }}
+          </el-dropdown-item>
+          <el-dropdown-item divided @click="logout">
+            {{ $t("navbar.logout") }}
+          </el-dropdown-item>
+        </el-dropdown-menu>
+      </template>
+    </el-dropdown>
 
     <!-- 设置面板 -->
     <div v-if="defaultSettings.showSettings" @click="settingStore.settingsVisible = true">
@@ -30,16 +45,43 @@
 <script setup lang="ts">
 import defaultSettings from "@/settings";
 import { DeviceEnum } from "@/enums/DeviceEnum";
+import { useAppStore, useSettingsStore, useUserStore, useTagsViewStore } from "@/store";
 
-import { useAppStore, useSettingsStore } from "@/store";
-
-import UserProfile from "./UserProfile.vue";
 import Notification from "./Notification.vue";
 
 const appStore = useAppStore();
 const settingStore = useSettingsStore();
+const userStore = useUserStore();
 
-const isMobile = computed(() => appStore.device === DeviceEnum.MOBILE);
+const isDesktop = computed(() => appStore.device === DeviceEnum.DESKTOP);
+
+/**
+ * 打开个人中心页面
+ */
+function handleProfileClick() {
+  useRouter().push({ name: "Profile" });
+}
+
+/**
+ * 注销登出
+ */
+function logout() {
+  ElMessageBox.confirm("确定注销并退出系统吗？", "提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning",
+    lockScroll: false,
+  }).then(() => {
+    userStore
+      .logout()
+      .then(() => {
+        useTagsViewStore().delAllViews();
+      })
+      .then(() => {
+        useRouter().push(`/login?redirect=${useRoute().fullPath}`);
+      });
+  });
+}
 </script>
 
 <style lang="scss" scoped>
@@ -61,10 +103,23 @@ const isMobile = computed(() => appStore.device === DeviceEnum.MOBILE);
       background: rgb(0 0 0 / 10%);
     }
   }
-}
+  .user-profile {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 100%;
+    padding: 0 13px;
 
-:deep(.el-divider--horizontal) {
-  margin: 10px 0;
+    &__avatar {
+      width: 32px;
+      height: 32px;
+      border-radius: 50%;
+    }
+
+    &__name {
+      margin-left: 10px;
+    }
+  }
 }
 
 .layout-top .navbar__right > *,
diff --git a/src/layout/components/NavBar/components/UserProfile.vue b/src/layout/components/NavBar/components/UserProfile.vue
deleted file mode 100644
index 670a386d..00000000
--- a/src/layout/components/NavBar/components/UserProfile.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<template>
-  <el-dropdown trigger="click">
-    <div class="flex-center h100% p13px">
-      <img :src="userStore.userInfo.avatar" class="rounded-full mr10px w24px h24px" />
-      <span>{{ userStore.userInfo.username }}</span>
-    </div>
-    <template #dropdown>
-      <el-dropdown-menu>
-        <el-dropdown-item @click="handleOpenUserProfile">
-          {{ $t("navbar.profile") }}
-        </el-dropdown-item>
-        <el-dropdown-item divided @click="logout">
-          {{ $t("navbar.logout") }}
-        </el-dropdown-item>
-      </el-dropdown-menu>
-    </template>
-  </el-dropdown>
-</template>
-
-<script setup lang="ts">
-defineOptions({
-  name: "UserProfile",
-});
-
-import { useTagsViewStore, useUserStore } from "@/store";
-
-const tagsViewStore = useTagsViewStore();
-const userStore = useUserStore();
-
-const route = useRoute();
-const router = useRouter();
-
-/**
- * 打开个人中心页面
- */
-function handleOpenUserProfile() {
-  router.push({ name: "Profile" });
-}
-
-/**
- * 注销登出
- */
-function logout() {
-  ElMessageBox.confirm("确定注销并退出系统吗？", "提示", {
-    confirmButtonText: "确定",
-    cancelButtonText: "取消",
-    type: "warning",
-    lockScroll: false,
-  }).then(() => {
-    userStore
-      .logout()
-      .then(() => {
-        tagsViewStore.delAllViews();
-      })
-      .then(() => {
-        router.push(`/login?redirect=${route.fullPath}`);
-      });
-  });
-}
-</script>
-
-<style lang="scss" scoped></style>
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 0d0108ac..c1dd1144 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -24,7 +24,7 @@
 import { LayoutEnum } from "@/enums/LayoutEnum";
 import { useSettingsStore, usePermissionStore, useAppStore } from "@/store";
 
-import NavbarRight from "../NavBar/components/NavbarRight.vue";
+import NavbarRight from "../Navbar/components/NavbarRight.vue";
 
 const appStore = useAppStore();
 const settingsStore = useSettingsStore();
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 1f709c5a..3476e2f4 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -34,7 +34,7 @@
 
     <!-- 左侧和顶部布局 -->
     <div v-else :class="{ hasTagsView: isShowTagsView }" class="main-container">
-      <NavBar v-if="layout === LayoutEnum.LEFT" />
+      <Navbar v-if="layout === LayoutEnum.LEFT" />
       <TagsView v-if="isShowTagsView" />
       <AppMain />
       <Settings v-if="defaultSettings.showSettings" />
@@ -52,7 +52,7 @@ import defaultSettings from "@/settings";
 import { DeviceEnum } from "@/enums/DeviceEnum";
 import { LayoutEnum } from "@/enums/LayoutEnum";
 
-import NavBar from "./components/NavBar/index.vue";
+import Navbar from "./components/Navbar/index.vue";
 
 const appStore = useAppStore();
 const settingsStore = useSettingsStore();