From c4bcc6e78ecaec6e9ea68802be7c1d3a7b063512 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 21 十一月 2024 13:08:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'supervisionVue/hc-dataproduct-v1112' into lsf-dataproduct-1024
---
src/components/core/BaseContentLayout.vue | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/components/core/BaseContentLayout.vue b/src/components/core/BaseContentLayout.vue
index ce92424..c68f43c 100644
--- a/src/components/core/BaseContentLayout.vue
+++ b/src/components/core/BaseContentLayout.vue
@@ -5,7 +5,7 @@
</el-header>
<el-container>
<el-aside class="el-aside" :style="'height: ' + mainHeight">
- <el-scrollbar>
+ <el-scrollbar :noresize="true">
<slot name="aside"></slot>
</el-scrollbar>
</el-aside>
@@ -30,14 +30,16 @@
if (this.$refs.headerRef) {
const h1 = this.$refs.headerRef.$el.offsetHeight;
const h = h1;
- return `calc(100vh - ${h}px - 60px - var(--el-main-padding) * 2)`;
+ return `calc(100vh - ${h}px - 60px - var(--el-main-padding) * 2 + 6px)`;
} else {
return `calc(100vh - 60px * 2 - var(--el-main-padding) * 2)`;
}
}
},
mounted() {
- this.mainHeight = this.calHeight();
+ setTimeout(() => {
+ this.mainHeight = this.calHeight();
+ }, 150);
}
};
</script>
@@ -45,6 +47,7 @@
<style scoped>
.el-aside {
/* width: initial; */
+ /* overflow-x: auto; */
position: relative;
/* height: calc(100vh - 60px * 2 - 20px * 2); */
/* background-color: aqua; */
--
Gitblit v1.9.3