From fd5d763de4bc94d45b71fb6f41c3a84c453ba99f Mon Sep 17 00:00:00 2001
From: 21030442-mao <maoxiangyu@haier.com>
Date: Tue, 27 Jul 2021 10:13:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=9B=BE=E6=A0=87=E9=A1=B5?=
 =?UTF-8?q?=E5=85=A8=E5=B1=8F=E5=90=8E=E6=97=A0=E6=B3=95=E6=B8=B2=E6=9F=93?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/navBars/tagsView/tagsView.vue |  2 +-
 src/store/modules/tagsViewRoutes.ts      | 43 ++++++++++++------------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/layout/navBars/tagsView/tagsView.vue b/src/layout/navBars/tagsView/tagsView.vue
index 0e82c7d..8b8336a 100644
--- a/src/layout/navBars/tagsView/tagsView.vue
+++ b/src/layout/navBars/tagsView/tagsView.vue
@@ -190,7 +190,7 @@ export default {
 				const { meta, name, params, query } = currentRouteInfo;
 				if (meta.isDynamic) router.push({ name, params });
 				else router.push({ path, query });
-				store.dispatch('tagsViewRoutes/setCurrenFullscreen');
+				store.dispatch('tagsViewRoutes/setCurrenFullscreen', 500);
 			});
 		};
 		// 当前项右键菜单点击，拿当前点击的路由路径对比 浏览器缓存中的 tagsView 路由数组，取当前点击项的详细路由信息
diff --git a/src/store/modules/tagsViewRoutes.ts b/src/store/modules/tagsViewRoutes.ts
index 66b2a88..8779904 100644
--- a/src/store/modules/tagsViewRoutes.ts
+++ b/src/store/modules/tagsViewRoutes.ts
@@ -29,33 +29,34 @@ const tagsViewRoutesModule: Module<TagsViewRoutesState, RootStateTypes> = {
 			commit('getTagsViewRoutes', data);
 		},
 		// 设置卡片全屏
-		setCurrenFullscreen({ commit }) {
+		setCurrenFullscreen({ commit }, timeout: number = 0) {
 			const screenfulls: any = screenfull;
 			if (!screenfulls.isEnabled) {
 				ElMessage.warning('暂不不支持全屏');
 				return false;
 			}
-			screenfulls.toggle();
-			const currenFullscreenChange = () => {
-				const layoutViewBgWhite = document.querySelector('.layout-view-bg-white') as HTMLElement;
-				if (screenfulls.isFullscreen) {
-					commit('getCurrenFullscreen', true);
-					// 设置全屏时，设置有 `layout-view-bg-white` 类的高度
-					if (layoutViewBgWhite) layoutViewBgWhite.style.height = `calc(100vh - 30px)`;
-				} else {
-					screenfulls.off('change', currenFullscreenChange);
-					commit('getCurrenFullscreen', false);
-					if (!layoutViewBgWhite) return false;
-					const getThemeConfig = Local.get('themeConfig');
-					if (getThemeConfig) {
-						let { isTagsview } = getThemeConfig;
-						if (isTagsview) layoutViewBgWhite.style.height = `calc(100vh - 114px)`;
-						else layoutViewBgWhite.style.height = `calc(100vh - 80px)`;
+			setTimeout(() => {
+				const currenFullscreenChange = () => {
+					const layoutViewBgWhite = document.querySelector('.layout-view-bg-white') as HTMLElement;
+					if (screenfulls.isFullscreen) {
+						commit('getCurrenFullscreen', true);
+						// 设置全屏时，设置有 `layout-view-bg-white` 类的高度
+						if (layoutViewBgWhite) layoutViewBgWhite.style.height = `calc(100vh - 30px)`;
+					} else {
+						screenfulls.off('change', currenFullscreenChange);
+						commit('getCurrenFullscreen', false);
+						if (!layoutViewBgWhite) return false;
+						const getThemeConfig = Local.get('themeConfig');
+						if (getThemeConfig) {
+							let { isTagsview } = getThemeConfig;
+							if (isTagsview) layoutViewBgWhite.style.height = `calc(100vh - 114px)`;
+							else layoutViewBgWhite.style.height = `calc(100vh - 80px)`;
+						}
 					}
-				}
-			};
-			screenfulls.on('change', currenFullscreenChange);
-			commit('getCurrenFullscreen', true);
+				};
+				screenfulls.on('change', currenFullscreenChange);
+				screenfulls.toggle();
+			}, timeout);
 		},
 	},
 };