From 7421d7cccee99d7c60a0c8af8e7e6aeabc2f2666 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: Wed, 29 Mar 2023 10:44:23 +0800
Subject: [PATCH] !313 异步保存日志的时候，报错被吞 ，导致没跑进RemoteLogFallbackFactory中 Merge pull request !313 from Llorando/master
---
ruoyi-ui/src/layout/components/AppMain.vue | 19 +++++++------------
1 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/ruoyi-ui/src/layout/components/AppMain.vue b/ruoyi-ui/src/layout/components/AppMain.vue
index 423437b..55804bb 100644
--- a/ruoyi-ui/src/layout/components/AppMain.vue
+++ b/ruoyi-ui/src/layout/components/AppMain.vue
@@ -2,15 +2,19 @@
<section class="app-main">
<transition name="fade-transform" mode="out-in">
<keep-alive :include="cachedViews">
- <router-view :key="key" />
+ <router-view v-if="!$route.meta.link" :key="key" />
</keep-alive>
</transition>
+ <iframe-toggle />
</section>
</template>
<script>
+import iframeToggle from "./IframeToggle/index"
+
export default {
name: 'AppMain',
+ components: { iframeToggle },
computed: {
cachedViews() {
return this.$store.state.tagsView.cachedViews
@@ -31,7 +35,7 @@
overflow: hidden;
}
-.fixed-header+.app-main {
+.fixed-header + .app-main {
padding-top: 50px;
}
@@ -41,17 +45,8 @@
min-height: calc(100vh - 84px);
}
- .fixed-header+.app-main {
+ .fixed-header + .app-main {
padding-top: 84px;
- }
-}
-</style>
-
-<style lang="scss">
-// fix css style bug in open el-dialog
-.el-popup-parent--hidden {
- .fixed-header {
- padding-right: 15px;
}
}
</style>
--
Gitblit v1.9.3