From 3ba8323cb7cc42f1441a41d998dad3e5512dbbae Mon Sep 17 00:00:00 2001 From: zlyx <1242874891@qq.com> Date: 星期一, 30 一月 2023 20:10:16 +0800 Subject: [PATCH] update 修改 BaseEntity 创建人, 修改人字段类型, 修改相关 LambdaQueryWrapper 类型判断 ; update 修改 CreateAndUpdateMetaObjectHandler#insertFill 字段填充保存相关参数id ; --- ruoyi-ui/src/layout/components/AppMain.vue | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ruoyi-ui/src/layout/components/AppMain.vue b/ruoyi-ui/src/layout/components/AppMain.vue index 0c6f4b7..f4e74db 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,7 +45,7 @@ min-height: calc(100vh - 84px); } - .fixed-header+.app-main { + .fixed-header + .app-main { padding-top: 84px; } } -- Gitblit v1.9.3