This commit is contained in:
ygx
2026-03-08 22:41:42 +08:00
parent f7bbb5ee46
commit 180d980514
23 changed files with 1392 additions and 850 deletions

View File

@@ -1,13 +1,13 @@
<template>
<a-layout class="layout" :class="{ mobile: appStore.hideMenu }">
<div v-if="navbar" class="layout-navbar">
<div v-if="navbar && !route?.meta?.isNewTab" class="layout-navbar">
<NavBar />
</div>
<a-layout>
<a-layout>
<a-layout-sider
v-if="renderMenu"
v-show="!hideMenu"
v-show="!hideMenu && !route?.meta?.isNewTab"
class="layout-sider"
:breakpoint="'xl'"
:collapsible="true"
@@ -41,7 +41,7 @@
<Menu />
</a-drawer>
<a-layout class="layout-content" :style="paddingStyle">
<TabBar v-if="appStore.tabBar" />
<!-- <TabBar v-if="appStore.tabBar" /> -->
<a-layout-content>
<PageLayout />
</a-layout-content>
@@ -71,14 +71,17 @@ const router = useRouter()
const route = useRoute()
const permission = usePermission()
useResponsive(true)
const navbarHeight = `60px`
const navbarHeight = route?.meta?.isNewTab ? '0' : `60px`
const navbar = computed(() => appStore.navbar)
const renderMenu = computed(() => appStore.menu && !appStore.topMenu)
const hideMenu = computed(() => appStore.hideMenu)
const footer = computed(() => appStore.footer)
const menuWidth = computed(() => {
if (route?.meta?.isNewTab) return 0
return appStore.menuCollapse ? 48 : appStore.menuWidth
})
console.log('route', route)
const paddingStyle = computed(() => {
const paddingLeft = renderMenu.value && !hideMenu.value ? { paddingLeft: `${menuWidth.value}px` } : {}
const paddingTop = navbar.value ? { paddingTop: navbarHeight } : {}