From 0dc2d9dcf6e6596795d31eaf9c064e75e4db3f54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=AF=BA?= <1253070437@qq.com>
Date: Mon, 27 Mar 2023 00:10:11 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E5=A4=9A=E6=A0=87=E7=AD=BE=E5=8A=9F=E8=83=BD=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E7=A7=BB=E9=99=A4=E5=85=B6=E4=BB=96=E8=A2=AB=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98=E7=9A=84=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 snowy-admin-web/src/layout/components/tags.vue | 14 ++++++++++++--
 snowy-admin-web/src/views/auth/login/login.vue |  3 ---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/snowy-admin-web/src/layout/components/tags.vue b/snowy-admin-web/src/layout/components/tags.vue
index 22697ddb..f1b79a67 100644
--- a/snowy-admin-web/src/layout/components/tags.vue
+++ b/snowy-admin-web/src/layout/components/tags.vue
@@ -60,7 +60,7 @@
 <script>
 	import tool from '@/utils/tool'
 	import XnContextMenu from '@/components/XnContextMenu/index.vue'
-	import { iframeStore, keepAliveStore, viewTagsStore } from '@/store'
+	import {globalStore, iframeStore, keepAliveStore, viewTagsStore} from '@/store'
 	import { mapState, mapActions } from 'pinia'
 
 	export default {
@@ -79,6 +79,7 @@
 		},
 		computed: {
 			...mapState(viewTagsStore, ['viewTags']),
+			...mapState(globalStore, ['layoutTagsOpen']),
 			tagList() {
 				return this.viewTags
 			}
@@ -86,6 +87,9 @@
 		watch: {
 			$route(to) {
 				this.addViewTags(to)
+			},
+			layoutTagsOpen() {
+				this.closeOtherCacheTabs()
 			}
 		},
 		created() {
@@ -161,7 +165,6 @@
 			// 增加tag
 			addViewTags(route) {
 				this.activeKey = route.fullPath
-
 				if (route.name && !route.meta.fullpage) {
 					this.pushViewTags(route)
 					this.pushKeepLive(route.name)
@@ -241,6 +244,13 @@
 					}
 				})
 			},
+			// 多标签功能关闭时关闭被缓存的标签
+			closeOtherCacheTabs () {
+				const tags = [...this.tagList]
+				tags.forEach((tag) => {
+					this.closeSelectedTag(tag, false)
+				})
+			},
 			// TAB 最大化（包括标签栏）
 			maximize() {
 				this.contextMenuVisible = false
diff --git a/snowy-admin-web/src/views/auth/login/login.vue b/snowy-admin-web/src/views/auth/login/login.vue
index 3bfc7747..66732a29 100644
--- a/snowy-admin-web/src/views/auth/login/login.vue
+++ b/snowy-admin-web/src/views/auth/login/login.vue
@@ -152,9 +152,6 @@
 		},
 		computed: {
 			...mapState(globalStore, ['sysBaseConfig']),
-			// captchaOpen() {
-			// 	return this.sysBaseConfig.SNOWY_SYS_DEFAULT_CAPTCHA_OPEN === 'true'
-			// }
 		},
 		watch: {
 			'config.theme': function (val) {