From 00e0dbbf98347b1e47a7e0aedd41baa61f7567ed Mon Sep 17 00:00:00 2001
From: fuyongxin <110568259@qq.com>
Date: Wed, 03 Jun 2026 08:47:03 +0800
Subject: [PATCH] 修改配置nacos，后端gateway端口
---
ruoyi-ui/src/layout/components/AppMain.vue | 87 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 76 insertions(+), 11 deletions(-)
diff --git a/ruoyi-ui/src/layout/components/AppMain.vue b/ruoyi-ui/src/layout/components/AppMain.vue
index c206a18..e8dfc93 100644
--- a/ruoyi-ui/src/layout/components/AppMain.vue
+++ b/ruoyi-ui/src/layout/components/AppMain.vue
@@ -6,21 +6,39 @@
</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
},
key() {
return this.$route.path
+ }
+ },
+ watch: {
+ $route() {
+ this.addIframe()
+ }
+ },
+ mounted() {
+ this.addIframe()
+ },
+ methods: {
+ addIframe() {
+ const { name } = this.$route
+ if (name && this.$route.meta.link) {
+ this.$store.dispatch('tagsView/addIframeView', this.$route)
+ }
}
}
}
@@ -33,10 +51,29 @@
width: 100%;
position: relative;
overflow: hidden;
+
+ &:fullscreen,
+ &:-webkit-full-screen,
+ &:-moz-full-screen,
+ &:-ms-fullscreen {
+ background: #fff;
+ overflow-y: auto;
+ }
}
.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 {
@@ -46,19 +83,47 @@
}
.fixed-header + .app-main {
- padding-top: 84px;
+ margin-top: 84px;
+ height: calc(100vh - 84px);
+ min-height: 0px;
+ }
+}
+
+/* 移动端fixed-header优化 */
+@media screen and (max-width: 991px) {
+ .fixed-header + .app-main {
+ padding-bottom: max(60px, calc(constant(safe-area-inset-bottom) + 40px));
+ padding-bottom: max(60px, calc(env(safe-area-inset-bottom) + 40px));
+ overscroll-behavior-y: none;
+ }
+
+ .hasTagsView .fixed-header + .app-main {
+ padding-bottom: max(60px, calc(constant(safe-area-inset-bottom) + 40px));
+ padding-bottom: max(60px, calc(env(safe-area-inset-bottom) + 40px));
+ overscroll-behavior-y: none;
+ }
+}
+
+@supports (-webkit-touch-callout: none) {
+ @media screen and (max-width: 991px) {
+ .fixed-header + .app-main {
+ padding-bottom: max(17px, calc(constant(safe-area-inset-bottom) + 10px));
+ padding-bottom: max(17px, calc(env(safe-area-inset-bottom) + 10px));
+ height: calc(100svh - 50px);
+ height: calc(100dvh - 50px);
+ }
+
+ .hasTagsView .fixed-header + .app-main {
+ padding-bottom: max(17px, calc(constant(safe-area-inset-bottom) + 10px));
+ padding-bottom: max(17px, calc(env(safe-area-inset-bottom) + 10px));
+ height: calc(100svh - 84px);
+ height: calc(100dvh - 84px);
+ }
}
}
</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;
@@ -72,4 +137,4 @@
background-color: #c0c0c0;
border-radius: 3px;
}
-</style>
+</style>
\ No newline at end of file
--
Gitblit v1.9.3