From f32fcc67c60cfbdc8bf42d77c7ea0427cb24ff3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BF=9E=E5=AE=9D=E5=B1=B1?= <1253070437@qq.com>
Date: Sun, 8 Oct 2023 01:45:03 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80=E6=81=A2=E5=A4=8D=E8=87=B3=E4=B8=80=E4=B8=AA=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=86=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 snowy-admin-web/src/layout/index.vue          | 213 ++++++++++++++----
 .../src/layout/pattern/classical.vue          | 146 ------------
 .../src/layout/pattern/doublerow.vue          | 189 ----------------
 3 files changed, 167 insertions(+), 381 deletions(-)
 delete mode 100644 snowy-admin-web/src/layout/pattern/classical.vue
 delete mode 100644 snowy-admin-web/src/layout/pattern/doublerow.vue

diff --git a/snowy-admin-web/src/layout/index.vue b/snowy-admin-web/src/layout/index.vue
index 5364f99d..8884921a 100644
--- a/snowy-admin-web/src/layout/index.vue
+++ b/snowy-admin-web/src/layout/index.vue
@@ -1,50 +1,166 @@
 <template>
 	<!-- 经典布局 -->
-	<classical
-		v-if="layout === 'classical'"
-		:is-mobile="isMobile"
-		:menu-is-collapse="menuIsCollapse"
-		:side-theme="sideTheme"
-		:sys-base-config="sysBaseConfig"
-		:open-keys="openKeys"
-		:selected-keys="selectedKeys"
-		:menu="menu"
-		:breadcrumb-open="breadcrumbOpen"
-		:layout-tags-open="layoutTagsOpen"
-		:keep-live-route="keepLiveRoute"
-		:route-show="routeShow"
-		:route="route"
-		@onSelect="onSelect"
-		@onOpenChange="onOpenChange"
-		@menuIsCollapseClick="menuIsCollapseClick"
-		@switchModule="switchModule"
-	/>
+	<a-layout v-if="layout === 'classical'">
+		<a-layout-sider
+			v-if="!isMobile"
+			v-model:collapsed="menuIsCollapse"
+			:trigger="null"
+			collapsible
+			:theme="sideTheme"
+			width="210"
+		>
+			<header id="snowyHeaderLogo" class="snowy-header-logo">
+				<div class="snowy-header-left">
+					<div class="logo-bar">
+						<img class="logo" :src="sysBaseConfig.SNOWY_SYS_LOGO" />
+						<span>{{ sysBaseConfig.SNOWY_SYS_NAME }}</span>
+					</div>
+				</div>
+			</header>
+			<div :class="menuIsCollapse ? 'admin-ui-side isCollapse' : 'admin-ui-side'">
+				<div class="admin-ui-side-scroll">
+					<a-menu
+						v-model:openKeys="openKeys"
+						v-model:selectedKeys="selectedKeys"
+						:theme="sideTheme"
+						mode="inline"
+						@select="onSelect"
+						@openChange="onOpenChange"
+					>
+						<NavMenu :nav-menus="menu" />
+					</a-menu>
+				</div>
+			</div>
+		</a-layout-sider>
+		<!-- 手机端情况下的左侧菜单 -->
+		<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" />
+					<top-bar v-if="!isMobile && breadcrumbOpen" />
+				</div>
+				<div class="snowy-header-right">
+					<user-bar />
+				</div>
+			</div>
+			<!-- 多标签 -->
+			<Tags v-if="!isMobile && layoutTagsOpen" />
+			<a-layout-content class="main-content-wrapper">
+				<div id="admin-ui-main" class="admin-ui-main">
+					<router-view v-slot="{ Component }">
+						<keep-alive :include="keepLiveRoute">
+							<component :is="Component" :key="route.name" v-if="routeShow" />
+						</keep-alive>
+					</router-view>
+					<iframe-view />
+					<div class="main-bottom-wrapper">
+						<a style="color: #a0a0a0" :href="sysBaseConfig.SNOWY_SYS_COPYRIGHT_URL" target="_blank">{{
+							sysBaseConfig.SNOWY_SYS_COPYRIGHT
+						}}</a>
+					</div>
+				</div>
+			</a-layout-content>
+		</a-layout>
+	</a-layout>
 	<!-- 双排菜单布局 -->
