From b8d7806b57deec092a193ac7a1f43daf9600e598 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BF=86=E6=A2=A6?=
 <5527787+gengzhaoji@user.noreply.gitee.com>
Date: Thu, 27 Nov 2025 09:27:58 +0000
Subject: [PATCH 1/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 忆梦 <5527787+gengzhaoji@user.noreply.gitee.com>
---
 src/extension/layout/index.vue | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/extension/layout/index.vue b/src/extension/layout/index.vue
index ca7e0bb..ca223d3 100644
--- a/src/extension/layout/index.vue
+++ b/src/extension/layout/index.vue
@@ -7,9 +7,7 @@
 				 @click="$router.push('/')">
 					<div class="flex-center">
 						<img v-show="theme.logo" src="@/assets/img/logo.png" alt="logo" />
-						<transition name="fade">
-							<span v-show="!collapse" class="m-l-10">{{ TITLE }}</span>
-						</transition>
+						<span v-show="!collapse" class="m-l-10">{{ TITLE }}</span>
 					</div>
 				</el-aside>
 				<div class="flex-auto w-0 flex p-0 top-r overflow-hidden">
@@ -304,7 +302,7 @@ function handlePreview() {
 
 <style lang="scss" scoped>
 :deep(.el-aside) {
-	transition: all 0.3s;
+	transition: all 0.2s;
 }
 
 #layout {
@@ -330,7 +328,6 @@ function handlePreview() {
 			height: calc(var(--el-header-height) - 1px);
 			line-height: calc(var(--el-header-height) - 1px);
 			text-align: center;
-			transition: all 0.3s;
 
 			> div {
 				position: relative;
-- 
Gitee


From d71adb654f2c84e5e443618a61ca231ddce446bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BF=86=E6=A2=A6?=
 <5527787+gengzhaoji@user.noreply.gitee.com>
Date: Fri, 28 Nov 2025 08:38:23 +0000
Subject: [PATCH 2/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 忆梦 <5527787+gengzhaoji@user.noreply.gitee.com>
---
 src/extension/layout/components/Setting.vue | 124 +++++++++++---------
 src/extension/layout/index.vue              |  16 +--
 2 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/src/extension/layout/components/Setting.vue b/src/extension/layout/components/Setting.vue
index 35b35e6..8fd44f3 100644
--- a/src/extension/layout/components/Setting.vue
+++ b/src/extension/layout/components/Setting.vue
@@ -1,45 +1,55 @@
 <template>
-	<div class="p-l-15 p-r-15">
-		<el-divider content-position="left">
-			主题色
-			<el-color-picker v-model="state.primaryColor" color-format="hex" size="small" class="m-l-10" />
-		</el-divider>
-		<div class="theme-box">
-			<theme-color v-for="(item, key) in themeColorArr" :key="key" v-model:active="state.primaryColor" :color="item.color" :tip="item.tip" />
-		</div>
-		<el-divider content-position="left">布局</el-divider>
-		<el-radio-group v-model="state.layout" class="three-columns">
-			<el-radio-button value="sidebar">左右</el-radio-button>
-			<el-radio-button value="navbar">上下</el-radio-button>
-			<el-radio-button value="both">上下 + 左右</el-radio-button>
-		</el-radio-group>
-		<el-divider content-position="left">配色</el-divider>
-		<el-radio-group v-model="state.menuType" class="three-columns">
-			<el-radio-button value="simplicity">简约</el-radio-button>
-			<el-radio-button value="science">科技</el-radio-button>
-			<el-radio-button value="major">专业</el-radio-button>
-		</el-radio-group>
+	<div @click="settingVisible = true">
+		<el-tooltip class="item" effect="dark" content="系统设置">
+			<my-icon icon="Tools" />
+		</el-tooltip>
+		<el-drawer v-model="settingVisible" title="设置" size="320px" append-to-body direction="rtl">
+			<div class="h-100%">
+				<div class="p-l-15 p-r-15">
+					<el-divider content-position="left">
+						主题色
+						<el-color-picker v-model="state.primaryColor" color-format="hex" size="small" class="m-l-10" />
+					</el-divider>
+					<div class="theme-box">
+						<theme-color v-for="(item, key) in themeColorArr" :key="key" v-model:active="state.primaryColor" :color="item.color" :tip="item.tip"
+						/>
+					</div>
+					<el-divider content-position="left">布局</el-divider>
+					<el-radio-group v-model="state.layout" class="three-columns">
+						<el-radio-button value="sidebar">左右</el-radio-button>
+						<el-radio-button value="navbar">上下</el-radio-button>
+						<el-radio-button value="both">上下 + 左右</el-radio-button>
+					</el-radio-group>
+					<el-divider content-position="left">配色</el-divider>
+					<el-radio-group v-model="state.menuType" class="three-columns">
+						<el-radio-button value="simplicity">简约</el-radio-button>
+						<el-radio-button value="science">科技</el-radio-button>
+						<el-radio-button value="major">专业</el-radio-button>
+					</el-radio-group>
 
-		<el-divider content-position="left">其他设置</el-divider>
-		<el-form label-width="240px" label-position="left">
-			<el-form-item label="开启折叠">
-				<el-switch v-model="state.collapsible"></el-switch>
-			</el-form-item>
-			<el-form-item label="开启导航Tab">
-				<el-switch v-model="state.showTabs"></el-switch>
-			</el-form-item>
-			<el-form-item label="显示logo">
-				<el-switch v-model="state.logo"></el-switch>
-			</el-form-item>
-			<el-form-item label="开启面包屑">
-				<el-switch v-model="state.showBreadcrumb"></el-switch>
-			</el-form-item>
-		</el-form>
+					<el-divider content-position="left">其他设置</el-divider>
+					<el-form label-width="240px" label-position="left">
+						<el-form-item label="开启折叠">
+							<el-switch v-model="state.collapsible"></el-switch>
+						</el-form-item>
+						<el-form-item label="开启导航Tab">
+							<el-switch v-model="state.showTabs"></el-switch>
+						</el-form-item>
+						<el-form-item label="显示logo">
+							<el-switch v-model="state.logo"></el-switch>
+						</el-form-item>
+						<el-form-item label="开启面包屑">
+							<el-switch v-model="state.showBreadcrumb"></el-switch>
+						</el-form-item>
+					</el-form>
+				</div>
+			</div>
+		</el-drawer>
 	</div>
 </template>
 
 <script setup>
-import themeColor from './theme/theme-color.vue';
+	import themeColor from './theme/theme-color.vue';
 const themeColorArr = [
 	{ color: '#4458FE', tip: '默认蓝' },
 	{ color: '#d60f20', tip: '玫瑰红' },
@@ -48,9 +58,9 @@ const themeColorArr = [
 	{ color: '#13c2c2', tip: '明青' },
 	{ color: '#333333', tip: '极客黑' }
 ];
-// 只取值，不做computed
-const state = $store.user.theme;
-// 监听数据的变化
+
+const state = $store.user.theme,	settingVisible = ref(false);
+
 watch(
 	() => state,
 	(newVal) => {
@@ -61,27 +71,27 @@ watch(
 </script>
 
 <style lang="scss" scoped>
-.theme-box {
-	display: flex;
-	justify-content: space-around;
-	padding: 0 10px;
-}
+	.theme-box {
+		display: flex;
+		justify-content: space-around;
+		padding: 0 10px;
+	}
 
-.three-columns {
-	display: flex;
-	width: 100%;
+	.three-columns {
+		display: flex;
+		width: 100%;
 
-	:deep(.el-radio-button) {
-		flex: 1;
-		width: 0;
+		:deep(.el-radio-button) {
+			flex: 1;
+			width: 0;
 
-		.el-radio-button__inner {
-			width: 100%;
+			.el-radio-button__inner {
+				width: 100%;
+			}
 		}
 	}
-}
 
-:deep(.el-color-picker__trigger) {
-	padding: 2px;
-}
-</style>
+	:deep(.el-color-picker__trigger) {
+		padding: 2px;
+	}
+</style>
\ No newline at end of file
diff --git a/src/extension/layout/index.vue b/src/extension/layout/index.vue
index ca223d3..7ea1734 100644
--- a/src/extension/layout/index.vue
+++ b/src/extension/layout/index.vue
@@ -36,7 +36,6 @@
 								id="both"
 								:data="bothTopMenus"
 								:default-active="moduleName"
-								:props="{ id: 'path', route: 'path' }"
 								mode="horizontal"
 								unique-opened
 								@select="menuTopSelect"
@@ -84,10 +83,8 @@
 								</template>
 							</el-dropdown>
 						</div>
-						<div class="li navbar-icon-action" @click="settingVisible = true">
-							<el-tooltip class="item" effect="dark" content="系统设置">
-								<my-icon icon="Tools" />
-							</el-tooltip>
+						<div class="li navbar-icon-action">
+							<Setting />
 						</div>
 					</div>
 				</div>
@@ -129,12 +126,6 @@
 			</el-container>
 		</el-container>
 
-		<el-drawer v-model="settingVisible" title="设置" size="320px" append-to-body direction="rtl">
-			<div class="h-100%">
-				<Setting />
-			</div>
-		</el-drawer>
-
 		<systemInfo :system-type="dropdownType" @closed="dropdownType = ''"></systemInfo>
 		<my-preview :data="previewData" is-local></my-preview>
 	</div>
@@ -146,8 +137,7 @@ import { TITLE } from '@/config';
 import { useWindowSize } from '@vueuse/core';
 
 /************************************************ 主题切换 *************************************************/
-const { theme, userInfo } = $store.user,
-	settingVisible = ref(false);
+const { theme, userInfo } = $store.user
 
 /**********************************************************************菜单选中逻辑,面包屑导航 ***********************************************************************/
 const $route = useRoute(),
-- 
Gitee


From 5ac400aae181a2af9c842e1621df71b06c099ff8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BF=86=E6=A2=A6?=
 <5527787+gengzhaoji@user.noreply.gitee.com>
Date: Fri, 28 Nov 2025 08:39:33 +0000
Subject: [PATCH 3/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 忆梦 <5527787+gengzhaoji@user.noreply.gitee.com>
---
 src/extension/layout/index.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/extension/layout/index.vue b/src/extension/layout/index.vue
index 7ea1734..a64b4f1 100644
--- a/src/extension/layout/index.vue
+++ b/src/extension/layout/index.vue
@@ -26,7 +26,6 @@
 								v-if="['navbar'].includes(theme.layout)"
 								:data="$store.guarder.Menus"
 								:default-active="$store.user.activeMenu"
-								:props="{ id: 'path', route: 'path' }"
 								mode="horizontal"
 								unique-opened
 								@select="menuTopSelect"
-- 
Gitee


From c61c726c9d258cf7c0eb24fd29285da369df61f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BF=86=E6=A2=A6?=
 <5527787+gengzhaoji@user.noreply.gitee.com>
Date: Fri, 28 Nov 2025 08:45:46 +0000
Subject: [PATCH 4/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 忆梦 <5527787+gengzhaoji@user.noreply.gitee.com>
---
 src/extension/layout/index.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/extension/layout/index.vue b/src/extension/layout/index.vue
index a64b4f1..9d71b3b 100644
--- a/src/extension/layout/index.vue
+++ b/src/extension/layout/index.vue
@@ -87,7 +87,6 @@
 						</div>
 					</div>
 				</div>
-				<div class="border" />
 			</el-header>
 			<el-container>
 				<el-aside
@@ -303,7 +302,7 @@ function handlePreview() {
 		position: relative;
 		display: flex;
 
-		.border {
+		&:after {
 			position: absolute;
 			bottom: 0;
 			left: 0;
-- 
Gitee