From a2fd2b0e750888fa01a4f083e2241e7c11f59f72 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Wed, 30 Oct 2024 00:32:50 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20:recycle:=20=E5=AF=BC=E8=88=AA?=
 =?UTF-8?q?=E6=A0=8F=E7=BB=84=E4=BB=B6=E4=BB=A3=E7=A0=81=E9=87=8D=E6=9E=84?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Fullscreen/index.vue           |  11 ++
 src/components/Hamburger/index.vue            |   5 +-
 src/components/SizeSelect/index.vue           |  41 ++---
 .../NavBar/components/NavbarAction.vue        | 143 ------------------
 .../NavBar/components/NavbarRight.vue         |  81 ++++++++++
 .../NavBar/components/Notification.vue}       |   0
 .../NavBar/components/UserProfile.vue         |  74 +++++++++
 src/layout/components/NavBar/index.vue        |  29 ++--
 src/layout/components/Sidebar/index.vue       |  23 ++-
 src/layout/index.vue                          |   2 +-
 10 files changed, 227 insertions(+), 182 deletions(-)
 create mode 100644 src/components/Fullscreen/index.vue
 delete mode 100644 src/layout/components/NavBar/components/NavbarAction.vue
 create mode 100644 src/layout/components/NavBar/components/NavbarRight.vue
 rename src/{components/Notice/index.vue => layout/components/NavBar/components/Notification.vue} (100%)
 create mode 100644 src/layout/components/NavBar/components/UserProfile.vue

diff --git a/src/components/Fullscreen/index.vue b/src/components/Fullscreen/index.vue
new file mode 100644
index 00000000..bd85b4b4
--- /dev/null
+++ b/src/components/Fullscreen/index.vue
@@ -0,0 +1,11 @@
+<template>
+  <div @click="toggle">
+    <svg-icon :icon-class="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
+  </div>
+</template>
+
+<script setup lang="ts">
+const { isFullscreen, toggle } = useFullscreen();
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/components/Hamburger/index.vue b/src/components/Hamburger/index.vue
index 6ab2eb6d..c43073a2 100644
--- a/src/components/Hamburger/index.vue
+++ b/src/components/Hamburger/index.vue
@@ -1,15 +1,16 @@
+<!-- 汉堡按钮组件：展开/收缩菜单  -->
 <template>
   <div
     class="px-[15px] flex items-center justify-center color-[var(--el-text-color-regular)]"
     @click="toggleClick"
   >
     <svg-icon
-      class="hamburger"
-      :class="{ 'is-active': isActive }"
       icon-class="collapse"
+      :class="{ hamburger: true, 'is-active': isActive }"
     />
   </div>
 </template>
