diff --git a/web/src/layouts/[...all].tsx b/web/src/layouts/[...all].tsx
index bb704eb4..fe6d84ec 100644
--- a/web/src/layouts/[...all].tsx
+++ b/web/src/layouts/[...all].tsx
@@ -15,7 +15,6 @@ export default defineComponent({
setup() {
const route = useRoute()
const router = useRouter()
- console.log(route)
return () => (
diff --git a/web/src/layouts/components/iframe/index.tsx b/web/src/layouts/components/iframe/index.tsx
index 7c49ddc2..17fa016c 100644
--- a/web/src/layouts/components/iframe/index.tsx
+++ b/web/src/layouts/components/iframe/index.tsx
@@ -13,6 +13,8 @@ export default defineComponent({
name: 'MineIframe',
setup() {
const route = useRoute()
+ const routers = useRouter().getRoutes()
+ const iframeStore = useIframeKeepAliveStore()
onMounted(() => {
const workerArea = document.querySelector('.mine-worker-area') as HTMLDivElement
workerArea.classList.add('overflow-hidden')
@@ -20,7 +22,16 @@ export default defineComponent({
})
return () => (
- {(route.meta?.type === 'I' && route.meta?.link) && }
+ {iframeStore.iframeList?.map((name: string) => {
+ return (
+
)
},
diff --git a/web/src/layouts/components/main-aside/index.tsx b/web/src/layouts/components/main-aside/index.tsx
index 1d0ad078..1780c356 100644
--- a/web/src/layouts/components/main-aside/index.tsx
+++ b/web/src/layouts/components/main-aside/index.tsx
@@ -30,7 +30,6 @@ export default defineComponent ({
const shadowRight = ref
(false)
function onAsideScroll() {
- console.log(11111)
const scrollTop = mainAsideRef.value.scrollTop
const scrollLeft = mainAsideRef.value.scrollLeft
shadowTop.value = scrollTop > 0
diff --git a/web/src/layouts/index.tsx b/web/src/layouts/index.tsx
index eb9a4613..9b618b38 100644
--- a/web/src/layouts/index.tsx
+++ b/web/src/layouts/index.tsx
@@ -16,6 +16,7 @@ import MineSubAside from './components/sub-aside'
import MineBars from './components/bars'
import MineFooter from './components/footer'
import MineBackTop from './components/back-top'
+import MineIframe from './components/iframe'
import '@/layouts/style/index.scss'
import type { SystemSettings } from '#/global'
import handleResize from '@/utils/handleResize'
@@ -83,11 +84,12 @@ export default defineComponent({
{({ Component, route }) => (
- {keepAliveStore.getShowState() && }
+ {(keepAliveStore.getShowState() && route.meta.type !== 'I') && }
)}
+