From 221d2cc02dfdf3f78cb415f26c88f1f274942222 Mon Sep 17 00:00:00 2001
From: Soybean <2570172956@qq.com>
Date: Thu, 23 Sep 2021 00:15:19 +0800
Subject: [PATCH] =?UTF-8?q?feat(projects):=20=E6=96=B0=E5=A2=9E=E9=A1=B6?=
 =?UTF-8?q?=E9=83=A8=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/enum/index.ts                             |  2 +-
 src/enum/theme.ts                             |  8 ++++
 src/interface/index.ts                        |  2 +-
 src/interface/theme.ts                        | 13 +++++-
 .../GlobalHeader/components/HeaderMenu.vue    | 27 +++++++++++
 .../components/GlobalHeader/index.vue         |  8 ++--
 .../components/PageFunc/index.vue             | 46 +++++++++++--------
 src/layouts/BasicLayout/index.vue             |  9 +++-
 src/settings/theme.ts                         | 10 +++-
 src/store/modules/theme/index.ts              |  6 ++-
 10 files changed, 102 insertions(+), 29 deletions(-)
 create mode 100644 src/layouts/BasicLayout/components/GlobalHeader/components/HeaderMenu.vue

diff --git a/src/enum/index.ts b/src/enum/index.ts
index 9f8d223c..a127e29b 100644
--- a/src/enum/index.ts
+++ b/src/enum/index.ts
@@ -1,5 +1,5 @@
 export { ContentType, EnumDataType, EnumLoginModule } from './common';
 export { EnumAnimate } from './animate';
-export { EnumNavMode, EnumNavTheme, EnumMultiTabMode } from './theme';
+export { EnumNavMode, EnumNavTheme, EnumMultiTabMode, EnumHorizontalMenuPosition } from './theme';
 export { EnumRoutePath, EnumRouteTitle } from './route';
 export { EnumStorageKey } from './storage';
diff --git a/src/enum/theme.ts b/src/enum/theme.ts
index 3e28e371..5f577902 100644
--- a/src/enum/theme.ts
+++ b/src/enum/theme.ts
@@ -13,7 +13,15 @@ export enum EnumNavTheme {
   'header-dark' = '暗色的侧边栏和顶栏'
 }
 
+/** 多页签风格 */
 export enum EnumMultiTabMode {
   'button' = '按钮风格',
   'browser' = '浏览器风格'
 }
+
+/** 水平模式的菜单位置 */
+export enum EnumHorizontalMenuPosition {
+  'flex-start' = '居左',
+  'center' = '居中',
+  'flex-end' = '居右'
+}
diff --git a/src/interface/index.ts b/src/interface/index.ts
index 25227574..7244b1f0 100644
--- a/src/interface/index.ts
+++ b/src/interface/index.ts
@@ -1,3 +1,3 @@
 export { UserInfo } from './business';
-export { ThemeSettings, NavMode, MultiTabMode, AnimateType } from './theme';
+export { ThemeSettings, NavMode, MultiTabMode, AnimateType, HorizontalMenuPosition } from './theme';
 export { CustomRoute, RoutePathKey, GlobalMenuOption, LoginModuleType } from './common';
