From 6aecd35a4ff01c2811e3bc9aaf55a8f566e2ca10 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 13 Nov 2025 11:58:03 +0800
Subject: [PATCH] 修复combo属性过多sheet出现的异常问题
---
ruoyi-ui/src/layout/components/AppMain.vue | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/ruoyi-ui/src/layout/components/AppMain.vue b/ruoyi-ui/src/layout/components/AppMain.vue
index d88c67c..b345dd0 100644
--- a/ruoyi-ui/src/layout/components/AppMain.vue
+++ b/ruoyi-ui/src/layout/components/AppMain.vue
@@ -6,15 +6,17 @@
</keep-alive>
</transition>
<iframe-toggle />
+ <copyright />
</section>
</template>
<script>
+import copyright from "./Copyright/index"
import iframeToggle from "./IframeToggle/index"
export default {
name: 'AppMain',
- components: { iframeToggle },
+ components: { iframeToggle, copyright },
computed: {
cachedViews() {
return this.$store.state.tagsView.cachedViews
@@ -33,7 +35,7 @@
},
methods: {
addIframe() {
- const {name} = this.$route
+ const { name } = this.$route
if (name && this.$route.meta.link) {
this.$store.dispatch('tagsView/addIframeView', this.$route)
}
@@ -52,7 +54,18 @@
}
.fixed-header + .app-main {
- padding-top: 50px;
+ overflow-y: auto;
+ scrollbar-gutter: auto;
+ height: calc(100vh - 50px);
+ min-height: 0px;
+}
+
+.app-main:has(.copyright) {
+ padding-bottom: 36px;
+}
+
+.fixed-header + .app-main {
+ margin-top: 50px;
}
.hasTagsView {
@@ -62,19 +75,14 @@
}
.fixed-header + .app-main {
- padding-top: 84px;
+ margin-top: 84px;
+ height: calc(100vh - 84px);
+ min-height: 0px;
}
}
</style>
<style lang="scss">
-// fix css style bug in open el-dialog
-.el-popup-parent--hidden {
- .fixed-header {
- padding-right: 6px;
- }
-}
-
::-webkit-scrollbar {
width: 6px;
height: 6px;
--
Gitblit v1.9.3