+
 <script setup lang="ts">
 defineProps({
   isActive: {
diff --git a/src/components/SizeSelect/index.vue b/src/components/SizeSelect/index.vue
index d3e83fe5..8c0f538c 100644
--- a/src/components/SizeSelect/index.vue
+++ b/src/components/SizeSelect/index.vue
@@ -1,21 +1,28 @@
 <template>
-  <el-dropdown trigger="click" @command="handleSizeChange">
-    <div>
-      <svg-icon icon-class="size" />
-    </div>
-    <template #dropdown>
-      <el-dropdown-menu>
-        <el-dropdown-item
-          v-for="item of sizeOptions"
-          :key="item.value"
-          :disabled="appStore.size == item.value"
-          :command="item.value"
-        >
-          {{ item.label }}
-        </el-dropdown-item>
-      </el-dropdown-menu>
-    </template>
-  </el-dropdown>
+  <!-- 布局大小 -->
+  <el-tooltip
+    :content="$t('sizeSelect.tooltip')"
+    effect="dark"
+    placement="bottom"
+  >
+    <el-dropdown trigger="click" @command="handleSizeChange">
+      <div>
+        <svg-icon icon-class="size" />
+      </div>
+      <template #dropdown>
+        <el-dropdown-menu>
+          <el-dropdown-item
+            v-for="item of sizeOptions"
+            :key="item.value"
+            :disabled="appStore.size == item.value"
+            :command="item.value"
+          >
+            {{ item.label }}
+          </el-dropdown-item>
+        </el-dropdown-menu>
+      </template>
+    </el-dropdown>
+  </el-tooltip>
 </template>
 
 <script setup lang="ts">
diff --git a/src/layout/components/NavBar/components/NavbarAction.vue b/src/layout/components/NavBar/components/NavbarAction.vue
deleted file mode 100644
index 9d721b6b..00000000
--- a/src/layout/components/NavBar/components/NavbarAction.vue
+++ /dev/null
@@ -1,143 +0,0 @@
-<template>
-  <div class="flex">
-    <template v-if="!isMobile">
-      <!--搜索 -->
-      <menu-search />
-      <!--全屏 -->
-      <div class="nav-action-item" @click="toggle">
-        <svg-icon
-          :icon-class="isFullscreen ? 'fullscreen-exit' : 'fullscreen'"
-        />
-      </div>
-
-      <!-- 布局大小 -->
-      <el-tooltip
-        :content="$t('sizeSelect.tooltip')"
-        effect="dark"
-        placement="bottom"
-      >
-        <size-select class="nav-action-item" />
-      </el-tooltip>
-
-      <!-- 语言选择 -->
-      <lang-select class="nav-action-item" />
-
-      <!-- 消息通知 -->
-      <notice class="nav-action-item" />
-    </template>
-
-    <!-- 用户头像 -->
-    <el-dropdown class="nav-action-item" trigger="click">
-      <div class="flex-center h100% p10px">
-        <img
-          :src="userStore.userInfo.avatar"
-          class="rounded-full mr-10px w24px h24px"
-        />
-        <span>{{ userStore.userInfo.username }}</span>
-      </div>
-      <template #dropdown>
-        <el-dropdown-menu>
-          <el-dropdown-item @click="handleOpenUserProfile">
-            {{ $t("navbar.profile") }}
-          </el-dropdown-item>
-          <a
-            target="_blank"
-            href="https://gitee.com/youlaiorg/vue3-element-admin"
-          >
-            <el-dropdown-item>{{ $t("navbar.gitee") }}</el-dropdown-item>
-          </a>
-          <a target="_blank" href="https://juejin.cn/post/7228990409909108793">
-            <el-dropdown-item>{{ $t("navbar.document") }}</el-dropdown-item>
-          </a>
-          <el-dropdown-item divided @click="logout">
-            {{ $t("navbar.logout") }}
-          </el-dropdown-item>
-        </el-dropdown-menu>
-      </template>
-    </el-dropdown>
-
-    <!-- 设置 -->
-    <template v-if="defaultSettings.showSettings">
-      <div class="nav-action-item" @click="settingStore.settingsVisible = true">
-        <svg-icon icon-class="setting" />
-      </div>
-    </template>
-  </div>
-</template>
-<script setup lang="ts">
-import defaultSettings from "@/settings";
-import { DeviceEnum } from "@/enums/DeviceEnum";
-
-import {
-  useAppStore,
-  useTagsViewStore,
-  useUserStore,
-  useSettingsStore,
-} from "@/store";
-
-const appStore = useAppStore();
-const tagsViewStore = useTagsViewStore();
-const userStore = useUserStore();
-const settingStore = useSettingsStore();
-
-const route = useRoute();
-const router = useRouter();
-const { isFullscreen, toggle } = useFullscreen();
-const isMobile = computed(() => appStore.device === DeviceEnum.MOBILE);
-
-/**
- * 打开个人中心页面
- */
-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>
-.nav-action-item {
-  display: inline-block;
-  min-width: 40px;
-  height: $navbar-height;
-  line-height: $navbar-height;
-  color: var(--el-text-color);
-  text-align: center;
-  cursor: pointer;
-
-  &:hover {
-    background: rgb(0 0 0 / 10%);
-  }
-}
-
-:deep(.el-divider--horizontal) {
-  margin: 10px 0;
-}
-
-.dark .nav-action-item:hover {
-  background: rgb(255 255 255 / 20%);
-}
-
-.layout-top .nav-action-item,
-.layout-mix .nav-action-item {
-  color: #fff;
-}
-</style>
diff --git a/src/layout/components/NavBar/components/NavbarRight.vue b/src/layout/components/NavBar/components/NavbarRight.vue
new file mode 100644
index 00000000..1b0ef528
--- /dev/null
+++ b/src/layout/components/NavBar/components/NavbarRight.vue
@@ -0,0 +1,81 @@
+<template>
+  <div class="navbar__right">
+    <!-- 手机设备（窄屏）不显示 -->
+    <template v-if="!isMobile">
+      <!-- 搜索 -->
+      <MenuSearch />
+
+      <!-- 全屏 -->
+      <Fullscreen />
+
+      <!-- 布局大小 -->
+      <SizeSelect />
+
+      <!-- 语言选择 -->
+      <LangSelect />
+
+      <!-- 消息通知 -->
+      <Notification />
+    </template>
+
+    <!-- 用户头像（个人中心、注销登录等） -->
+    <UserProfile />
+
+    <!-- 设置面板 -->
+    <div
+      v-if="defaultSettings.showSettings"
+      @click="settingStore.settingsVisible = true"
+    >
+      <SvgIcon icon-class="setting" />
+    </div>
+  </div>
+</template>
+<script setup lang="ts">
+import defaultSettings from "@/settings";
+import { DeviceEnum } from "@/enums/DeviceEnum";
+
+import { useAppStore, useSettingsStore } from "@/store";
+
+import UserProfile from "./UserProfile.vue";
+import Notification from "./Notification.vue";
+
+const appStore = useAppStore();
+const settingStore = useSettingsStore();
+
+const isMobile = computed(() => appStore.device === DeviceEnum.MOBILE);
+</script>
+
+<style lang="scss" scoped>
+.navbar__right {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  & > * {
+    display: inline-block;
+    min-width: 40px;
+    height: $navbar-height;
+    line-height: $navbar-height;
+    color: var(--el-text-color);
+    text-align: center;
+    cursor: pointer;
+
+    &:hover {
+      background: rgb(0 0 0 / 10%);
+    }
+  }
+}
+
+:deep(.el-divider--horizontal) {
+  margin: 10px 0;
+}
+
+.dark .navbar__right > *:hover {
+  background: rgb(255 255 255 / 20%);
+}
+
+.layout-top .navbar__right > *,
+.layout-mix .navbar__right > * {
+  color: #fff;
+}
+</style>
diff --git a/src/components/Notice/index.vue b/src/layout/components/NavBar/components/Notification.vue
similarity index 100%
rename from src/components/Notice/index.vue
rename to src/layout/components/NavBar/components/Notification.vue
diff --git a/src/layout/components/NavBar/components/UserProfile.vue b/src/layout/components/NavBar/components/UserProfile.vue
new file mode 100644
index 00000000..ccf8911b
--- /dev/null
+++ b/src/layout/components/NavBar/components/UserProfile.vue
@@ -0,0 +1,74 @@
+<template>
+  <el-dropdown trigger="click">
+    <div class="flex-center h100% p13px">
+      <img
+        :src="userStore.userInfo.avatar"
+        class="rounded-full mr-10px w24px h24px"
+      />
+      <span>{{ userStore.userInfo.username }}</span>
+    </div>
+    <template #dropdown>
+      <el-dropdown-menu>
+        <el-dropdown-item @click="handleOpenUserProfile">
+          {{ $t("navbar.profile") }}
+        </el-dropdown-item>
+        <a
+          target="_blank"
+          href="https://gitee.com/youlaiorg/vue3-element-admin"
+        >
+          <el-dropdown-item>{{ $t("navbar.gitee") }}</el-dropdown-item>
+        </a>
+        <a target="_blank" href="https://juejin.cn/post/7228990409909108793">
+          <el-dropdown-item>{{ $t("navbar.document") }}</el-dropdown-item>
+        </a>
+        <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/NavBar/index.vue b/src/layout/components/NavBar/index.vue
index c985c0b9..9e8c61a5 100644
--- a/src/layout/components/NavBar/index.vue
+++ b/src/layout/components/NavBar/index.vue
@@ -1,15 +1,13 @@
 <template>
-  <div class="navbar-container">
-    <!-- 导航栏面包屑 -->
-    <div class="flex">
-      <hamburger
-        :is-active="appStore.sidebar.opened"
-        @toggle-click="toggleSideBar"
-      />
+  <div class="navbar">
+    <div class="navbar__left">
+      <!-- 展开/收缩菜单  -->
+      <Hamburger :is-active="isSidebarOpened" @toggle-click="toggleSideBar" />
+      <!-- 面包屑 -->
       <breadcrumb />
     </div>
     <!-- 导航栏右侧 -->
-    <NavbarAction />
+    <NavbarRight />
   </div>
 </template>
 
@@ -18,16 +16,25 @@ import { useAppStore } from "@/store";
 
 const appStore = useAppStore();
 
+// 侧边栏是否打开
+const isSidebarOpened = computed(() => appStore.sidebar.opened);
+
+// 展开/收缩菜单
 function toggleSideBar() {
   appStore.toggleSidebar();
 }
 </script>
 
 <style lang="scss" scoped>
-.navbar-container {
-  @apply flex-x-between;
-
+.navbar {
+  display: flex;
+  justify-content: space-between;
   height: $navbar-height;
   background: var(--el-bg-color);
+
+  &__left {
+    display: flex;
+    align-items: center;
+  }
 }
 </style>
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 67a3df09..cb3d90a4 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -1,25 +1,28 @@
 <template>
   <div :class="{ 'has-logo': sidebarLogo }">
-    <!-- 混合布局的顶部的Sidebar -->
-    <div v-if="layout == LayoutEnum.MIX" class="flex w-full">
-      <SidebarLogo v-if="sidebarLogo" :collapse="!appStore.sidebar.opened" />
+    <!-- 混合布局顶部  -->
+    <div v-if="isMixLayout" class="flex w-full">
+      <SidebarLogo v-if="sidebarLogo" :collapse="isSidebarCollapsed" />
       <SidebarMixTopMenu class="flex-1" />
-      <NavbarAction />
+      <NavbarRight />
     </div>
-    <!-- 左侧和顶部布局的Sidebar -->
+
+    <!-- 顶部布局顶部 || 左侧布局左侧 -->
     <template v-else>
-      <SidebarLogo v-if="sidebarLogo" :collapse="!appStore.sidebar.opened" />
+      <SidebarLogo v-if="sidebarLogo" :collapse="isSidebarCollapsed" />
       <el-scrollbar>
         <SidebarMenu :menu-list="permissionStore.routes" base-path="" />
       </el-scrollbar>
-      <NavbarAction v-if="layout === LayoutEnum.TOP" />
+
+      <!-- 顶部布局导航 -->
+      <NavbarRight v-if="isTopLayout" />
     </template>
   </div>
 </template>
 
 <script setup lang="ts">
-import { useSettingsStore, usePermissionStore, useAppStore } from "@/store";
 import { LayoutEnum } from "@/enums/LayoutEnum";
+import { useSettingsStore, usePermissionStore, useAppStore } from "@/store";
 
 const appStore = useAppStore();
 const settingsStore = useSettingsStore();
@@ -27,6 +30,10 @@ const permissionStore = usePermissionStore();
 
 const sidebarLogo = computed(() => settingsStore.sidebarLogo);
 const layout = computed(() => settingsStore.layout);
+
+const isMixLayout = computed(() => layout.value === LayoutEnum.MIX);
+const isTopLayout = computed(() => layout.value === LayoutEnum.TOP);
+const isSidebarCollapsed = computed(() => !appStore.sidebar.opened);
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 082f52e2..18e460b9 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -43,7 +43,7 @@
     <!-- 左侧和顶部布局 -->
     <div v-else :class="{ hasTagsView: showTagsView }" class="main-container">
       <div :class="{ 'fixed-header': fixedHeader }">
-        <NavBar v-if="layout === LayoutEnum.LEFT" />
+        <Navbar v-if="layout === LayoutEnum.LEFT" />
         <TagsView v-if="showTagsView" />
       </div>
       <AppMain />