diff --git a/src/interface/theme.ts b/src/interface/theme.ts
index d25a40ff..962c637c 100644
--- a/src/interface/theme.ts
+++ b/src/interface/theme.ts
@@ -1,4 +1,4 @@
-import { EnumAnimate, EnumNavMode, EnumNavTheme, EnumMultiTabMode } from '@/enum';
+import { EnumAnimate, EnumNavMode, EnumNavTheme, EnumMultiTabMode, EnumHorizontalMenuPosition } from '@/enum';
 
 export interface ThemeSettings {
   /** 深色模式 */
@@ -56,6 +56,13 @@ interface HeaderStyle {
   bgColor: string;
 }
 
+export type HorizontalMenuPosition = keyof typeof EnumHorizontalMenuPosition;
+
+interface HorizontalMenuPositionList {
+  value: HorizontalMenuPosition;
+  label: EnumHorizontalMenuPosition;
+}
+
 interface MenuStyle {
   /** 菜单宽度 */
   width: number;
@@ -67,6 +74,10 @@ interface MenuStyle {
   fixed: boolean;
   /** 分割菜单 */
   splitMenu: boolean;
+  /** 水平模式的菜单的位置 */
+  horizontalPosition: HorizontalMenuPosition;
+  /** 水平模式的菜单的位置列表 */
+  horizontalPositionList: HorizontalMenuPositionList[];
 }
 
 export type MultiTabMode = keyof typeof EnumMultiTabMode;
diff --git a/src/layouts/BasicLayout/components/GlobalHeader/components/HeaderMenu.vue b/src/layouts/BasicLayout/components/GlobalHeader/components/HeaderMenu.vue
new file mode 100644
index 00000000..dd7385e3
--- /dev/null
+++ b/src/layouts/BasicLayout/components/GlobalHeader/components/HeaderMenu.vue
@@ -0,0 +1,27 @@
+<template>
+  <n-menu :value="activeKey" mode="horizontal" :options="menus" @update:value="handleUpdateMenu" />
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import type { MenuOption } from 'naive-ui';
+import { NMenu } from 'naive-ui';
+import { menus } from '@/router';
+import { GlobalMenuOption } from '@/interface';
+
+const router = useRouter();
+const route = useRoute();
+
+const activeKey = computed(() => getActiveKey());
+
+function getActiveKey() {
+  return route.name as string;
+}
+
+function handleUpdateMenu(key: string, item: MenuOption) {
+  const menuItem = item as GlobalMenuOption;
+  router.push(menuItem.routePath);
+}
+</script>
+<style scoped></style>
diff --git a/src/layouts/BasicLayout/components/GlobalHeader/index.vue b/src/layouts/BasicLayout/components/GlobalHeader/index.vue
index 9be19185..382e5f8d 100644
--- a/src/layouts/BasicLayout/components/GlobalHeader/index.vue
+++ b/src/layouts/BasicLayout/components/GlobalHeader/index.vue
@@ -5,11 +5,12 @@
       <div v-if="!theme.isVerticalNav" class="menu-width h-full">
         <global-logo />
       </div>
-      <div class="flex-y-center h-full">
+      <div class="flex-1-hidden flex-y-center h-full" :style="{ justifyContent: theme.menuStyle.horizontalPosition }">
         <menu-collapse v-if="theme.navStyle.mode !== 'horizontal'" />
-        <global-breadcrumb v-if="theme.crumbsStyle.visible" />
+        <global-breadcrumb v-if="theme.crumbsStyle.visible && theme.navStyle.mode !== 'horizontal'" />
+        <header-menu v-if="theme.navStyle.mode === 'horizontal'" />
       </div>
-      <div class="flex-1 flex justify-end h-full">
+      <div class="flex justify-end h-full">
         <gihub-site />
         <full-screen />
         <user-avatar />
@@ -25,6 +26,7 @@ import { NLayoutHeader } from 'naive-ui';
 import { useThemeStore } from '@/store';
 import { GlobalBreadcrumb, UserAvatar, MenuCollapse, FullScreen, GihubSite, SettingDrawerButton } from './components';
 import { GlobalLogo } from '../common';
+import HeaderMenu from './components/HeaderMenu.vue';
 
 defineProps({
   zIndex: {
diff --git a/src/layouts/BasicLayout/components/SettingDrawer/components/PageFunc/index.vue b/src/layouts/BasicLayout/components/SettingDrawer/components/PageFunc/index.vue
index b832e192..b13e8707 100644
--- a/src/layouts/BasicLayout/components/SettingDrawer/components/PageFunc/index.vue
+++ b/src/layouts/BasicLayout/components/SettingDrawer/components/PageFunc/index.vue
@@ -4,25 +4,13 @@
     <setting-menu-item label="分割菜单">
       <n-switch :value="theme.menuStyle.splitMenu" @update:value="handleSplitMenu" />
     </setting-menu-item>
-    <setting-menu-item label="固定头部和多页签">
-      <n-switch :value="splitMenu" :disabled="disabledSplitMenu" @update:value="handleFixedHeaderAndTab" />
-    </setting-menu-item>
-    <setting-menu-item label="头部高度">
-      <n-input-number
+    <setting-menu-item label="顶部菜单位置">
+      <n-select
         class="w-120px"
         size="small"
-        :value="theme.headerStyle.height"
-        :step="1"
-        @update:value="handleHeaderHeight"
-      />
-    </setting-menu-item>
-    <setting-menu-item label="多页签高度">
-      <n-input-number
-        class="w-120px"
-        size="small"
-        :value="theme.multiTabStyle.height"
-        :step="1"
-        @update:value="handleMultiTabHeight"
+        :value="theme.menuStyle.horizontalPosition"
+        :options="theme.menuStyle.horizontalPositionList"
+        @update:value="handleHorizontalMenuPosition"
       />
     </setting-menu-item>
     <setting-menu-item label="菜单展开宽度">
@@ -45,18 +33,40 @@
         @update:value="handleMixMenuWidth"
       />
     </setting-menu-item>
+    <setting-menu-item label="固定头部和多页签">
+      <n-switch :value="splitMenu" :disabled="disabledSplitMenu" @update:value="handleFixedHeaderAndTab" />
+    </setting-menu-item>
+    <setting-menu-item label="头部高度">
+      <n-input-number
+        class="w-120px"
+        size="small"
+        :value="theme.headerStyle.height"
+        :step="1"
+        @update:value="handleHeaderHeight"
+      />
+    </setting-menu-item>
+    <setting-menu-item label="多页签高度">
+      <n-input-number
+        class="w-120px"
+        size="small"
+        :value="theme.multiTabStyle.height"
+        :step="1"
+        @update:value="handleMultiTabHeight"
+      />
+    </setting-menu-item>
   </n-space>
 </template>
 
 <script lang="ts" setup>
 import { computed } from 'vue';
-import { NDivider, NSpace, NSwitch, NInputNumber } from 'naive-ui';
+import { NDivider, NSpace, NSwitch, NSelect, NInputNumber } from 'naive-ui';
 import { useThemeStore } from '@/store';
 import { SettingMenuItem } from '../common';
 
 const theme = useThemeStore();
 const {
   handleSplitMenu,
+  handleHorizontalMenuPosition,
   handleFixedHeaderAndTab,
   handleHeaderHeight,
   handleMultiTabHeight,
diff --git a/src/layouts/BasicLayout/index.vue b/src/layouts/BasicLayout/index.vue
index 48727696..547f13c4 100644
--- a/src/layouts/BasicLayout/index.vue
+++ b/src/layouts/BasicLayout/index.vue
@@ -1,7 +1,7 @@
 <template>
   <n-layout class="h-full" has-sider>
     <global-sider v-if="theme.isVerticalNav" :z-index="3" />
-    <global-header v-if="isHorizontalMix" :z-index="2" />
+    <global-header v-if="isHorizontalMix" :z-index="4" />
     <div class="flex-1-hidden flex h-full">
       <global-sider v-if="isHorizontalMix" class="sider-margin" :z-index="3" />
       <n-scrollbar
@@ -39,6 +39,11 @@ const { scrollbar, resetScrollBehavior } = useScrollBehavior();
 const routeProps = useRouteProps();
 
 const isHorizontalMix = computed(() => theme.navStyle.mode === 'horizontal-mix');
+
+const headerHeight = computed(() => {
+  const { height } = theme.headerStyle;
+  return `${height}px`;
+});
 const headerAndMultiTabHeight = computed(() => {
   const {
     headerStyle: { height: hHeight },
@@ -59,7 +64,7 @@ watch(
   z-index: 11;
 }
 .sider-margin {
-  margin-top: v-bind(headerAndMultiTabHeight);
+  margin-top: v-bind(headerHeight);
 }
 .content-padding {
   padding-top: v-bind(headerAndMultiTabHeight);
diff --git a/src/settings/theme.ts b/src/settings/theme.ts
index 35c3c201..fe06f8c9 100644
--- a/src/settings/theme.ts
+++ b/src/settings/theme.ts
@@ -1,5 +1,5 @@
 import type { ThemeSettings } from '../interface';
-import { EnumAnimate, EnumMultiTabMode } from '../enum';
+import { EnumAnimate, EnumMultiTabMode, EnumHorizontalMenuPosition } from '../enum';
 
 const themeColorList = [
   '#409EFF',
@@ -41,7 +41,13 @@ const themeSettings: ThemeSettings = {
     mixWidth: 80,
     collapsedWidth: 64,
     fixed: true,
-    splitMenu: false
+    splitMenu: false,
+    horizontalPosition: 'flex-start',
+    horizontalPositionList: [
+      { value: 'flex-start', label: EnumHorizontalMenuPosition['flex-start'] },
+      { value: 'center', label: EnumHorizontalMenuPosition.center },
+      { value: 'flex-end', label: EnumHorizontalMenuPosition['flex-end'] }
+    ]
   },
   headerStyle: {
     height: 56,
diff --git a/src/store/modules/theme/index.ts b/src/store/modules/theme/index.ts
index e64bbcac..bdab6fc0 100644
--- a/src/store/modules/theme/index.ts
+++ b/src/store/modules/theme/index.ts
@@ -2,7 +2,7 @@ import { defineStore } from 'pinia';
 import type { GlobalThemeOverrides } from 'naive-ui';
 import { themeSettings } from '@/settings';
 import { store } from '@/store';
-import type { ThemeSettings, NavMode, MultiTabMode, AnimateType } from '@/interface';
+import type { ThemeSettings, NavMode, MultiTabMode, AnimateType, HorizontalMenuPosition } from '@/interface';
 import { getHoverAndPressedColor } from './helpers';
 
 type ThemeState = ThemeSettings;
@@ -85,6 +85,10 @@ const themeStore = defineStore({
         this.menuStyle.mixWidth = width;
       }
     },
+    /** 更改顶部水平菜单的位置 */
+    handleHorizontalMenuPosition(position: HorizontalMenuPosition) {
+      this.menuStyle.horizontalPosition = position;
+    },
     /** 更改头部的高度 */
     handleHeaderHeight(height: number | null) {
       if (height !== null) {