-	<double-row
-		v-else-if="layout === 'doublerow'"
-		:is-mobile="isMobile"
-		:menu-is-collapse="menuIsCollapse"
-		:side-theme="sideTheme"
-		:sys-base-config="sysBaseConfig"
-		:open-keys="openKeys"
-		:selected-keys="selectedKeys"
-		:menu="menu"
-		:breadcrumb-open="breadcrumbOpen"
-		:layout-tags-open="layoutTagsOpen"
-		:keep-live-route="keepLiveRoute"
-		:route-show="routeShow"
-		:route="route"
-		:layoutSiderDowbleMenu="layoutSiderDowbleMenu"
-		:secondMenuSideTheme="secondMenuSideTheme"
-		:nextMenu="nextMenu"
-		:doublerowSelectedKey="doublerowSelectedKey"
-		:pMenu="pMenu"
-		@onSelect="onSelect"
-		@showMenu="showMenu"
-		@onOpenChange="onOpenChange"
-		@menuIsCollapseClick="menuIsCollapseClick"
-		@switchModule="switchModule"
-	/>
+	<a-layout v-else-if="layout === 'doublerow'">
+		<a-layout-sider v-if="!isMobile" width="80" :theme="sideTheme" :trigger="null" collapsible>
+			<header id="snowyHeaderLogo" class="snowy-header-logo">
+				<div class="snowy-header-left">
+					<div class="logo-bar">
+						<router-link to="/">
+							<img class="logo" :title="sysBaseConfig.SNOWY_SYS_NAME" :src="sysBaseConfig.SNOWY_SYS_LOGO" />
+						</router-link>
+					</div>
+				</div>
+			</header>
+			<a-menu v-model:selectedKeys="doublerowSelectedKey" :theme="sideTheme" class="snowy-doublerow-layout-menu">
+				<a-menu-item
+					v-for="item in menu"
+					:key="item.path"
+					style="
+						text-align: center;
+						border-radius: 2px;
+						height: auto;
+						line-height: 20px;
+						flex: none;
+						display: block;
+						padding: 12px 0 !important;
+					"
+					@click="showMenu(item)"
+				>
+					<a v-if="item.meta && item.meta.type === 'link'" :href="item.path" target="_blank" @click.stop="() => {}"></a>
+					<template #icon>
+						<component :is="item.meta.icon" style="padding-left: 10px" />
+					</template>
+					<div class="snowy-doublerow-layout-menu-item-fort-div">
+						<span class="snowy-doublerow-layout-menu-item-fort-div-span">
+							{{ item.meta.title }}
+						</span>
+					</div>
+				</a-menu-item>
+			</a-menu>
+		</a-layout-sider>
+		<a-layout-sider
+			v-if="!isMobile"
+			v-show="layoutSiderDowbleMenu"
+			v-model:collapsed="menuIsCollapse"
+			:trigger="null"
+			width="170"
+			collapsible
+			:theme="secondMenuSideTheme"
+		>
+			<div v-if="!menuIsCollapse" id="snowyDoublerowSideTop" class="snowy-doublerow-side-top">
+				<h2 class="snowy-title">{{ pMenu.meta.title }}</h2>
+			</div>
+			<a-menu
+				v-model:collapsed="menuIsCollapse"
+				v-model:openKeys="openKeys"
+				v-model:selectedKeys="selectedKeys"
+				mode="inline"
+				:theme="secondMenuSideTheme"
+				@select="onSelect"
+			>
+				<NavMenu :nav-menus="nextMenu" />
+			</a-menu>
+		</a-layout-sider>
+		<!-- 手机端情况下的左侧菜单 -->
+		<Side-m v-if="isMobile" />
+		<a-layout>
+			<div id="snowyHeader" class="snowy-header">
+				<div class="snowy-header-left" style="padding-left: 0px">
+					<moduleMenu @switchModule="switchModule" />
+					<top-bar v-if="!isMobile && breadcrumbOpen" />
+				</div>
+				<div class="snowy-header-right">
+					<user-bar />
+				</div>
+			</div>
+			<!-- 多标签 -->
+			<Tags v-if="!isMobile && layoutTagsOpen"></Tags>
+			<a-layout-content class="main-content-wrapper">
+				<div id="admin-ui-main" class="admin-ui-main">
+					<router-view v-slot="{ Component }">
+						<keep-alive :include="keepLiveRoute">
+							<component :is="Component" v-if="routeShow" :key="route.name" />
+						</keep-alive>
+					</router-view>
+					<iframe-view />
+					<div class="main-bottom-wrapper">
+						<a style="color: #a0a0a0" :href="sysBaseConfig.SNOWY_SYS_COPYRIGHT_URL" target="_blank">{{
+							sysBaseConfig.SNOWY_SYS_COPYRIGHT
+						}}</a>
+					</div>
+				</div>
+			</a-layout-content>
+		</a-layout>
+	</a-layout>
 	<!-- 退出最大化 -->
 	<div class="main-maximize-exit" @click="exitMaximize">
 		<fullscreen-exit-outlined style="color: #fff" />
