From 1521fcc529796b38c52fbc8460a2c6722ffecd7e Mon Sep 17 00:00:00 2001
From: xiaonuobase <1253070437@qq.com>
Date: Mon, 3 Apr 2023 15:01:01 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=B7=A6=E4=B8=8A=E8=A7=92=E6=8A=98=E5=8F=A0=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/layout/components/moduleMenu.vue      | 18 ++----------
 .../src/layout/components/userbar.vue         | 12 --------
 snowy-admin-web/src/layout/index.vue          | 28 +++++++++++++------
 snowy-admin-web/src/style/index.less          | 11 ++++++++
 4 files changed, 33 insertions(+), 36 deletions(-)

diff --git a/snowy-admin-web/src/layout/components/moduleMenu.vue b/snowy-admin-web/src/layout/components/moduleMenu.vue
index d28414a1..af200b05 100644
--- a/snowy-admin-web/src/layout/components/moduleMenu.vue
+++ b/snowy-admin-web/src/layout/components/moduleMenu.vue
@@ -21,7 +21,7 @@
 			</a-menu-item>
 		</a-menu>
 	</div>
-	<div v-else>
+	<div v-else  class="panel-item hidden-sm-and-down">
 		<a-popover v-if="menu.length > 1" placement="bottomLeft">
 			<template #content>
 				<a-row :gutter="[0, 5]" class="module-row">
@@ -35,9 +35,7 @@
 					</div>
 				</a-row>
 			</template>
-			<div class="module-comp">
-				<appstore-outlined />
-			</div>
+			<appstore-outlined />
 		</a-popover>
 	</div>
 </template>
@@ -123,18 +121,6 @@
 		color: white;
 		font-size: 8px;
 	}
-	.module-comp {
-		display: flex;
-		padding: 0 15px;
-		height: 49px;
-		text-align: center;
-		justify-content: center;
-		align-items: center;
-		cursor: pointer;
-	}
-	.module-comp:hover {
-		background: var(--header-color-split);
-	}
 	.ant-menu-horizontal > .ant-menu-item::after,
 	.ant-menu-horizontal > .ant-menu-submenu::after {
 		content: none;
diff --git a/snowy-admin-web/src/layout/components/userbar.vue b/snowy-admin-web/src/layout/components/userbar.vue
index 50726abc..b41dc5fb 100644
--- a/snowy-admin-web/src/layout/components/userbar.vue
+++ b/snowy-admin-web/src/layout/components/userbar.vue
@@ -204,18 +204,6 @@
 		align-items: center;
 		height: 100%;
 	}
