From e72e2ed1f8fbca2283d71f293afd34c02e5232d2 Mon Sep 17 00:00:00 2001
From: kiki1373639299 <zkai0106@163.com>
Date: Wed, 12 Nov 2025 15:53:36 +0800
Subject: [PATCH] =?UTF-8?q?feat(layout):=20=E6=B7=B7=E5=90=88=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80=E5=92=8C=E5=8F=8C=E5=88=97=E5=B8=83=E5=B1=80=20?=
 =?UTF-8?q?=E8=A1=A5=E5=85=85=E7=89=88=E6=9D=83=E4=BF=A1=E6=81=AF=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=92=8C=E5=BC=B9=E7=AA=97=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: kiki1373639299<zkai0106@163.com>



# message auto-generated for no-merge-commit merge:
!15 merge layout-fix into dev

feat(layout): 混合布局和双列布局 补充版权信息组件和弹窗组件

Created-by: kiki1373639299
Commit-by: kiki1373639299
Merged-by: Charles_7c
Description: <!--
  非常感谢您的 PR！在提交之前，请务必确保您 PR 的代码经过了完整测试，并且通过了代码规范检查。
-->

<!-- 在 [] 中输入 x 来勾选) -->

## PR 类型

<!-- 您的 PR 引入了哪种类型的变更？ -->
<!-- 只支持选择一种类型，如果有多种类型，可以在更新日志中增加 “类型” 列。 -->

- [X] 新 feature
- [ ] Bug 修复
- [ ] 功能增强
- [ ] 文档变更
- [ ] 代码样式变更
- [ ] 重构
- [ ] 性能改进
- [ ] 单元测试
- [ ] CI/CD
- [ ] 其他

## PR 目的

<!-- 描述一下您的 PR 解决了什么问题。如果可以，请链接到相关 issues。 -->

## 解决方案

<!-- 详细描述您是如何解决的问题 -->

## PR 测试

<!-- 如果可以，请为您的 PR 添加或更新单元测试。 -->
<!-- 请描述一下您是如何测试 PR 的。例如：创建/更新单元测试或添加相关的截图。 -->

## Changelog

| 模块  | Changelog | Related issues |
|-----|-----------| -------------- |
|   src/layout  |      layoutMix 和 layoutColumns 增加 GiFooter 和  NoticePopup     |                |

<!-- 如果有多种类型的变更，可以在变更日志表中增加 “类型” 列，该列的值与上方 “PR 类型” 相同。 -->
<!-- Related issues 格式为 Closes #<issue号>，或者 Fixes #<issue号>，或者 Resolves #<issue号>。 -->

## 其他信息

<!-- 请描述一下还有哪些注意事项。例如：如果引入了一个不向下兼容的变更，请描述其影响。 -->

## 提交前确认

- [X] PR 代码经过了完整测试，并且通过了代码规范检查
- [X] 已经完整填写 Changelog，并链接到了相关 issues
- [X] PR 代码将要提交到 dev 分支

See merge request: continew/continew-admin-ui!15
---
 src/layout/LayoutColumns.vue                  | 73 ++++++++++++++++---
 src/layout/LayoutMix.vue                      | 27 +++++++
 src/layout/hooks/useLevelMenu.ts              |  7 +-
 .../user/message/components/NoticePopup.vue   |  2 +-
 4 files changed, 95 insertions(+), 14 deletions(-)

diff --git a/src/layout/LayoutColumns.vue b/src/layout/LayoutColumns.vue
index 8844a94..5435a09 100644
--- a/src/layout/LayoutColumns.vue
+++ b/src/layout/LayoutColumns.vue
@@ -5,21 +5,27 @@
       <OneLevelMenu :menus="oneLevelMenus" @menu-click="handleMenuItemClickByItem"></OneLevelMenu>
 
       <!-- 左侧二级菜单区域 -->
