From a1be0533c494243e51441dc47091ab024c4dc6f8 Mon Sep 17 00:00:00 2001
From: lyt-Top <1105290566@qq.com>
Date: Mon, 26 Jul 2021 20:12:51 +0800
Subject: [PATCH] =?UTF-8?q?'=E5=A4=84=E7=90=86=E5=86=B2=E7=AA=81=EF=BC=8C?=
 =?UTF-8?q?=E8=AF=B7=E5=8B=BF=E6=8B=89=E6=96=B0=EF=BC=88=E8=AF=B7=E5=BF=BD?=
 =?UTF-8?q?=E7=95=A5=E6=AD=A4=E7=89=88=E6=9C=AC=EF=BC=89'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/navBars/tagsView/tagsView.vue | 42 +++++-------------------
 1 file changed, 9 insertions(+), 33 deletions(-)

diff --git a/src/layout/navBars/tagsView/tagsView.vue b/src/layout/navBars/tagsView/tagsView.vue
index c3e7f20..208d3eb 100644
--- a/src/layout/navBars/tagsView/tagsView.vue
+++ b/src/layout/navBars/tagsView/tagsView.vue
@@ -178,37 +178,14 @@ export default {
 			addBrowserSetSession(state.tagsViewList);
 		};
 		// 6、开启当前页面全屏
-		const openCurrenFullscreen = (path: string, currentRouteInfo: object) => {
-			const { meta, name, params, query } = currentRouteInfo;
-			if (meta.isDynamic) router.push({ name, params });
-			else router.push({ path, query });
+		const openCurrenFullscreen = (path: string) => {
+			const item = state.tagsViewList.find((v: any) => v.path === path);
 			nextTick(() => {
-				// 加延时器，防止非本界面点击 `开启当前页面全屏`，高度不对问题
-				setTimeout(() => {
-					const element = document.body;
-					const aside = document.querySelector('aside');
-					const header = document.querySelector('header');
-					const columAside = document.querySelector('.layout-columns-aside');
-					const layoutView = document.querySelector('.layout-view-bg-white');
-					screenfull.on('change', () => {
-						if (screenfull.isFullscreen) {
-							if (aside) aside.style.display = `none`;
-							if (header) header.style.display = `none`;
-							if (columAside) columAside.style.display = `none`;
-							if (layoutView) layoutView.style.height = `calc(100vh - 30px)`;
-						} else {
-							if (aside) aside.style.display = `flex`;
-							if (header) header.style.display = `block`;
-							if (columAside) columAside.style.display = `block`;
-							if (!layoutView) return false;
-							let { isTagsview } = getThemeConfig.value;
-							if (isTagsview) layoutView.style.height = `calc(100vh - 114px)`;
-							else layoutView.style.height = `calc(100vh - 80px)`;
-						}
-					});
-					screenfull.request(element);
-				}, 800);
-			});
+				router.push({ path, query: item.query });
+				const element = document.querySelector('.layout-main');
+				const screenfulls: any = screenfull;
+				screenfulls.request(element);
+			})
 		};
 		// 当前项右键菜单点击，拿当前点击的路由路径对比 浏览器缓存中的 tagsView 路由数组，取当前点击项的详细路由信息
 		const getCurrentRouteItem = (path: string) => {
@@ -218,8 +195,7 @@ export default {
 		// 当前项右键菜单点击
 		const onCurrentContextmenuClick = (item) => {
 			const { id, path } = item;
-			const currentRouteInfo = getCurrentRouteItem(path);
-			const { meta, name, params, query } = currentRouteInfo;
+			const { meta, name, params, query } = getCurrentRouteItem(path);
 			switch (id) {
 				case 0:
 					refreshCurrentTagsView(path);
@@ -238,7 +214,7 @@ export default {
 					closeAllTagsView(path);
 					break;
 				case 4:
-					openCurrenFullscreen(path, currentRouteInfo);
+					openCurrenFullscreen(path);
 					break;
 			}
 		};