@@ -52,8 +168,13 @@
 </template>
 
 <script setup>
-	import Classical from '@/layout/pattern/classical.vue'
-	import DoubleRow from '@/layout/pattern/doublerow.vue'
+	import UserBar from '@/layout/components/userbar.vue'
+	import Tags from '@/layout/components/tags.vue'
+	import SideM from '@/layout/components/sideM.vue'
+	import NavMenu from '@/layout/components/NavMenu.vue'
+	import ModuleMenu from '@/layout/components/moduleMenu.vue'
+	import IframeView from '@/layout/components/iframeView.vue'
+	import TopBar from '@/layout/components/topbar.vue'
 	import { globalStore, keepAliveStore } from '@/store'
 	import { ThemeModeEnum } from '@/utils/enum'
 	import { useRouter, useRoute } from 'vue-router'
diff --git a/snowy-admin-web/src/layout/pattern/classical.vue b/snowy-admin-web/src/layout/pattern/classical.vue
deleted file mode 100644
index 7ea53f3b..00000000
--- a/snowy-admin-web/src/layout/pattern/classical.vue
+++ /dev/null
@@ -1,146 +0,0 @@
-<template>
-	<a-layout>
-		<a-layout-sider
-			v-if="!isMobile"
-			v-model:collapsed="menuIsCollapse"
-			:trigger="null"
-			collapsible
-			:theme="sideTheme"
-			width="210"
-		>
-			<header id="snowyHeaderLogo" class="snowy-header-logo">
-				<div class="snowy-header-left">
-					<div class="logo-bar">
-						<img class="logo" :src="sysBaseConfig.SNOWY_SYS_LOGO" />
-						<span>{{ sysBaseConfig.SNOWY_SYS_NAME }}</span>
-					</div>
-				</div>
-			</header>
-			<div :class="menuIsCollapse ? 'admin-ui-side isCollapse' : 'admin-ui-side'">
-				<div class="admin-ui-side-scroll">
-					<a-menu
-						v-model:openKeys="openKeys"
-						v-model:selectedKeys="selectedKeys"
-						:theme="sideTheme"
-						mode="inline"
-						@select="onSelect"
-						@openChange="onOpenChange"
-					>
-						<NavMenu :nav-menus="menu" />
-					</a-menu>
-				</div>
-			</div>
-		</a-layout-sider>
-		<!-- 手机端情况下的左侧菜单 -->
-		<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" />
-					<top-bar v-if="!isMobile && breadcrumbOpen" />
-				</div>
-				<div class="snowy-header-right">
-					<user-bar />
-				</div>
-			</div>
-			<!-- 多标签 -->
-			<Tags v-if="!isMobile && layoutTagsOpen" />
-			<a-layout-content class="main-content-wrapper">
-				<div id="admin-ui-main" class="admin-ui-main">
-					<router-view v-slot="{ Component }">
-						<keep-alive :include="keepLiveRoute">
-							<component :is="Component" :key="route.name" v-if="routeShow" />
-						</keep-alive>
-					</router-view>
-					<iframe-view />
-					<div class="main-bottom-wrapper">
-						<a style="color: #a0a0a0" :href="sysBaseConfig.SNOWY_SYS_COPYRIGHT_URL" target="_blank">{{
-							sysBaseConfig.SNOWY_SYS_COPYRIGHT
-						}}</a>
-					</div>
-				</div>
-			</a-layout-content>
-		</a-layout>
-	</a-layout>
-</template>
-
-<script setup name="classicalLayout">
-	import UserBar from '@/layout/components/userbar.vue'
-	import Tags from '@/layout/components/tags.vue'
-	import SideM from '@/layout/components/sideM.vue'
-	import NavMenu from '@/layout/components/NavMenu.vue'
-	import ModuleMenu from '@/layout/components/moduleMenu.vue'
-	import IframeView from '@/layout/components/iframeView.vue'
-	import TopBar from '@/layout/components/topbar.vue'
-
-	const props = defineProps({
-		isMobile: {
-			type: Boolean,
-			default: () => false
-		},
-		menuIsCollapse: {
-			type: Boolean,
-			default: () => false
-		},
-		sideTheme: {
-			type: String,
-			default: () => ''
-		},
-		sysBaseConfig: {
-			type: Object,
-			default: () => undefined
-		},
-		openKeys: {
-			type: Array,
-			default: () => []
-		},
-		selectedKeys: {
-			type: Array,
-			default: () => []
-		},
-		menu: {
-			type: Array,
-			default: () => []
-		},
-		breadcrumbOpen: {
-			type: Boolean,
-			default: () => false
-		},
-		layoutTagsOpen: {
-			type: Boolean,
-			default: () => false
-		},
-		keepLiveRoute: {
-			type: Array,
-			default: () => []
-		},
-		routeShow: {
-			type: Boolean,
-			default: () => false
-		},
-		route: {
-			type: Object,
-			default: () => undefined
-		}
-	})
-	const emit = defineEmits(['onSelect', 'onOpenChange', 'menuIsCollapseClick', 'switchModule'])
-	const onSelect = (obj) => {
-		emit('onSelect', obj)
-	}
-	// 菜单展开时
-	const onOpenChange = (keys) => {
-		emit('onOpenChange', keys)
-	}
-	// 切换应用时
-	const switchModule = (id) => {
-		emit('switchModule', id)
-	}
-	const menuIsCollapseClick = () => {
-		emit('menuIsCollapseClick')
-	}
-</script>
diff --git a/snowy-admin-web/src/layout/pattern/doublerow.vue b/snowy-admin-web/src/layout/pattern/doublerow.vue
deleted file mode 100644
index 32da0a14..00000000
--- a/snowy-admin-web/src/layout/pattern/doublerow.vue
+++ /dev/null
@@ -1,189 +0,0 @@
-<template>
-	<a-layout>
-		<a-layout-sider v-if="!isMobile" width="80" :theme="sideTheme" :trigger="null" collapsible>
-			<header id="snowyHeaderLogo" class="snowy-header-logo">
-				<div class="snowy-header-left">
-					<div class="logo-bar">
-						<router-link to="/">
-							<img class="logo" :title="sysBaseConfig.SNOWY_SYS_NAME" :src="sysBaseConfig.SNOWY_SYS_LOGO" />
-						</router-link>
-					</div>
-				</div>
-			</header>
-			<a-menu v-model:selectedKeys="doublerowSelectedKey" :theme="sideTheme" class="snowy-doublerow-layout-menu">
-				<a-menu-item
-					v-for="item in menu"
-					:key="item.path"
-					style="
-						text-align: center;
-						border-radius: 2px;
-						height: auto;
-						line-height: 20px;
-						flex: none;
-						display: block;
-						padding: 12px 0 !important;
-					"
-					@click="showMenu(item)"
-				>
-					<a v-if="item.meta && item.meta.type === 'link'" :href="item.path" target="_blank" @click.stop="() => {}"></a>
-					<template #icon>
-						<component :is="item.meta.icon" style="padding-left: 10px" />
-					</template>
-					<div class="snowy-doublerow-layout-menu-item-fort-div">
-						<span class="snowy-doublerow-layout-menu-item-fort-div-span">
-							{{ item.meta.title }}
-						</span>
-					</div>
-				</a-menu-item>
-			</a-menu>
-		</a-layout-sider>
-		<a-layout-sider
-			v-if="!isMobile"
-			v-show="layoutSiderDowbleMenu"
-			v-model:collapsed="menuIsCollapse"
-			:trigger="null"
-			width="170"
-			collapsible
-			:theme="secondMenuSideTheme"
-		>
-			<div v-if="!menuIsCollapse" id="snowyDoublerowSideTop" class="snowy-doublerow-side-top">
-				<h2 class="snowy-title">{{ pMenu.meta.title }}</h2>
-			</div>
-			<a-menu
-				v-model:collapsed="menuIsCollapse"
-				v-model:openKeys="openKeys"
-				v-model:selectedKeys="selectedKeys"
-				mode="inline"
-				:theme="secondMenuSideTheme"
-				@select="onSelect"
-			>
-				<NavMenu :nav-menus="nextMenu" />
-			</a-menu>
-		</a-layout-sider>
-		<!-- 手机端情况下的左侧菜单 -->
-		<Side-m v-if="isMobile" />
-		<a-layout>
-			<div id="snowyHeader" class="snowy-header">
-				<div class="snowy-header-left" style="padding-left: 0px">
-					<moduleMenu @switchModule="switchModule" />
-					<top-bar v-if="!isMobile && breadcrumbOpen" />
-				</div>
-				<div class="snowy-header-right">
-					<user-bar />
-				</div>
-			</div>
-			<!-- 多标签 -->
-			<Tags v-if="!isMobile && layoutTagsOpen"></Tags>
-			<a-layout-content class="main-content-wrapper">
-				<div id="admin-ui-main" class="admin-ui-main">
-					<router-view v-slot="{ Component }">
-						<keep-alive :include="keepLiveRoute">
-							<component :is="Component" v-if="routeShow" :key="route.name" />
-						</keep-alive>
-					</router-view>
-					<iframe-view />
-					<div class="main-bottom-wrapper">
-						<a style="color: #a0a0a0" :href="sysBaseConfig.SNOWY_SYS_COPYRIGHT_URL" target="_blank">{{
-							sysBaseConfig.SNOWY_SYS_COPYRIGHT
-						}}</a>
-					</div>
-				</div>
-			</a-layout-content>
-		</a-layout>
-	</a-layout>
-</template>
-
-<script setup name="doublerowLayout">
-	import UserBar from '@/layout/components/userbar.vue'
-	import Tags from '@/layout/components/tags.vue'
-	import SideM from '@/layout/components/sideM.vue'
-	import NavMenu from '@/layout/components/NavMenu.vue'
-	import ModuleMenu from '@/layout/components/moduleMenu.vue'
-	import IframeView from '@/layout/components/iframeView.vue'
-	import TopBar from '@/layout/components/topbar.vue'
-
-	const props = defineProps({
-		isMobile: {
-			type: Boolean,
-			default: () => false
-		},
-		menuIsCollapse: {
-			type: Boolean,
-			default: () => false
-		},
-		sideTheme: {
-			type: String,
-			default: () => ''
-		},
-		sysBaseConfig: {
-			type: Object,
-			default: () => undefined
-		},
-		openKeys: {
-			type: Array,
-			default: () => []
-		},
-		selectedKeys: {
-			type: Array,
-			default: () => []
-		},
-		menu: {
-			type: Array,
-			default: () => []
-		},
-		breadcrumbOpen: {
-			type: Boolean,
-			default: () => false
-		},
-		layoutTagsOpen: {
-			type: Boolean,
-			default: () => false
-		},
-		keepLiveRoute: {
-			type: Array,
-			default: () => []
-		},
-		routeShow: {
-			type: Boolean,
-			default: () => false
-		},
-		route: {
-			type: Object,
-			default: () => undefined
-		},
-		layoutSiderDowbleMenu: {
-			type: Boolean,
-			default: () => true
-		},
-		secondMenuSideTheme: {
-			type: String,
-			default: () => undefined
-		},
-		nextMenu: {
-			type: Array,
-			default: () => []
-		},
-		doublerowSelectedKey: {
-			type: Array,
-			default: () => []
-		},
-		pMenu: {
-			type: Object,
-			default: () => undefined
-		}
-	})
-	const emit = defineEmits(['onSelect', 'showMenu', 'onOpenChange', 'menuIsCollapseClick', 'switchModule'])
-	const onSelect = (obj) => {
-		emit('onSelect', obj)
-	}
-	const showMenu = (route) => {
-		emit('showMenu', route)
-	}
-	const menuIsCollapseClick = () => {
-		emit('menuIsCollapseClick')
-	}
-	// 切换应用时
-	const switchModule = (id) => {
-		emit('switchModule', id)
-	}
-</script>