-	.user-bar .panel-item {
-		padding: 0 10px;
-		cursor: pointer;
-		height: 100%;
-		display: flex;
-		align-items: center;
-	}
-	.user-bar .panel-item i {
-	}
-	.user-bar .panel-item:hover {
-		background: var(--header-color-split);
-	}
 	.user-bar .user-avatar {
 		height: 49px;
 		display: flex;
diff --git a/snowy-admin-web/src/layout/index.vue b/snowy-admin-web/src/layout/index.vue
index 2996be90..56f4fd8c 100644
--- a/snowy-admin-web/src/layout/index.vue
+++ b/snowy-admin-web/src/layout/index.vue
@@ -28,17 +28,21 @@
 							@select="onSelect"
 							@openChange="onOpenChange"
 						>
-							<NavMenu :nav-menus="menu"></NavMenu>
+							<NavMenu :nav-menus="menu" />
 						</a-menu>
 					</div>
 				</div>
 			</a-layout-sider>
 			<!-- 手机端情况下的左侧菜单 -->
-			<Side-m v-if="ismobile"></Side-m>
+			<Side-m v-if="ismobile" />
 			<!-- 右侧布局 -->
 			<a-layout>
 				<div id="snowyHeader" class="snowy-header">
 					<div class="snowy-header-left" style="padding-left: 0px">
+						<div v-if="!ismobile" class="panel-item hidden-sm-and-down" @click="menuIsCollapseClick">
+							<MenuUnfoldOutlined v-if="menuIsCollapse" />
+							<MenuFoldOutlined v-else />
+						</div>
 						<moduleMenu @switchModule="switchModule" />
 						<Topbar v-if="!ismobile && breadcrumbOpen" />
 					</div>
@@ -47,7 +51,7 @@
 					</div>
 				</div>
 				<!-- 多标签 -->
-				<Tags v-if="!ismobile && layoutTagsOpen"></Tags>
+				<Tags v-if="!ismobile && layoutTagsOpen" />
 				<a-layout-content class="main-content-wrapper">
 					<div id="adminui-main" class="adminui-main">
 						<router-view v-slot="{ Component }">
@@ -55,7 +59,7 @@
 								<component :is="Component" :key="$route.name" v-if="routeShow" />
 							</keep-alive>
 						</router-view>
-						<iframe-view></iframe-view>
+						<iframe-view />
 						<div class="main-bottom-wrapper">
 							<a style="color: #a0a0a0" :href="sysBaseConfig.SNOWY_SYS_COPYRIGHT_URL" target="_blank">{{
 								sysBaseConfig.SNOWY_SYS_COPYRIGHT
@@ -132,14 +136,18 @@
 					:theme="secondMenuSideTheme"
 					@select="onSelect"
 				>
-					<NavMenu :nav-menus="nextMenu"></NavMenu>
+					<NavMenu :nav-menus="nextMenu" />
 				</a-menu>
 			</a-layout-sider>
 			<!-- 手机端情况下的左侧菜单 -->
-			<Side-m v-if="ismobile"></Side-m>
+			<Side-m v-if="ismobile" />
 			<a-layout>
 				<div id="snowyHeader" class="snowy-header">
 					<div class="snowy-header-left" style="padding-left: 0px">
+						<div v-if="!ismobile" class="panel-item hidden-sm-and-down" @click="menuIsCollapseClick">
+							<MenuUnfoldOutlined v-if="menuIsCollapse" />
+							<MenuFoldOutlined v-else />
+						</div>
 						<moduleMenu @switchModule="switchModule" />
 						<Topbar v-if="!ismobile && breadcrumbOpen" />
 					</div>
@@ -156,7 +164,7 @@
 								<component :is="Component" v-if="routeShow" :key="$route.name" />
 							</keep-alive>
 						</router-view>
-						<iframe-view></iframe-view>
+						<iframe-view />
 						<div class="main-bottom-wrapper">
 							<a style="color: #a0a0a0" :href="sysBaseConfig.SNOWY_SYS_COPYRIGHT_URL" target="_blank">{{
 								sysBaseConfig.SNOWY_SYS_COPYRIGHT
@@ -184,7 +192,7 @@
 	import moduleMenu from './components/moduleMenu.vue'
 	import { ThemeModeEnum } from '@/utils/enum'
 	import { globalStore, keepAliveStore } from '@/store'
-	import { mapState, mapActions } from 'pinia'
+	import { mapState, mapStores, mapActions } from 'pinia'
 	import tool from '@/utils/tool'
 
 	export default defineComponent({
@@ -213,6 +221,7 @@
 			}
 		},
 		computed: {
+			...mapStores(globalStore),
 			...mapState(globalStore, [
 				'theme',
 				'ismobile',
@@ -454,6 +463,9 @@
 					})
 				return newMap
 			},
+			menuIsCollapseClick() {
+				this.globalStore.toggleConfig('menuIsCollapse')
+			},
 			// 退出最大化
 			exitMaximize() {
 				document.getElementById('app').classList.remove('main-maximize')
diff --git a/snowy-admin-web/src/style/index.less b/snowy-admin-web/src/style/index.less
index 8fcaccb3..fafd8ca2 100644
--- a/snowy-admin-web/src/style/index.less
+++ b/snowy-admin-web/src/style/index.less
@@ -236,6 +236,17 @@ a, button, input, textarea {
 	align-items: center;
 }
 
+.panel-item {
+	padding: 0 10px;
+	cursor: pointer;
+	height: 100%;
+	display: flex;
+	align-items: center;
+}
+.panel-item:hover {
+	background: var(--header-color-split);
+}
+
 /* 多标签 */
 .snowy-tags {
 	height: 40px;