-      <div class="layout-columns__right-menu">
-        <div class="layout-columns__system-name gi_line_1">{{ appStore.getTitle() }}</div>
+      <div class="layout-columns__right-menu" :class="{ collapse: appStore.menuCollapse }">
+        <!-- 系统标题 -->
+        <div class="layout-columns__title">
+          <span v-show="!appStore.menuCollapse" class="system-name gi_line_1">{{ appStore.getTitle() }}</span>
+        </div>
         <Menu
           v-if="twoLevelMenus.length > 1 || oneLevelMenuActiveRoute?.meta?.alwaysShow === true"
-          class="layout-columns__menu" :menus="twoLevelMenus" :menu-style="{ width: '180px' }"
+          class="layout-columns__menu" :menus="twoLevelMenus" :menu-style="menuStyle"
         />
       </div>
     </div>
 
-    <!-- 右侧内容区域 -->
     <section class="layout-columns__content">
       <Header />
       <Tabs v-if="appStore.tab" />
       <Main />
+      <GiFooter v-if="appStore.copyrightDisplay" />
     </section>
+
+    <!-- 公告弹窗 -->
+    <NoticePopup ref="noticePopupRef" />
   </div>
 </template>
 
@@ -32,6 +38,8 @@ import Tabs from './components/Tabs/index.vue'
 import { useAppStore } from '@/stores'
 import { useLevelMenu } from '@/layout/hooks/useLevelMenu'
 import { useDevice } from '@/hooks'
+import NoticePopup from '@/views/user/message/components/NoticePopup.vue'
+import { getToken } from '@/utils/auth'
 
 defineOptions({ name: 'LayoutColumns' })
 
@@ -40,6 +48,29 @@ const { isDesktop } = useDevice()
 
 const { oneLevelMenus, twoLevelMenus, oneLevelMenuActiveRoute, getOneLevelMenus, handleMenuItemClickByItem } = useLevelMenu()
 getOneLevelMenus()
+// 菜单样式 - 根据折叠状态动态调整宽度
+const menuStyle = computed(() => {
+  return {
+    width: appStore.menuCollapse ? '48px' : '200px',
+  }
+})
+// 公告弹窗引用
+const noticePopupRef = ref<InstanceType<typeof NoticePopup>>()
+
+// 检查并显示未读公告
+const checkAndShowNotices = () => {
+  const token = getToken()
+
+  // 如果有token，检查未读公告
+  if (token) {
+    setTimeout(() => {
+      noticePopupRef.value?.open()
+    }, 1000) // 延迟1秒显示，让页面先加载完成
+  }
+}
+onMounted(() => {
+  checkAndShowNotices()
+})
 </script>
 
 <style lang="scss" scoped>
@@ -59,12 +90,16 @@ getOneLevelMenus()
   &__right-menu {
     display: flex;
     flex-direction: column;
-    width: 180px;
     overflow: hidden;
     background-color: var(--color-bg-1);
+    width: 200px;
+    transition: width 0.3s ease-in-out;
+    &.collapse {
+      width: 48px;
+    }
   }
 
