From 4d058e1dce32ea925e50ef67797e9120cddb92b1 Mon Sep 17 00:00:00 2001
From: JEECG <445654970@qq.com>
Date: Tue, 17 Dec 2024 09:43:18 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90issues/7561=E3=80=91=E4=B8=BB=E9=A2=98?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E4=B8=BA=E9=A1=B6=E9=83=A8=E6=B7=B7=E5=90=88?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E6=97=B6=EF=BC=8C=E9=A1=B5=E9=9D=A2=E9=A1=B6?=
 =?UTF-8?q?=E9=83=A8=E5=86=85=E5=AE=B9=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=87=BA?=
 =?UTF-8?q?=E6=9D=A5=EF=BC=8C=E8=A2=AB=E9=81=AE=E7=9B=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/layouts/default/header/MultipleHeader.vue          | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/jeecgboot-vue3/src/layouts/default/header/MultipleHeader.vue b/jeecgboot-vue3/src/layouts/default/header/MultipleHeader.vue
index 20546a0f..aac69d4b 100644
--- a/jeecgboot-vue3/src/layouts/default/header/MultipleHeader.vue
+++ b/jeecgboot-vue3/src/layouts/default/header/MultipleHeader.vue
@@ -21,6 +21,7 @@
   import { useDesign } from '/@/hooks/web/useDesign';
   import { useLayoutHeight } from '../content/useContentViewHeight';
   import { TabsThemeEnum } from '/@/enums/appEnum';
+  import { MenuTypeEnum } from '/@/enums/menuEnum';
 
   // update-begin--author:liaozhiyang---date:20240407---for：【QQYUN-8774】网站header区域加高
   const HEADER_HEIGHT = 60;
@@ -41,7 +42,7 @@
       const appStore = useAppStore()
       const glob = useGlobSetting()
 
-      const { getCalcContentWidth, getSplit } = useMenuSetting();
+      const { getCalcContentWidth, getSplit, getMenuType } = useMenuSetting();
       const { getIsMobile } = useAppInject();
       const { getFixed, getShowInsetHeaderRef, getShowFullHeaderRef, getHeaderTheme } = useHeaderSetting();
 
@@ -98,9 +99,11 @@
 
       const getPlaceholderDomStyle = computed((): CSSProperties => {
         let height = 0;
-        if ((unref(getShowFullHeaderRef) || !unref(getSplit)) && unref(getShowHeader) && !unref(getFullContent)) {
+        // update-begin--author:liaozhiyang---date:20241216---for：【issues/7561】主题切换为顶部混合模式时，页面顶部内容显示不出来，被遮盖
+        if ((unref(getShowFullHeaderRef) || !unref(getSplit)) && unref(getShowHeader) && !unref(getFullContent) || unref(getMenuType) == MenuTypeEnum.MIX) {
           height += HEADER_HEIGHT;
         }
+        // update-end--author:liaozhiyang---date:20241216---for：【issues/7561】主题切换为顶部混合模式时，页面顶部内容显示不出来，被遮盖
         if (unref(getShowTabs) && !unref(getFullContent)) {
           height += unref(getTabsThemeHeight);
         }