From db60baa963512e2c7567f2f9860d77e1b3bcda5e Mon Sep 17 00:00:00 2001
From: lisheng <760481557@qq.com>
Date: Sun, 10 Jul 2022 21:41:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E5=86=85?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E8=AE=BE=E7=BD=AE=E7=99=BE=E5=88=86=E6=AF=94?=
 =?UTF-8?q?=EF=BC=8C=E9=9C=80=E8=A6=81=E8=8E=B7=E5=8F=96=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E6=A0=8F=E9=AB=98=E5=BA=A6=E5=86=8D=E8=AE=BE=E7=BD=AE=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E9=AB=98=E5=BA=A6=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

页面内默认设置高度为100%，如需取消设置默认高度需要修改src/layout/routerView/parent.vue文件<component>标签的h100
---
 src/layout/component/main.vue    | 10 ++++++++--
 src/layout/routerView/parent.vue |  2 +-
 src/theme/app.scss               |  5 +++++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/layout/component/main.vue b/src/layout/component/main.vue
index 18eba60..b322fb0 100644
--- a/src/layout/component/main.vue
+++ b/src/layout/component/main.vue
@@ -1,5 +1,5 @@
 <template>
-	<el-main class="layout-main">
+	<el-main class="layout-main" :style="{ height: 'calc( 100% - ' + setHeaderHeight + ')' }">
 		<el-scrollbar
 			ref="layoutScrollbarRef"
 			:class="{
@@ -61,7 +61,12 @@ export default defineComponent({
 		// 初始化获取当前路由 meta，用于设置 iframes padding
 		const initGetMeta = () => {
 			state.currentRouteMeta = route.meta;
-		};
+		};// 设置 header 的高度
+        const setHeaderHeight = computed(() => {
+            let { isTagsview, layout } = themeConfig.value;
+            if (isTagsview && layout !== 'classic') return '84px';
+            else return '50px';
+        });
 		// 页面加载前
 		onMounted(async () => {
 			await initGetMeta();
@@ -95,6 +100,7 @@ export default defineComponent({
 			themeConfig,
 			isClassicOrTransverse,
 			...toRefs(state),
+            setHeaderHeight
 		};
 	},
 });
diff --git a/src/layout/routerView/parent.vue b/src/layout/routerView/parent.vue
index db22141..770d439 100644
--- a/src/layout/routerView/parent.vue
+++ b/src/layout/routerView/parent.vue
@@ -3,7 +3,7 @@
 		<router-view v-slot="{ Component }">
 			<transition :name="setTransitionName" mode="out-in">
 				<keep-alive :include="getKeepAliveNames">
-					<component :is="Component" :key="refreshRouterViewKey" class="w100" />
+					<component :is="Component" :key="refreshRouterViewKey" class="w100 h100" />
 				</keep-alive>
 			</transition>
 		</router-view>
diff --git a/src/theme/app.scss b/src/theme/app.scss
index 4c75296..5f883cf 100644
--- a/src/theme/app.scss
+++ b/src/theme/app.scss
@@ -71,6 +71,11 @@ body,
 	.el-scrollbar {
 		width: 100%;
 	}
+	.layout-backtop {
+		.el-scrollbar__view {
+			height: 100%;
+		}
+	}
 	// 此字段多次用到，建议不删除，如需修改，请重写覆盖样式
 	.layout-view-bg-white {
 		background: var(--el-color-white);
-- 
Gitee