-  &__system-name {
+  &__title {
     height: 56px;
     padding: 0 12px;
     color: var(--color-text-1);
@@ -78,17 +113,35 @@ getOneLevelMenus()
     border-bottom: 1px solid var(--color-border);
     cursor: pointer;
     user-select: none;
-    transition: padding .2s;
+    transition: all 0.3s ease-in-out;
 
-    &:hover {
-      color: $color-theme !important;
-      cursor: pointer;
+    .system-name {
+      padding-left: 6px;
+      white-space: nowrap;
+      transition: all 0.3s ease-in-out;
+      line-height: 1.5;
+      display: inline-flex;
+      align-items: center;
+      opacity: 1;
+      transform: translateX(0);
+
+      &:hover {
+        color: $color-theme !important;
+        cursor: pointer;
+      }
+
+      .layout-columns__right-menu.collapse & {
+        opacity: 0;
+        transform: translateX(-20px);
+      }
     }
   }
   &__menu {
     flex: 1;
     overflow: auto;
     border-right: 1px solid var(--color-border-2);
+    transition: all 0.3s ease-in-out;
+    width: 100%;
   }
 
   &__content {
diff --git a/src/layout/LayoutMix.vue b/src/layout/LayoutMix.vue
index 1cb273d..357f439 100644
--- a/src/layout/LayoutMix.vue
+++ b/src/layout/LayoutMix.vue
@@ -11,6 +11,7 @@
     >
       <Logo :collapsed="appStore.menuCollapse" />
       <Menu :menus="twoLevelMenus" :menu-style="{ width: '200px', flex: 1 }" />
+      <WwAds class="ads" />
     </section>
 
     <!-- 右侧内容区域 -->
@@ -32,7 +33,11 @@
       </header>
       <Tabs v-if="appStore.tab" />
       <Main />
+      <GiFooter v-if="appStore.copyrightDisplay" />
     </section>
+
+    <!-- 公告弹窗 -->
+    <NoticePopup ref="noticePopupRef" />
   </div>
 </template>
 
@@ -47,6 +52,10 @@ import Tabs from './components/Tabs/index.vue'
 import { useAppStore } from '@/stores'
 import { useLevelMenu } from '@/layout/hooks/useLevelMenu'
 import { useDevice } from '@/hooks'
+import { getToken } from '@/utils/auth'
+
+import WwAds from '@/layout/components/WwAds.vue'
+import NoticePopup from '@/views/user/message/components/NoticePopup.vue'
 
 /** 组件名称 */
 defineOptions({ name: 'LayoutMix' })
@@ -64,9 +73,27 @@ getOneLevelMenus()
 
 const activeMenu = computed(() => [oneLevelMenuActiveRoute.value?.path ?? ''])
 
+// 公告弹窗引用
+const noticePopupRef = ref<InstanceType<typeof NoticePopup>>()
+
+// 检查并显示未读公告
+const checkAndShowNotices = () => {
+  const token = getToken()
+
+  // 如果有token，检查未读公告
+  if (token) {
+    setTimeout(() => {
+      console.log(noticePopupRef.value)
+      noticePopupRef.value?.open()
+    }, 1000) // 延迟1秒显示，让页面先加载完成
+  }
+}
 const getMenuIcon = (item: RouteRecordRaw) => {
   return item.meta?.icon || item.children?.[0]?.meta?.icon
 }
+onMounted(() => {
+  checkAndShowNotices()
+})
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/layout/hooks/useLevelMenu.ts b/src/layout/hooks/useLevelMenu.ts
index 994fa6d..84a4d03 100644
--- a/src/layout/hooks/useLevelMenu.ts
+++ b/src/layout/hooks/useLevelMenu.ts
@@ -1,5 +1,5 @@
 import type { RouteRecordRaw } from 'vue-router'
-import { eachTree } from 'xe-utils'
+import { eachTree, searchTree } from 'xe-utils'
 import { useRouteListener } from '@/hooks'
 import { useRouteStore } from '@/stores'
 import { filterTree } from '@/utils'
@@ -29,11 +29,12 @@ export function useLevelMenu() {
   const oneLevelMenuActiveRoute = ref<RouteRecordRaw | null>(null)
 
   const getOneLevelMenuActiveRoute = (path: string) => {
-    return oneLevelMenus.value.find((i) => i.path === path) as RouteRecordRaw
+    const arr = searchTree(showMenuList, (i) => i.path === path)
+    return arr?.[0]
   }
 
   listenerRouteChange(({ to }) => {
-    oneLevelMenuActiveRoute.value = getOneLevelMenuActiveRoute(to.matched?.[0]?.path)
+    oneLevelMenuActiveRoute.value = getOneLevelMenuActiveRoute(to.path)
   })
 
   // 获取一级菜单
diff --git a/src/views/user/message/components/NoticePopup.vue b/src/views/user/message/components/NoticePopup.vue
index 7307ba1..e7b6907 100644
--- a/src/views/user/message/components/NoticePopup.vue
+++ b/src/views/user/message/components/NoticePopup.vue
@@ -126,7 +126,7 @@ const fetchNoticeDetail = async (index: number) => {
     console.error(`获取公告详情失败:`, error)
     // 创建一个错误状态的公告对象
     noticeCache.value.set(noticeId, {
-      id: noticeId,
+      id: noticeId || '',
       title: '获取公告失败',
       content: '获取公告内容失败，请稍后重试',
       createUserString: '',