From 2c1ffb7369849d2ce6eef2d2ce253be383723e77 Mon Sep 17 00:00:00 2001
From: lyt-Top <1105290566@qq.com>
Date: Mon, 31 May 2021 21:42:31 +0800
Subject: [PATCH] =?UTF-8?q?'admin-21.05.31:=E4=BF=AE=E5=A4=8D=E5=88=86?=
 =?UTF-8?q?=E6=A0=8F=E3=80=81=E7=BB=8F=E5=85=B8=E5=B8=83=E5=B1=80=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1=E8=AE=BE=E7=BD=AEmeta.isHide=E4=B8=BAtrue=E6=97=B6?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=EF=BC=8C=E6=84=9F=E8=B0=A2?=
 =?UTF-8?q?=E7=BE=A4=E5=8F=8B@29=E3=80=81@=E8=8A=AD=E8=8A=AD=E6=8B=89'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  3 ++-
 src/views/layout/component/aside.vue          |  3 +--
 src/views/layout/component/columnsAside.vue   |  4 +---
 src/views/layout/navBars/breadcrumb/index.vue |  7 +------
 src/views/layout/navMenu/horizontal.vue       | 12 ++++++------
 5 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3e124d..de6f53e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,4 +8,5 @@
 
 - 🎉 新增 更新日志文件 `CHANGELOG.md`，以后每次更新都会在这里显示对应内容
 - 🌟 更新 依赖更新最新版本
-- 🐞 修复 分栏布局路由设置 `meta.isHide` 为 `true` 时报错问题，感谢群友@29
+- 🐞 修复 分栏、经典布局路由设置 `meta.isHide` 为 `true` 时报错问题，感谢群友@29、@芭芭拉
+- 🐞 修复 经典布局点击 `tagsView` 左侧菜单数据不变问题
diff --git a/src/views/layout/component/aside.vue b/src/views/layout/component/aside.vue
index 480b2f7..9d40709 100644
--- a/src/views/layout/component/aside.vue
+++ b/src/views/layout/component/aside.vue
@@ -85,9 +85,8 @@ export default {
 				proxy.$refs.layoutAsideScrollbarRef.update();
 			}
 		});
-		// 监听路由的变化，动态赋值给菜单中
+		// 监听vuex值的变化，动态赋值给菜单中
 		watch(store.state, (val) => {
-			if (val.routesList.routesList.length === state.menuList.length) return false;
 			let { layout, isClassicSplitMenu } = val.themeConfig.themeConfig;
 			if (layout === 'classic' && isClassicSplitMenu) return false;
 			setFilterRoutes();
diff --git a/src/views/layout/component/columnsAside.vue b/src/views/layout/component/columnsAside.vue
index af6bb8f..c7328c4 100644
--- a/src/views/layout/component/columnsAside.vue
+++ b/src/views/layout/component/columnsAside.vue
@@ -132,11 +132,9 @@ export default {
 				onColumnsAsideDown(currentSplitRoute.k);
 			}, 0);
 		};
-		// 监听路由的变化，动态赋值给菜单中
+		// 监听布局配置信息的变化，动态增加菜单高亮位置移动像素
 		watch(store.state, (val) => {
 			val.themeConfig.themeConfig.columnsAsideStyle === 'columnsRound' ? (state.difference = 3) : (state.difference = 0);
-			if (val.routesList.routesList.length === state.columnsAsideList.length) return false;
-			setFilterRoutes();
 		});
 		// 页面加载时
 		onMounted(() => {
diff --git a/src/views/layout/navBars/breadcrumb/index.vue b/src/views/layout/navBars/breadcrumb/index.vue
index b7cfc85..517ec42 100644
--- a/src/views/layout/navBars/breadcrumb/index.vue
+++ b/src/views/layout/navBars/breadcrumb/index.vue
@@ -8,7 +8,7 @@
 </template>
 
 <script lang="ts">
-import { computed, reactive, toRefs, onMounted, onUnmounted, getCurrentInstance, watch } from 'vue';
+import { computed, reactive, toRefs, onMounted, onUnmounted, getCurrentInstance } from 'vue';
 import { useRoute } from 'vue-router';
 import { useStore } from '/@/store/index.ts';
 import Breadcrumb from '/@/views/layout/navBars/breadcrumb/breadcrumb.vue';
@@ -81,11 +81,6 @@ export default {
 			});
 			return currentData;
 		};
-		// 监听路由的变化，动态赋值给菜单中
-		watch(store.state, (val) => {
-			if (val.routesList.routesList.length === state.menuList.length) return false;
-			setFilterRoutes();
-		});
 		// 页面加载时
 		onMounted(() => {
 			setFilterRoutes();
diff --git a/src/views/layout/navMenu/horizontal.vue b/src/views/layout/navMenu/horizontal.vue
index 78c5b09..5bfe81d 100644
--- a/src/views/layout/navMenu/horizontal.vue
+++ b/src/views/layout/navMenu/horizontal.vue
@@ -1,7 +1,7 @@
 <template>
 	<div class="el-menu-horizontal-warp">
 		<el-scrollbar @wheel.native.prevent="onElMenuHorizontalScroll" ref="elMenuHorizontalScrollRef">
-			<el-menu router :default-active="defaultActive" background-color="transparent" mode="horizontal" @select="onHorizontalSelect">
+			<el-menu router :default-active="defaultActive" background-color="transparent" mode="horizontal">
 				<template v-for="val in menuLists">
 					<el-submenu :index="val.path" v-if="val.children && val.children.length > 0" :key="val.path">
 						<template #title>
@@ -99,10 +99,6 @@ export default defineComponent({
 			});
 			return currentData;
 		};
-		// 菜单激活回调
-		const onHorizontalSelect = (path: string) => {
-			proxy.mittBus.emit('setSendClassicChildren', setSendClassicChildren(path));
-		};
 		// 页面加载时
 		onMounted(() => {
 			initElMenuOffsetLeft();
@@ -112,11 +108,15 @@ export default defineComponent({
 		onBeforeRouteUpdate((to) => {
 			setCurrentRouterHighlight(to.path);
 			proxy.mittBus.emit('onMenuClick');
+			// 修复经典布局开启切割菜单时，点击tagsView后左侧导航菜单数据不变的问题
+			let { layout, isClassicSplitMenu } = store.state.themeConfig.themeConfig;
+			if (layout === 'classic' && isClassicSplitMenu) {
+				proxy.mittBus.emit('setSendClassicChildren', setSendClassicChildren(to.path));
+			}
 		});
 		return {
 			menuLists,
 			onElMenuHorizontalScroll,
-			onHorizontalSelect,
 			...toRefs(state),
 		};
 	},