From b01ce00641392c335f36e336d00e36c8c50c28c4 Mon Sep 17 00:00:00 2001
From: zhang zhuo <cfn@leapy.cn>
Date: Thu, 5 Jun 2025 17:25:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=AF=E7=94=B1=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/tags.vue | 10 +++++-----
 src/store/model/viewTags.ts    |  9 +++------
 src/utils/route.ts             |  4 ----
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/layout/components/tags.vue b/src/layout/components/tags.vue
index b2a4920..2e0d7fe 100644
--- a/src/layout/components/tags.vue
+++ b/src/layout/components/tags.vue
@@ -53,7 +53,7 @@
 
 <script setup name="tags">
 import Sortable from 'sortablejs'
-import {getCurrentInstance, nextTick, ref, watch, onMounted} from "vue";
+import {getCurrentInstance, nextTick, ref, watch, onMounted, toRaw} from "vue";
 import store from "@/store/index";
 import {useRouter, useRoute} from "vue-router";
 import {getMenu} from "@/utils/route"
@@ -69,6 +69,7 @@ let contextMenuItem = ref(null)
 let left = ref(0)
 let top = ref(0)
 let tagList = store.state.viewTags.viewTags
+
 let tipDisplayed = ref(false)
 
 if (dashboardRoute) {
@@ -82,9 +83,8 @@ onMounted(() => {
 	scrollInit()
 })
 
-watch(route, (e) => {
-	console.log(111)
-	addViewTags(e);
+watch(() => route.path, (e) => {
+	addViewTags(route);
 	//判断标签容器是否出现滚动条
 	nextTick(() => {
 		const tags = proxy.$refs.tags
@@ -105,7 +105,7 @@ watch(route, (e) => {
 			}
 		}
 	})
-})
+}, {deep: false})
 
 watch(contextMenuVisible, (value) => {
 	var cm = function (e) {
diff --git a/src/store/model/viewTags.ts b/src/store/model/viewTags.ts
index 91dee57..7d0d2fd 100644
--- a/src/store/model/viewTags.ts
+++ b/src/store/model/viewTags.ts
@@ -11,9 +11,9 @@ export default {
 			let isName = route.name
 			if(!target && isName){
 				if(backPathIndex == -1){
-					state.viewTags.push(route)
+					state.viewTags.push(Object.assign({}, route))
 				}else{
-					state.viewTags.splice(backPathIndex+1, 0, route)
+					state.viewTags.splice(backPathIndex+1, 0, Object.assign({}, route))
 				}
 			}
 		},
@@ -25,12 +25,9 @@ export default {
 			})
 		},
 		updateViewTags(state, route){
-			// state.viewTags = state.viewTags.map(item =>
-			// 	item.fullPath === route.fullPath ? { ...item, ...route } : item
-			// );
-
 			state.viewTags.forEach((item) => {
 				if (item.fullPath == route.fullPath){
+					// 追加数据
 					item = Object.assign(item, route)
 				}
 			})
diff --git a/src/utils/route.ts b/src/utils/route.ts
index a45dd3d..17c1d71 100644
--- a/src/utils/route.ts
+++ b/src/utils/route.ts
@@ -8,9 +8,6 @@ export function beforeEach(to: RouteLocationNormalized, from: RouteLocationNorma
 	if (!piMain) {
 		return false
 	}
-
-	console.log(from)
-
 	store.commit("updateViewTags", {
 		fullPath: from.fullPath,
 		scrollTop: piMain.scrollTop
@@ -28,7 +25,6 @@ export function afterEach(to: RouteLocationNormalized) {
 		if (beforeRoute) {
 			piMain.scrollTop = beforeRoute.scrollTop || 0
 		}
-	}).then(r => {
 	})
 }