From c334c2d76c1b51d0fbe1531bf524e1b90f921a7c Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 20 五月 2025 15:16:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/layout/components/AppMain.vue | 46 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 37 insertions(+), 9 deletions(-)
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index ab03c25..a87ef7d 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -2,23 +2,35 @@
<section class="app-main">
<router-view v-slot="{ Component, route }">
<transition name="fade-transform" mode="out-in">
- <keep-alive :include="cachedViews">
- <component :is="Component" :key="route.path"/>
+ <keep-alive :include="tagsViewStore.cachedViews">
+ <component v-if="!route.meta.link" :is="Component" :key="route.path"/>
</keep-alive>
</transition>
</router-view>
+ <iframe-toggle />
</section>
</template>
<script setup>
-import useTagsViewStore from '@/store/modules/tagsview'
+import iframeToggle from "./IframeToggle/index"
+import useTagsViewStore from '@/store/modules/tagsView'
-const tagsViewStore = useTagsViewStore()
const route = useRoute()
-tagsViewStore.addCachedView(route)
-const cachedViews = computed(() => {
- return tagsViewStore.cachedViews
+const tagsViewStore = useTagsViewStore()
+
+onMounted(() => {
+ addIframe()
})
+
+watchEffect(() => {
+ addIframe()
+})
+
+function addIframe() {
+ if (route.meta.link) {
+ useTagsViewStore().addIframeView(route)
+ }
+}
</script>
<style lang="scss" scoped>
@@ -28,6 +40,7 @@
width: 100%;
position: relative;
overflow: hidden;
+ background: #F5F7FB;
}
.fixed-header + .app-main {
@@ -50,7 +63,22 @@
// fix css style bug in open el-dialog
.el-popup-parent--hidden {
.fixed-header {
- padding-right: 17px;
+ padding-right: 6px;
}
}
-</style>
\ No newline at end of file
+
+::-webkit-scrollbar {
+ width: 6px;
+ height: 6px;
+}
+
+::-webkit-scrollbar-track {
+ background-color: #f1f1f1;
+}
+
+::-webkit-scrollbar-thumb {
+ background-color: #c0c0c0;
+ border-radius: 3px;
+}
+</style>
+
--
Gitblit v1.9.3