From b623e18b9b85dc22da999d2b48bbe48b88fe6944 Mon Sep 17 00:00:00 2001
From: lijing <lijing@bestsch.com>
Date: Mon, 21 Sep 2026 12:09:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=80=80=E5=87=BA?=
 =?UTF-8?q?=E8=B7=B3=E9=94=99=E5=9F=9F=E3=80=81=E4=BA=8C=E7=BA=A7=E9=A1=B5?=
 =?UTF-8?q?=E9=AB=98=E4=BA=AE=E3=80=81=E8=90=BD=E5=9C=B0=E9=A1=B5=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E5=8F=A3=E5=BE=84=E4=B8=8E=E6=93=8D=E4=BD=9C=E5=88=97?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87=E6=82=AC=E6=B5=AE=E4=B8=8D=E5=B1=85=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                      | 136 +++++++++++++++++++++----
 src/assets/config/host.config.ts |  29 +++++-
 src/assets/styles/layout.css     |   2 +-
 src/components/layout.vue        | 166 ++++++++++++++++++++++---------
 src/utils/menuRoute.ts           |  47 +++++++++
 5 files changed, 310 insertions(+), 70 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 1acee0f..1da17b0 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,14 +1,35 @@
 <script setup lang="ts">
-import { ref, reactive, onMounted } from "vue";
+import { ref, reactive, computed, onMounted, watch, provide } from "vue";
 import layout from "./components/layout.vue";
-import { useRouter } from "vue-router";
+import { useRoute, useRouter } from "vue-router";
 import config from "@/assets/config/host.config";
 import { baseApi } from "@/api/module/notice";
-import { resolveMenuPage } from "@/utils/menuRoute";
+import { normalizeModList, flattenMenuNodes, firstMenuPath } from "@/utils/menuRoute";
+import routes from "@/router/routes";
 import { Message } from "view-ui-plus";
 
 const router = useRouter();
+const route = useRoute();
 const isLogin = ref(false);
+
+/**
+ * 视图重挂载信号（配合下方 router-view 的 :key）。
+ *
+ * 解决的问题：路由表里有多组**共用同一组件**的路由 ——
+ *   /list ↔ /noticelist                  都是 NoticeList.vue
+ *   /list/detail ↔ /noticelist/detail    都是 NoticeDetails.vue
+ * Vue 遇到「同一组件」会复用实例：onMounted 不再执行，按 meta/query 只算一次的状态
+ * 也不会重算，于是表现为「点左边栏右边没反应，多点几下/刷新才变」。
+ * 加 key 后每个路由 path 各持有一份实例，切换必然重建。
+ *
+ * 顺带把「点击当前菜单项」从 router.go(0)（整页 reload、重新拉身份与菜单、白屏一下）
+ * 换成自增 tick，只软重挂载内容区。
+ */
+const viewTick = ref(0);
+provide("refreshView", () => {
+    viewTick.value += 1;
+});
+const viewKey = computed(() => `${route.fullPath}#${viewTick.value}`);
 const layoutData = reactive({
     appName: "校园公告",
     baseHost: config.baseHost,
@@ -19,7 +40,83 @@ const layoutData = reactive({
     isAlone: false,
 });
 
-onMounted(async () => {
+/* ============================================================================
+ * 路由权限：左侧菜单管「入口」，不管「点进去之后」
+ * ----------------------------------------------------------------------------
+ * 两类页面，两套口径：
+ *
+ *  ① **入口页**（左侧菜单里的节点：我的公告 / 已发管理 / 全部公告 / 审批中心 /
+ *     公告统计 / 应用设置）→ 必须配在 GetUserMod 里才放行。菜单就是入口清单，
+ *     没配的入口不该被 URL 直接打开（否则左边栏一片失选，用户以为系统坏了）。
+ *
+ *  ② **落地页**（从页面上点进去的二级目录：写公告 / 草稿箱 / 公告详情）
+ *     → **一律放行，不判任何权限**。它们不是目录，左侧栏只负责高亮
+ *     「是从哪个入口节点点进来的」。
+ *
+ * 落地页的判定不看"它在没在菜单里"，而是看路由表里是否声明了 meta.parentId
+ * —— 这是"我从哪个入口进来"的显式契约。凡是能从页面内点进去的路由，
+ * 必须在 routes.ts 声明 meta.parentId；漏一个，那个按钮在真实环境里就会
+ * 「点了被弹回第一个节点」（看着像"不让点"）。
+ * 本工程当前的全部落地页（/list/new、/drafts、/list/detail、/noticelist/detail）
+ * 均已声明，无需补。
+ * ========================================================================== */
+
+/** 菜单是否已就绪。加载期间一律放行，等菜单到达后由下方 watch 复核，
+ *  否则首屏会因为"菜单还没到"把正常页面误判成无权 */
+const menuReady = ref(false);
+
+const normalizedMenu = computed(() => normalizeModList(layoutData.modList));
+const menuNodes = computed(() => flattenMenuNodes(normalizedMenu.value));
+
+/** 当前用户可访问的 route.path 集合：菜单入口 ∪ 全部落地页 */
+const allowedPaths = computed(() => {
+    const allow = new Set<string>();
+    // ① 入口页：菜单里配了才放行
+    menuNodes.value.forEach((n: any) => {
+        if (n.page) allow.add(n.page);
+    });
+    // ② 落地页：声明了 meta.parentId 的一律放行（点进去的二级目录不判权限）
+    routes.forEach((r: any) => {
+        if (r.redirect) return; // 别名由 vue-router 先解析到真实路由，守卫看到的是目标 path
+        if ((r.meta as any)?.parentId != null) allow.add(r.path);
+    });
+    return allow;
+});
+
+/** 无权/无匹配时落地的第一个菜单页面（与 initShell 的登录落地规则一致） */
+const firstPath = computed(() => firstMenuPath(normalizedMenu.value));
+
+/** 菜单为空视为"降级/加载失败"，不拦路由，避免把用户困在死循环重定向里 */
+const guardActive = computed(() => menuReady.value && allowedPaths.value.size > 0);
+const routeAllowed = computed(() => !guardActive.value || allowedPaths.value.has(route.path));
+
+router.beforeEach((to) => {
+    if (!guardActive.value) return true;
+    if (allowedPaths.value.has(to.path)) return true;
+    const first = firstPath.value;
+    if (!first || first === to.path) return false; // 没有可用目标：直接不渲染，好过显示无权页
+    Message.warning(`当前账号没有「${(to.meta as any)?.title || to.path}」的权限，已回到第一个可用页面`);
+    return { path: first, replace: true };
+});
+
+/* 首屏 URL 直达无权页的场景：守卫在菜单未就绪时放行了，菜单到达后必须复核并纠正 */
+watch(guardActive, () => {
+    if (!guardActive.value) return;
+    if (routeAllowed.value) return;
+    const first = firstPath.value;
+    if (first && first !== route.path) router.replace(first);
+});
+
+async function initShell() {
+    /* ★ 必须先等 router 的首次导航解析完成。
+       main.ts 里是同步 app.mount()，App 的 onMounted 有机会早于 vue-router 的
+       初始导航 —— 此时 router.currentRoute 还停在 START_LOCATION（path === "/"），
+       于是「深链接」会被整片误判成"访问应用入口"：
+       冷启动 /#/stats、/#/list/new、/#/list/detail 会被 replace 到第一个节点。
+       等 isReady 之后再读 route，上述判断才基于真实目标。 */
+    await router.isReady();
+
+    menuReady.value = false; // 重新拉菜单期间不拦路由
     try {
         // 1. 获取当前用户信息
         const user: any = await baseApi.getUserInfo().send();
@@ -47,38 +144,39 @@ onMounted(async () => {
         const hasChildren = (modList || []).some((m: any) => m.children && m.children.length > 0);
         layoutData.isAlone = (modList || []).length <= 1 && !hasChildren;
 
+        menuReady.value = true;
         isLogin.value = true;
-
-        // 登录后跳转第一个可用模块（"/" 本身即已收到页，无需跳转）
-        if (router.currentRoute.value.path === "/") {
-            const firstModule = (modList || [])[0];
-            const firstRaw = firstModule?.children?.length
-                ? firstModule.children[0]
-                : firstModule;
-            const first = resolveMenuPage(firstRaw?.page, firstRaw?.modId ?? firstRaw?.id, firstRaw?.name);
-            if (!first.external && first.path && first.path !== "/") {
-                router.replace(first.path);
-            }
-        }
+        // 注：不再有「path === "/" 就跳第一个节点」的分支 —— 本工程 "/" 本身
+        // 就是「我的公告」入口页（不是重定向路由），入口地址无需额外跳转；
+        // 而「当前路由没有对应用户菜单节点 → 落第一个节点」统一交给守卫与上方复核。
+        // （删掉它的关键原因：router.isReady 之前读 currentRoute 会把深链接误判成
+        //  "访问应用入口" 而整片重定向，见 initShell 首行注释。）
     } catch (error: any) {
         console.error("加载用户信息失败", error);
         if (error?.message !== "redirect") {
             Message.error("载入用户信息失败，请检查后端服务是否正常！");
         }
-        // 降级：使用默认值（"/" 即已收到页，无需跳转）
+        // 降级：使用默认值
         layoutData.userInfo = { name: "管理员", avatar: "" };
         layoutData.modList = [];
         layoutData.isAlone = true;
+        menuReady.value = true;
         isLogin.value = true;
     }
-});
+}
+
+onMounted(initShell);
 </script>
 
 <template>
     <layout v-if="isLogin" :layoutData="layoutData" />
     <div v-if="isLogin" class="base-wrap-main" :class="{ 'alone-page': layoutData.isAlone }">
         <div class="main-wrapper">
-            <router-view />
+            <!-- routeAllowed：当前账号菜单里没有该路由时不渲染内容（守卫已拦，这里兜住
+                 「菜单晚于路由到达」的瞬间，避免无权页闪一下再被 replace 掉） -->
+            <router-view v-if="routeAllowed" v-slot="{ Component }">
+                <component :is="Component" :key="viewKey" />
+            </router-view>
         </div>
     </div>
 </template>
diff --git a/src/assets/config/host.config.ts b/src/assets/config/host.config.ts
index d9f8849..3cc9be4 100644
--- a/src/assets/config/host.config.ts
+++ b/src/assets/config/host.config.ts
@@ -9,7 +9,7 @@ import { BaseConf } from "@/types/Basics";
  *    build 产物不读任何 .env.*（.env.base/.env.ld/.env.prod 已删），VITE_* 恒为 undefined，
  *    本层自动跳过，产物不含任何环境值
  * ③ 同域推导兜底：env-config 未配置/拉取失败时框架至少能渲染并调通同源 API；
- *    ssoHost 为空 → 登出跳转不可用——与后端未就绪状态一致，可接受。
+ *    ssoHost 另由 ④ 按 base.* → sso.* 的运维约定推导，保证登出仍能跳到 SSO 域
  */
 const env = import.meta.env;
 
@@ -61,6 +61,33 @@ if (runtime && typeof runtime === "object" && runtime.relayConf) {
     applyConf(conf.relayConf, runtime.relayConf);
 }
 
+/**
+ * ④ 登出地址兜底：ssoHost 为空时 logout 会退化成同源相对路径
+ *    `/logout?service=…`，落到 base 域而不是 SSO 域 —— 会话根本没注销，
+ *    只是从当前页跳回首页，用户看着像"点了退出没反应"。
+ *
+ * 触发条件很常见：projman 侧 env-config 未配 ssoHost 时接口返回 `{}`
+ * （实测同族多个应用都存在这种空下发，而 campusnotice / notice 下发了完整三键）。
+ *
+ * 运维约定 SSO 与 base 同域不同子域（base.x.com ↔ sso.x.com），据此**按当前站点推导**，
+ * 而不是把域名写死进产物 —— 保持"构建产物不含任何环境值"这一设计前提。
+ * 部署在非 base.* 域名（如 IP、localhost）时不推导，维持原行为。
+ */
+function deriveSsoHostFrom(base: string): string {
+    if (!base) return "";
+    try {
+        const u = new URL(base);
+        if (!/^base\./i.test(u.hostname)) return "";
+        u.hostname = u.hostname.replace(/^base\./i, "sso.");
+        return u.origin;
+    } catch {
+        return "";
+    }
+}
+if (!conf.ssoHost) {
+    conf.ssoHost = deriveSsoHostFrom(conf.baseHost);
+}
+
 // HTTPS 自动升级：当前页面是 https 时，将所有 http:// 配置项升级为 https://
 var ishttps = "https:" == document.location.protocol ? true : false;
 if (ishttps) {
diff --git a/src/assets/styles/layout.css b/src/assets/styles/layout.css
index 2601038..8cd14fa 100644
--- a/src/assets/styles/layout.css
+++ b/src/assets/styles/layout.css
@@ -1,4 +1,4 @@
-.fl{float:left}.fr{float:right}.fix{*zoom:1}.fix:after{display:table;content:"";clear:both}.pr{position:relative}.pa{position:absolute}.pf{position:fixed}.align-middle{position:relative;top:50%;transform:translateY(-50%)}.text-ellipsis{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.nav-btn-wrap{position:fixed;top:67px;right:15px;max-width:200px;z-index:100}*{font-family:"微软雅黑","Microsoft YaHei","Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB",Arial,sans-serif}.header-container{background:transparent;transition:all 300ms;box-shadow:0 10px 20px 0 rgba(203,203,203,0.09);height:56px;position:fixed;top:0;left:0;width:100%;z-index:5}.header-container .icon-box{margin:0 24px 0 24px;cursor:pointer;background-repeat:no-repeat;background-position:30px center;background-size:14px}.header-container .icon-btn{background:transparent;height:24px;width:24px;line-height:24px;box-sizing:border-box;border-radius:2px;transition:all 500ms}.header-container .icon-btn i{color:#fff;font-size:22px;font-weight:100}.header-container .icon-btn.active{transform:rotate(90deg)}.header-container .delimiter{width:2px;border-left:1px solid rgba(255,255,255,0.5);height:20px}.header-container h4{font-size:19px;color:#fff;margin-left:12px;font-weight:bold;font-family:SimSun}.header-container .school-bg{position:absolute;top:0;height:100%;width:100%;left:0;right:0;z-index:-1}.header-container .header-aside{max-width:260px;height:56px}.header-container .header-aside img{float:left;width:28px;height:28px;border-radius:50%;cursor:pointer}.header-container .header-aside .name{max-width:90px;color:#fff;margin:0 32px 0 14px}.header-container .header-aside a{outline:none}.header-container .header-aside a:hover{opacity:.8}.header-container .header-aside .logout{padding:5px;margin:0 25px 0}.header-container .header-aside .logout i{color:#fff;font-size:18px}.left-menu{position:fixed;background:#fff;color:#272829;width:200px;left:0;top:56px;bottom:0px;display:flex;flex-direction:column;z-index:9;overflow:auto}.left-menu .menu-top-box{height:10px;border-right:1px solid #EBEEF4}.left-menu li{height:50px;transition:border 200ms;border-left:0px solid transparent;position:relative}.left-menu li a{color:#272829;width:100%;display:block;padding-left:35px;line-height:50px;outline:none;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;border-right:1px solid #EBEEF4;transition:none}.left-menu li.active{background:#f8f8f8;border-left:4px solid transparent;border-right:none}.left-menu li.active a{border-right:1px none;border-right:none}.left-menu li:hover{background:#f8f8f8}.left-menu li:hover a{border-right:none}.left-menu li .icon-box{line-height:1;height:20px;position:relative;top:25px;margin-top:-6px;padding-right:10px;font-size:14px;color:#656667}.left-menu .clear-box{flex:1;border-right:1px solid #EBEEF4}.path-nav{height:56px;width:calc(100% - 200px);position:relative;top:56px;left:200px;line-height:20px;font-size:12px;background:#fff;color:#969799;z-index:4;padding:16px 0 20px 24px}.path-nav .ivu-breadcrumb a{color:#848C98}.path-nav .ivu-breadcrumb a:hover{color:#6a727f}.path-nav .ivu-breadcrumb-item-link{font-size:14px}.path-nav .icon-category{color:#848C98;position:relative;top:1px}.app-panel{position:fixed;top:56px;margin-top:-6px;left:14px;background:#fff;z-index:10;transition:all 200ms;border-radius:8px;box-shadow:0 10px 20px 0 rgba(0,0,0,0.06);padding:20px 20px 0}.app-panel .tips-box{position:absolute;top:-5px;left:13px;width:0;height:0;border-right:5px solid transparent;border-bottom:7px solid #fff;border-left:5px solid transparent;z-index:1}.app-panel ul{padding-bottom:20px;border-bottom:1px solid #EBEEF4}.app-panel li{width:100px;margin-left:15px;text-align:center}.app-panel li a{display:block;color:#656667;padding:15px 0;border-radius:5px;transition:all 500ms;outline:none}.app-panel li a:hover{background:#eee}.app-panel li .icon-box{width:46px;height:46px;margin:0 auto 15px}.app-panel li .icon-box img{width:100%;height:100%;-o-object-fit:cover;object-fit:cover;border-radius:50%}.app-panel li:first-child{margin-left:0}.app-panel .link-panel{height:60px;line-height:60px}.app-panel .link-panel i{margin-left:8px;position:relative;top:-1px}.app-panel .no-used-box{min-width:300px;text-align:center;height:110px;border-bottom:1px dashed #EBEEF4;line-height:30px;padding:40px 0}.no-authority-wrap{width:600px;height:320px;background:#fff;border-radius:15px;text-align:center;left:50%;position:relative;top:50%;transform:translateX(-50%) translateY(-50%);color:#272829;background-image:url(../image/no-authority.png);background-repeat:no-repeat;background-size:280px 152px;background-position:center 50px;overflow:hidden}.no-authority-wrap h3{font-size:18px;font-weight:500;margin-top:220px}.no-authority-wrap h6{font-size:12px;font-weight:500;margin-top:10px}.arrow-down{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAGCAYAAAD68A/GAAAAjUlEQVQYV2MsKSnh/vj1q+Xs6dP3MGAB2dnZ8v/+/RNhrK+vZ3r24tUsBsb/22fPmLEWWW16errWfwaGXob/nEmMIAlsitPSss0ZGP9UMzMxxU+fPv09WCG6Yqb//z/9Y2BMY/wvET9rVsM3kDxcIbJixv//WRgYDFNnzUr/DTMIRSFMMYhubGz8h+xeANRcRMpSDyHXAAAAAElFTkSuQmCC);background-repeat:no-repeat;background-size:10px 6px;background-position:90% center;transition:all 400ms;width:10px;height:6px;position:absolute;right:8%;top:22px}.arrow-up{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAGCAYAAAD68A/GAAAAjUlEQVQYV2MsKSnh/vj1q+Xs6dP3MGAB2dnZ8v/+/RNhrK+vZ3r24tUsBsb/22fPmLEWWW16errWfwaGXob/nEmMIAlsitPSss0ZGP9UMzMxxU+fPv09WCG6Yqb//z/9Y2BMY/wvET9rVsM3kDxcIbJixv//WRgYDFNnzUr/DTMIRSFMMYhubGz8h+xeANRcRMpSDyHXAAAAAElFTkSuQmCC);background-repeat:no-repeat;background-size:10px 6px;background-position:90% center;transition:all 400ms;width:10px;height:6px;position:absolute;right:8%;top:22px;transform:rotate(180deg)}.child-item-wrap{transition:all 500ms linear;overflow:hidden}.child-item-wrap li.child-item{border-left:transparent}.child-item-wrap li.child-item a{margin-left:24px;padding-left:35px}.fade_apps-enter-active,.fade_apps-leave-active{transition:all 1ms;transform:translateY(5px)}.fade_apps-leave-to{opacity:0}.fade_child_ul-enter-active{transition:all .5s ease-in-out}.fade_child_ul-leave-active{transition:all .5s ease-out}.fade_child_ul-enter{max-height:0}.fade_child_ul-enter-to{max-height:100%}.fade_child_ul-leave{max-height:100%}.fade_child_ul-leave-to{max-height:0}.base-wrap-main{padding:56px 0 0 200px;height:calc(100% - 56px);position:relative;background:#fff}.base-wrap-main .main-wrapper{min-width:760px;min-height:100%;position:relative;width:100%;box-sizing:border-box}.base-wrap-main .main-container{background:#ffffff;box-sizing:border-box;padding:0 24px;padding-bottom:24px;overflow:hidden}.base-wrap-main .default-wrapper{min-width:760px;min-height:100%;position:relative;width:100%;box-sizing:border-box}.base-wrap-main .page-wrapper{min-width:760px;min-height:100%;position:relative;width:100%;box-sizing:border-box}.base-wrap-main .tree-wrapper{height:100%}.base-wrap-main .tree-wrapper .tree-container{width:240px;float:left;border:1px solid #eeeeee;background:#ffffff;padding:10px;overflow:auto;margin-left:24px;height:calc(100% - 20px);border-radius:3px}.base-wrap-main .tree-wrapper .main-container{height:100%;margin-left:264px;overflow:auto}.base-wrap-main .tree-wrapper .page-panel{left:288px}.base-wrap-main .page-panel{height:72px;position:absolute;margin:0 auto;left:24px;right:24px;bottom:0;padding:20px 0;background:#fff}.base-wrap-main .page-panel .ivu-page li:hover{border-color:#5979ea}.base-wrap-main .page-panel .ivu-page li:hover a,.base-wrap-main .page-panel .ivu-page li:hover i{color:#5979ea}.base-wrap-main .page-panel .ivu-page-item-active{background:#5979ea;border-color:#5979ea}.base-wrap-main .page-panel .ivu-page-item-active a,.base-wrap-main .page-panel .ivu-page-item-active a:hover{color:#fff !important}.base-wrap-main .page-panel .ivu-page-disabled{border-color:#dcdee2}.base-wrap-main .page-panel .ivu-page-options-sizer{margin-right:0}.base-wrap-main .page-panel::after{display:block;position:relative;content:'';background:#eee;height:1px;width:100%;position:absolute;top:0}.base-wrap-main .tabs-panel{margin:0 24px 12px}.base-wrap-main .tabs-panel.ivu-tabs.ivu-tabs-card>.ivu-tabs-bar .ivu-tabs-tab{border-radius:0;background:#fff;margin-right:-1px;border-color:#EBEEF5 !important;height:39px;line-height:28px}.base-wrap-main .tabs-panel.ivu-tabs.ivu-tabs-card>.ivu-tabs-bar .ivu-tabs-tab.ivu-tabs-tab-active{color:#5979EA !important;height:40px}.base-wrap-main .tabs-panel.ivu-tabs.ivu-tabs-card .ivu-tabs-bar{border-color:#EBEEF5 !important;margin-bottom:0}.base-wrap-main .tabs-panel.ivu-tabs.ivu-tabs-card>.ivu-tabs-bar.ivu-tabs-tab-active{border-top:1px solid #EBEEF5}.base-wrap-main .tabs-panel.ivu-tabs.ivu-tabs-card>.ivu-tabs-bar .ivu-tabs-nav-container{height:40px}.base-wrap-main .btn-panel{margin-left:28px}.base-wrap-main.alone-page{padding-left:0}.search-wrap{background:#f7f7f7;padding:10px 16px;height:52px}.search-wrap_date .ivu-date-picker{width:150px}.search-wrap_sel{width:150px;float:left}.search-wrap_input{width:200px;float:left}.public-custom-switch .ivu-radio-wrapper-checked{background:#6b8cf4 !important;border-color:#6b8cf4 !important}.public-custom-switch .ivu-radio-group-item{width:90px;text-align:center}.public-upload-img li{width:100px;height:100px;border:1px solid #eee;border-radius:2px;padding:4px;position:relative;float:left;margin:0 10px 10px 0}.public-upload-img li img{width:100%;height:100%;object-fit:contain}.public-upload-img li:hover .upload-list-cover{display:block}.public-upload-img li .upload-list-cover{position:absolute;top:4px;bottom:4px;left:4px;right:4px;background:rgba(0,0,0,0.6);text-align:center;display:none;transition:all .3s}.public-upload-img li .upload-list-cover i{color:#fff;position:relative;top:50%;cursor:pointer;transform:translateY(-50%)}.public-upload-img li.add-li{border:none;padding:0;width:100px;height:100px}.public-upload-img li .add-box i{line-height:100px}.ivu-btn{font-size:14px;line-height:20px}.ivu-btn span{margin:0 3px}.ivu-btn-large{height:36px}a.ivu-btn-large{line-height:36px}.ivu-btn-primary{border-color:#5979EA;background:#5979EA}.ivu-btn-primary:hover{background:#708bed;border-color:#708bed}.ivu-btn-primary:active{background:#2c54e4;border-color:#2c54e4}.ivu-btn-primary.ivu-btn-ghost{background-color:#fff;color:#5979EA;border-color:#5979EA}.ivu-btn-success{border-color:#45B972;background:#45B972}.ivu-btn-success:hover{background:#57c080;border-color:#57c080}.ivu-btn-success:active{background:#37945b;border-color:#37945b}.ivu-btn-success.ivu-btn-ghost{background-color:#fff;color:#45B972;border-color:#45B972}.ivu-btn-error{border-color:#ed4d4d;background:#ed4d4d}.ivu-btn-error:hover{background:#ef6464;border-color:#ef6464}.ivu-btn-error:active{background:#e81f1f;border-color:#e81f1f}.ivu-btn-error.ivu-btn-ghost{background-color:#fff;color:#ed4d4d;border-color:#ed4d4d}.ivu-input-search{border-color:#5979EA !important;background:#5979EA !important}.ivu-input-search:hover{background:#708bed !important;border-color:#708bed !important}.ivu-input-search:active{background:#2c54e4 !important;border-color:#2c54e4 !important}.ivu-input-search.ivu-btn-ghost{background-color:#fff !important;color:#5979EA !important;border-color:#5979EA !important}.ivu-table-wrapper{border:none}.ivu-table::after{background:none}.ivu-table::before{background:none}.ivu-table-header th,.ivu-table-fixed-header th{height:48px !important;color:#595959;font-size:14px;background:#fff;border:none}.ivu-table td{height:48px;border:none;border-top:1px solid #ecedf3}.ivu-table td span{font-size:14px;font-family:"Microsoft YaHei","微软雅黑" !important}.ivu-table td .ivu-icon{font-family:'Ionicons' !important}.ivu-tabs-bar{margin-bottom:10px;border-bottom:1px solid #EBEEF5}.ivu-tabs-bar .ivu-tabs-ink-bar{background:#5979EA}.ivu-tabs-bar .ivu-tabs-tab-active,.ivu-tabs-bar .ivu-tabs-tab:hover,.ivu-tabs-bar .ivu-tabs-tab:active,.ivu-tabs-bar .ivu-tabs-tab-focused{color:#5979EA}.ivu-form-item{margin-bottom:20px}.ivu-form-item-error-tip{font-size:13px;padding-top:4px}.ivu-alert{margin-bottom:12px !important}.ivu-modal-wrap{display:flex;align-items:center;transform:translateY(0%)}.ivu-modal-wrap .ivu-form-item:last-child{margin-bottom:0px}.ivu-modal{top:0 !important}.ivu-modal-body{max-height:550px;overflow:auto}.ivu-table-cell .operating-btn{width:32px;height:32px;position:relative;display:block;border-radius:50%;color:gray;font-size:18px;margin-top:2px;line-height:32px;cursor:pointer}.ivu-table-cell .operating-btn:hover{background:#9e89cf;color:#fff}.ivu-table-cell .operating-btn.disabled{color:#c5c8ce;opacity:.3;cursor:not-allowed}.ivu-table-cell .operating-btn.disabled:hover{background:#fff}.ivu-table-cell .operating-link{display:inline-block;color:#2d8cf0;cursor:pointer;padding-right:10px}.ivu-table-cell .operating-link.disabled{color:#aaa;cursor:default}.status-shenhe span::before{content:'';display:inline-block;width:10px;height:10px;border-radius:50%;margin:auto 10px auto 0px;background-color:#e8a54c}.status-tongguo span::before{content:'';display:inline-block;width:10px;height:10px;border-radius:50%;margin:auto 10px auto 0px;background-color:#45B972}.status-chexiao span::before{content:'';display:inline-block;width:10px;height:10px;border-radius:50%;margin:auto 10px auto 0px;background-color:#bfbfbf}.status-jujue span::before{content:'';display:inline-block;width:10px;height:10px;border-radius:50%;margin:auto 10px auto 0px;background-color:#ed4d4d}.header-container{background:#577afb}.header-container .school-bg{display:none}.left-menu{background:#F6F8F9}.left-menu li:hover{background:#EFF4FF}.left-menu li.active{background:#EFF4FF;border-left:none ;border-right:4px solid #577afb}
+.fl{float:left}.fr{float:right}.fix{*zoom:1}.fix:after{display:table;content:"";clear:both}.pr{position:relative}.pa{position:absolute}.pf{position:fixed}.align-middle{position:relative;top:50%;transform:translateY(-50%)}.text-ellipsis{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.nav-btn-wrap{position:fixed;top:67px;right:15px;max-width:200px;z-index:100}*{font-family:"微软雅黑","Microsoft YaHei","Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB",Arial,sans-serif}.header-container{background:transparent;transition:all 300ms;box-shadow:0 10px 20px 0 rgba(203,203,203,0.09);height:56px;position:fixed;top:0;left:0;width:100%;z-index:5}.header-container .icon-box{margin:0 24px 0 24px;cursor:pointer;background-repeat:no-repeat;background-position:30px center;background-size:14px}.header-container .icon-btn{background:transparent;height:24px;width:24px;line-height:24px;box-sizing:border-box;border-radius:2px;transition:all 500ms}.header-container .icon-btn i{color:#fff;font-size:22px;font-weight:100}.header-container .icon-btn.active{transform:rotate(90deg)}.header-container .delimiter{width:2px;border-left:1px solid rgba(255,255,255,0.5);height:20px}.header-container h4{font-size:19px;color:#fff;margin-left:12px;font-weight:bold;font-family:SimSun}.header-container .school-bg{position:absolute;top:0;height:100%;width:100%;left:0;right:0;z-index:-1}.header-container .header-aside{max-width:260px;height:56px}.header-container .header-aside img{float:left;width:28px;height:28px;border-radius:50%;cursor:pointer}.header-container .header-aside .name{max-width:90px;color:#fff;margin:0 32px 0 14px}.header-container .header-aside a{outline:none}.header-container .header-aside a:hover{opacity:.8}.header-container .header-aside .logout{padding:5px;margin:0 25px 0}.header-container .header-aside .logout i{color:#fff;font-size:18px}.left-menu{position:fixed;background:#fff;color:#272829;width:200px;left:0;top:56px;bottom:0px;display:flex;flex-direction:column;z-index:9;overflow:auto}.left-menu .menu-top-box{height:10px;border-right:1px solid #EBEEF4}.left-menu li{height:50px;transition:border 200ms;border-left:0px solid transparent;position:relative}.left-menu li a{color:#272829;width:100%;display:block;padding-left:35px;line-height:50px;outline:none;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;border-right:1px solid #EBEEF4;transition:none}.left-menu li.active{background:#f8f8f8;border-left:4px solid transparent;border-right:none}.left-menu li.active a{border-right:1px none;border-right:none}.left-menu li:hover{background:#f8f8f8}.left-menu li:hover a{border-right:none}.left-menu li .icon-box{line-height:1;height:20px;position:relative;top:25px;margin-top:-6px;padding-right:10px;font-size:14px;color:#656667}.left-menu .clear-box{flex:1;border-right:1px solid #EBEEF4}.path-nav{height:56px;width:calc(100% - 200px);position:relative;top:56px;left:200px;line-height:20px;font-size:12px;background:#fff;color:#969799;z-index:4;padding:16px 0 20px 24px}.path-nav .ivu-breadcrumb a{color:#848C98}.path-nav .ivu-breadcrumb a:hover{color:#6a727f}.path-nav .ivu-breadcrumb-item-link{font-size:14px}.path-nav .icon-category{color:#848C98;position:relative;top:1px}.app-panel{position:fixed;top:56px;margin-top:-6px;left:14px;background:#fff;z-index:10;transition:all 200ms;border-radius:8px;box-shadow:0 10px 20px 0 rgba(0,0,0,0.06);padding:20px 20px 0}.app-panel .tips-box{position:absolute;top:-5px;left:13px;width:0;height:0;border-right:5px solid transparent;border-bottom:7px solid #fff;border-left:5px solid transparent;z-index:1}.app-panel ul{padding-bottom:20px;border-bottom:1px solid #EBEEF4}.app-panel li{width:100px;margin-left:15px;text-align:center}.app-panel li a{display:block;color:#656667;padding:15px 0;border-radius:5px;transition:all 500ms;outline:none}.app-panel li a:hover{background:#eee}.app-panel li .icon-box{width:46px;height:46px;margin:0 auto 15px}.app-panel li .icon-box img{width:100%;height:100%;-o-object-fit:cover;object-fit:cover;border-radius:50%}.app-panel li:first-child{margin-left:0}.app-panel .link-panel{height:60px;line-height:60px}.app-panel .link-panel i{margin-left:8px;position:relative;top:-1px}.app-panel .no-used-box{min-width:300px;text-align:center;height:110px;border-bottom:1px dashed #EBEEF4;line-height:30px;padding:40px 0}.no-authority-wrap{width:600px;height:320px;background:#fff;border-radius:15px;text-align:center;left:50%;position:relative;top:50%;transform:translateX(-50%) translateY(-50%);color:#272829;background-image:url(../image/no-authority.png);background-repeat:no-repeat;background-size:280px 152px;background-position:center 50px;overflow:hidden}.no-authority-wrap h3{font-size:18px;font-weight:500;margin-top:220px}.no-authority-wrap h6{font-size:12px;font-weight:500;margin-top:10px}.arrow-down{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAGCAYAAAD68A/GAAAAjUlEQVQYV2MsKSnh/vj1q+Xs6dP3MGAB2dnZ8v/+/RNhrK+vZ3r24tUsBsb/22fPmLEWWW16errWfwaGXob/nEmMIAlsitPSss0ZGP9UMzMxxU+fPv09WCG6Yqb//z/9Y2BMY/wvET9rVsM3kDxcIbJixv//WRgYDFNnzUr/DTMIRSFMMYhubGz8h+xeANRcRMpSDyHXAAAAAElFTkSuQmCC);background-repeat:no-repeat;background-size:10px 6px;background-position:90% center;transition:all 400ms;width:10px;height:6px;position:absolute;right:8%;top:22px}.arrow-up{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAGCAYAAAD68A/GAAAAjUlEQVQYV2MsKSnh/vj1q+Xs6dP3MGAB2dnZ8v/+/RNhrK+vZ3r24tUsBsb/22fPmLEWWW16errWfwaGXob/nEmMIAlsitPSss0ZGP9UMzMxxU+fPv09WCG6Yqb//z/9Y2BMY/wvET9rVsM3kDxcIbJixv//WRgYDFNnzUr/DTMIRSFMMYhubGz8h+xeANRcRMpSDyHXAAAAAElFTkSuQmCC);background-repeat:no-repeat;background-size:10px 6px;background-position:90% center;transition:all 400ms;width:10px;height:6px;position:absolute;right:8%;top:22px;transform:rotate(180deg)}.child-item-wrap{transition:all 500ms linear;overflow:hidden}.child-item-wrap li.child-item{border-left:transparent}.child-item-wrap li.child-item a{margin-left:24px;padding-left:35px}.fade_apps-enter-active,.fade_apps-leave-active{transition:all 1ms;transform:translateY(5px)}.fade_apps-leave-to{opacity:0}.fade_child_ul-enter-active{transition:all .5s ease-in-out}.fade_child_ul-leave-active{transition:all .5s ease-out}.fade_child_ul-enter{max-height:0}.fade_child_ul-enter-to{max-height:100%}.fade_child_ul-leave{max-height:100%}.fade_child_ul-leave-to{max-height:0}.base-wrap-main{padding:56px 0 0 200px;height:calc(100% - 56px);position:relative;background:#fff}.base-wrap-main .main-wrapper{min-width:760px;min-height:100%;position:relative;width:100%;box-sizing:border-box}.base-wrap-main .main-container{background:#ffffff;box-sizing:border-box;padding:0 24px;padding-bottom:24px;overflow:hidden}.base-wrap-main .default-wrapper{min-width:760px;min-height:100%;position:relative;width:100%;box-sizing:border-box}.base-wrap-main .page-wrapper{min-width:760px;min-height:100%;position:relative;width:100%;box-sizing:border-box}.base-wrap-main .tree-wrapper{height:100%}.base-wrap-main .tree-wrapper .tree-container{width:240px;float:left;border:1px solid #eeeeee;background:#ffffff;padding:10px;overflow:auto;margin-left:24px;height:calc(100% - 20px);border-radius:3px}.base-wrap-main .tree-wrapper .main-container{height:100%;margin-left:264px;overflow:auto}.base-wrap-main .tree-wrapper .page-panel{left:288px}.base-wrap-main .page-panel{height:72px;position:absolute;margin:0 auto;left:24px;right:24px;bottom:0;padding:20px 0;background:#fff}.base-wrap-main .page-panel .ivu-page li:hover{border-color:#5979ea}.base-wrap-main .page-panel .ivu-page li:hover a,.base-wrap-main .page-panel .ivu-page li:hover i{color:#5979ea}.base-wrap-main .page-panel .ivu-page-item-active{background:#5979ea;border-color:#5979ea}.base-wrap-main .page-panel .ivu-page-item-active a,.base-wrap-main .page-panel .ivu-page-item-active a:hover{color:#fff !important}.base-wrap-main .page-panel .ivu-page-disabled{border-color:#dcdee2}.base-wrap-main .page-panel .ivu-page-options-sizer{margin-right:0}.base-wrap-main .page-panel::after{display:block;position:relative;content:'';background:#eee;height:1px;width:100%;position:absolute;top:0}.base-wrap-main .tabs-panel{margin:0 24px 12px}.base-wrap-main .tabs-panel.ivu-tabs.ivu-tabs-card>.ivu-tabs-bar .ivu-tabs-tab{border-radius:0;background:#fff;margin-right:-1px;border-color:#EBEEF5 !important;height:39px;line-height:28px}.base-wrap-main .tabs-panel.ivu-tabs.ivu-tabs-card>.ivu-tabs-bar .ivu-tabs-tab.ivu-tabs-tab-active{color:#5979EA !important;height:40px}.base-wrap-main .tabs-panel.ivu-tabs.ivu-tabs-card .ivu-tabs-bar{border-color:#EBEEF5 !important;margin-bottom:0}.base-wrap-main .tabs-panel.ivu-tabs.ivu-tabs-card>.ivu-tabs-bar.ivu-tabs-tab-active{border-top:1px solid #EBEEF5}.base-wrap-main .tabs-panel.ivu-tabs.ivu-tabs-card>.ivu-tabs-bar .ivu-tabs-nav-container{height:40px}.base-wrap-main .btn-panel{margin-left:28px}.base-wrap-main.alone-page{padding-left:0}.search-wrap{background:#f7f7f7;padding:10px 16px;height:52px}.search-wrap_date .ivu-date-picker{width:150px}.search-wrap_sel{width:150px;float:left}.search-wrap_input{width:200px;float:left}.public-custom-switch .ivu-radio-wrapper-checked{background:#6b8cf4 !important;border-color:#6b8cf4 !important}.public-custom-switch .ivu-radio-group-item{width:90px;text-align:center}.public-upload-img li{width:100px;height:100px;border:1px solid #eee;border-radius:2px;padding:4px;position:relative;float:left;margin:0 10px 10px 0}.public-upload-img li img{width:100%;height:100%;object-fit:contain}.public-upload-img li:hover .upload-list-cover{display:block}.public-upload-img li .upload-list-cover{position:absolute;top:4px;bottom:4px;left:4px;right:4px;background:rgba(0,0,0,0.6);text-align:center;display:none;transition:all .3s}.public-upload-img li .upload-list-cover i{color:#fff;position:relative;top:50%;cursor:pointer;transform:translateY(-50%)}.public-upload-img li.add-li{border:none;padding:0;width:100px;height:100px}.public-upload-img li .add-box i{line-height:100px}.ivu-btn{font-size:14px;line-height:20px}.ivu-btn span{margin:0 3px}.ivu-btn-large{height:36px}a.ivu-btn-large{line-height:36px}.ivu-btn-primary{border-color:#5979EA;background:#5979EA}.ivu-btn-primary:hover{background:#708bed;border-color:#708bed}.ivu-btn-primary:active{background:#2c54e4;border-color:#2c54e4}.ivu-btn-primary.ivu-btn-ghost{background-color:#fff;color:#5979EA;border-color:#5979EA}.ivu-btn-success{border-color:#45B972;background:#45B972}.ivu-btn-success:hover{background:#57c080;border-color:#57c080}.ivu-btn-success:active{background:#37945b;border-color:#37945b}.ivu-btn-success.ivu-btn-ghost{background-color:#fff;color:#45B972;border-color:#45B972}.ivu-btn-error{border-color:#ed4d4d;background:#ed4d4d}.ivu-btn-error:hover{background:#ef6464;border-color:#ef6464}.ivu-btn-error:active{background:#e81f1f;border-color:#e81f1f}.ivu-btn-error.ivu-btn-ghost{background-color:#fff;color:#ed4d4d;border-color:#ed4d4d}.ivu-input-search{border-color:#5979EA !important;background:#5979EA !important}.ivu-input-search:hover{background:#708bed !important;border-color:#708bed !important}.ivu-input-search:active{background:#2c54e4 !important;border-color:#2c54e4 !important}.ivu-input-search.ivu-btn-ghost{background-color:#fff !important;color:#5979EA !important;border-color:#5979EA !important}.ivu-table-wrapper{border:none}.ivu-table::after{background:none}.ivu-table::before{background:none}.ivu-table-header th,.ivu-table-fixed-header th{height:48px !important;color:#595959;font-size:14px;background:#fff;border:none}.ivu-table td{height:48px;border:none;border-top:1px solid #ecedf3}.ivu-table td span{font-size:14px;font-family:"Microsoft YaHei","微软雅黑" !important}.ivu-table td .ivu-icon{font-family:'Ionicons' !important}.ivu-tabs-bar{margin-bottom:10px;border-bottom:1px solid #EBEEF5}.ivu-tabs-bar .ivu-tabs-ink-bar{background:#5979EA}.ivu-tabs-bar .ivu-tabs-tab-active,.ivu-tabs-bar .ivu-tabs-tab:hover,.ivu-tabs-bar .ivu-tabs-tab:active,.ivu-tabs-bar .ivu-tabs-tab-focused{color:#5979EA}.ivu-form-item{margin-bottom:20px}.ivu-form-item-error-tip{font-size:13px;padding-top:4px}.ivu-alert{margin-bottom:12px !important}.ivu-modal-wrap{display:flex;align-items:center;transform:translateY(0%)}.ivu-modal-wrap .ivu-form-item:last-child{margin-bottom:0px}.ivu-modal{top:0 !important}.ivu-modal-body{max-height:550px;overflow:auto}.ivu-table-cell .operating-btn{width:32px;height:32px;position:relative;display:flex;align-items:center;justify-content:center;border-radius:50%;color:gray;font-size:18px;line-height:1;cursor:pointer;transition:background-color .2s,color .2s}.ivu-table-cell .operating-btn:before{flex:none}.ivu-table-cell .operating-btn:hover{background:#9e89cf;color:#fff}.ivu-table-cell .operating-btn.disabled{color:#c5c8ce;opacity:.3;cursor:not-allowed}.ivu-table-cell .operating-btn.disabled:hover{background:#fff}.ivu-table-cell .operating-link{display:inline-block;color:#2d8cf0;cursor:pointer;padding-right:10px}.ivu-table-cell .operating-link.disabled{color:#aaa;cursor:default}.status-shenhe span::before{content:'';display:inline-block;width:10px;height:10px;border-radius:50%;margin:auto 10px auto 0px;background-color:#e8a54c}.status-tongguo span::before{content:'';display:inline-block;width:10px;height:10px;border-radius:50%;margin:auto 10px auto 0px;background-color:#45B972}.status-chexiao span::before{content:'';display:inline-block;width:10px;height:10px;border-radius:50%;margin:auto 10px auto 0px;background-color:#bfbfbf}.status-jujue span::before{content:'';display:inline-block;width:10px;height:10px;border-radius:50%;margin:auto 10px auto 0px;background-color:#ed4d4d}.header-container{background:#577afb}.header-container .school-bg{display:none}.left-menu{background:#F6F8F9}.left-menu li:hover{background:#EFF4FF}.left-menu li.active{background:#EFF4FF;border-left:none ;border-right:4px solid #577afb}
 /* ============================================================
    菜单高亮闪烁修复（本地化后追加，优先级最高）
    问题：原 .left-menu li 设了 transition:border 200ms，
diff --git a/src/components/layout.vue b/src/components/layout.vue
index 3ba041a..d47fb53 100644
--- a/src/components/layout.vue
+++ b/src/components/layout.vue
@@ -1,13 +1,15 @@
 <script setup lang="ts">
-import { ref, onBeforeMount, onMounted, onUnmounted, watch, computed } from "vue";
+import { ref, onBeforeMount, onMounted, onUnmounted, watch, computed, inject } from "vue";
 import { useRoute, useRouter } from "vue-router";
 import { Message } from "view-ui-plus";
-import { resolveMenuPage, normalizeModList } from "@/utils/menuRoute";
+import { normalizeModList, flattenMenuNodes } from "@/utils/menuRoute";
 import { noticeApi } from "@/api/module/notice";
 
 const props = defineProps<{ layoutData: Record<string, any> }>();
 const route = useRoute();
 const router = useRouter();
+/** App.vue 注入：内容区软重挂载（换 router-view 的 key），替代整页 reload */
+const refreshView = inject<(() => void) | null>("refreshView", null);
 
 const isPanel = ref(false);
 const currPath = ref<string>("");
@@ -35,70 +37,127 @@ watch(
     () => routeChange(route)
 );
 
-const flaten = (tree: any[], pid = 0): any[] => {
+const flaten = (tree: any[], pid = 0): any[] => flattenMenuNodes(tree, pid);
+
+/* 侧边栏渲染用的菜单树：page 已由 normalizeModList 统一归一为内部路由
+   （orderNumber 定序 → path 归一 → 草稿箱注入）；跳转（linkMenu）与高亮
+   （currPath 对照）必须共用这一份，否则平台里只配了名称的模块点不动、高亮对不上。
+
+   必须用 ref + watch 而**不是** computed：菜单项需要可变的 childState（展开/收起），
+   而 normalizeModList 里 `{ ...m }` 产出的是普通对象 —— computed 返回的整棵普通数组
+   不参与响应式追踪，直接改 childState 不会触发重渲染（表现为点了分组箭头菜单不展开）。 */
+const displayModList = ref<any[]>([]);
+watch(
+    modList,
+    (list) => {
+        displayModList.value = normalizeModList(list);
+    },
+    { immediate: true }
+);
+
+const menuArr = computed(() => flaten(displayModList.value));
+
+/** 菜单页面集合：判断某个 route.path 本身是否就是一个菜单节点 */
+const menuPageSet = computed(
+    () => new Set(menuArr.value.map((x: any) => x.page).filter(Boolean) as string[])
+);
+
+/**
+ * 上一个「菜单节点」高亮值 —— 落地页（二级页）高亮的关键状态。
+ *
+ * 需求：从哪个节点点按钮进的二级页面（写公告 / 草稿箱 / 公告详情等不在菜单里的
+ * 路由），左侧就选中那个节点。冷启动或刷新时没有来源，退回路由 meta.parentId 的静态契约。
+ */
+const lastMenuPage = ref<string>("");
+
+/** 沿 pid 向上收集祖先（支持多层嵌套），得到面包屑的前缀 */
+const ancestorsOf = (node: any): any[] => {
     const arr: any[] = [];
-    tree.forEach((element: any) => {
-        const { id, name, modId } = element;
-        // 平台配置的 path 格式不可控，统一解析为内部路由 path（名称/modId 兜底）
-        const resolved = resolveMenuPage(element.page, element.modId ?? element.id, element.name);
-        arr.push({ id, name, modId, page: resolved.path, external: resolved.external, pid });
-        if (element.children && element.children.length) {
-            arr.push(...flaten(element.children, id));
-        }
-    });
+    let p = node?.pid ? menuArr.value.find((x: any) => x.id === node.pid) : null;
+    while (p) {
+        arr.unshift({ name: p.name, page: p.page });
+        p = p.pid ? menuArr.value.find((x: any) => x.id === p.pid) : null;
+    }
     return arr;
 };
 
-const menuArr = computed(() => flaten(normalizeModList(modList.value)));
-const displayModList = computed(() => normalizeModList(modList.value));
-
 const routeChange = (to: any) => {
     const meta: any = to.meta || {};
     const { modId, title, parentId } = meta;
-    const navArr: any[] = [];
 
-    // 优先按 path 匹配菜单（平台模块 id 与路由 meta.modId 不保证一致），
-    // 匹配不到再退回 modId 对照
-    const find: any =
-        menuArr.value.find((x: any) => x.page && x.page === to.path) ||
-        menuArr.value.find((x: any) => x.modId === modId);
-    if (find) {
-        currPath.value = find.page || "";
-        if (find.pid) {
-            const pfind = menuArr.value.find((x: any) => x.id === find.pid);
-            if (pfind) navArr.push({ name: pfind.name });
-        }
-        navArr.push({ name: find.name || title, page: find.page });
-        navPath.value = navArr;
+    // 1) 目标路由本身就是菜单节点 → 选中它（to.path 不含 query，列表页翻页/筛选不会改高亮）
+    const self: any = menuArr.value.find((x: any) => x.page && x.page === to.path);
+    if (self) {
+        currPath.value = self.page;
+        lastMenuPage.value = self.page;
+        navPath.value = [...ancestorsOf(self), { name: self.name || title, page: self.page }];
         return;
     }
 
-    if (parentId) {
-        const parent = menuArr.value.find((x: any) => x.modId === parentId);
-        if (parent) {
-            currPath.value = parent.page || "";
-            if (parent.pid) {
-                const gp = menuArr.value.find((x: any) => x.id === parent.pid);
-                if (gp) navArr.push({ name: gp.name });
-            }
-            navArr.push({ name: parent.name, page: parent.page });
-            navArr.push({ name: title });
-            navPath.value = navArr;
-            return;
-        }
+    // 2) 落地页（不在菜单里的路由：写公告 / 草稿箱 / 公告详情）：
+    //    父节点优先取「进入它的那个菜单节点」，这样从「全部公告」进写公告页就选
+    //    「全部公告」，而不是写死的 meta.parentId；没有来源（冷启动/刷新/直接粘 URL）
+    //    时才退回 meta.parentId → modId 的静态契约
+    const origin: any = lastMenuPage.value
+        ? menuArr.value.find((x: any) => x.page === lastMenuPage.value)
+        : null;
+    const declared: any =
+        (parentId != null && menuArr.value.find((x: any) => x.modId === parentId)) ||
+        (parentId != null && menuArr.value.find((x: any) => x.id === parentId)) ||
+        (modId != null && menuArr.value.find((x: any) => x.modId === modId));
+    const parent: any = origin || declared;
+    if (parent) {
+        currPath.value = parent.page || lastMenuPage.value;
+        if (parent.page) lastMenuPage.value = parent.page;
+        navPath.value = [
+            ...ancestorsOf(parent),
+            { name: parent.name, page: parent.page },
+            { name: title },
+        ];
+        return;
     }
 
-    const r = router.getRoutes().find((rt: any) => (rt.meta as any)?.modId === modId);
+    // 3) 菜单里没有、但路由表里按 modId 能查到（单模块 isAlone 等）：只更新面包屑
+    const r: any = router.getRoutes().find((rt: any) => (rt.meta as any)?.modId === modId);
     if (r) {
         currPath.value = r.path;
+        if (menuPageSet.value.has(r.path)) lastMenuPage.value = r.path;
         navPath.value = [{ name: (r.meta as any).title, page: r.path }];
         return;
     }
 
-    currPath.value = "";
-    navPath.value = [];
+    // 4) 全都匹配不到：保持现有高亮与面包屑，**不清空**
+    //    清空会让左侧菜单突然全部失选（比"高亮停在上一个节点"更像 bug）
 };
 
+/**
+ * 展开当前选中项所在的分组。
+ * 分组默认是收起的（childState 未设置），选中项若在收起的分组里就"看不见选中"了；
+ * 落地页高亮到某个一级分组下的子节点时尤其明显。只展开、不收起，
+ * 避免用户手动展开的分组被自动关掉。
+ */
+const expandToActive = () => {
+    const p = currPath.value;
+    if (!p) return;
+    (displayModList.value || []).forEach((item: any) => {
+        if (Array.isArray(item.children) && item.children.some((c: any) => c?.page === p)) {
+            item.childState = true;
+        }
+    });
+};
+
+/* 菜单到达后重跑一次高亮计算：首屏路由早于菜单就位（menuArr 为空时算不出高亮），
+   刷新停在落地页时尤其明显。只在菜单内容变化时触发，展开/收起不触发 */
+watch(
+    () => menuArr.value.map((x: any) => `${x.modId}|${x.page}`).join(","),
+    () => {
+        routeChange(route);
+        expandToActive();
+    }
+);
+
+watch(currPath, expandToActive);
+
 const linkMenu = (item: any) => {
     const page: string = item?.page || "";
     if (!page) {
@@ -112,7 +171,10 @@ const linkMenu = (item: any) => {
         return;
     }
     if (page === route.path) {
-        router.go(0);
+        // 已在目标页：软重挂载内容区即可。原来用 router.go(0) 会整页 reload
+        // （重新拉身份/菜单、白屏一下），且「点一次没反应」的观感更重
+        if (refreshView) refreshView();
+        else router.go(0);
     } else {
         router.push(page);
     }
@@ -144,9 +206,15 @@ const linkUserInfo = () => {
     window.location.href = baseHost.value + "/v/userinfo";
 };
 const logout = () => {
-    let url = window.location.href;
-    url = "/logout?service=" + url;
-    window.location.href = ssoHost.value + url;
+    // 必须带 ssoHost：ssoHost 为空时 "/logout" 是**同源相对路径**，会落到 base 域，
+    // 会话不会注销（只是从当前页跳回首页，看着像点了没反应）。
+    // 线上 ssoHost 来自 env-config；未下发时由 host.config 的 ④ 按 base.* → sso.* 推导。
+    if (!ssoHost.value) {
+        Message.warning("未取到单点登录地址，无法安全退出，请稍后重试或联系管理员");
+        return;
+    }
+    const url = window.location.href;
+    window.location.href = ssoHost.value + "/logout?service=" + url;
 };
 const childChange = (index: number) => {
     const arr = displayModList.value || [];
diff --git a/src/utils/menuRoute.ts b/src/utils/menuRoute.ts
index eb0068d..104e028 100644
--- a/src/utils/menuRoute.ts
+++ b/src/utils/menuRoute.ts
@@ -253,3 +253,50 @@ export function normalizeModList(list?: any[] | null): any[] {
     }
     return mapped;
 }
+
+export interface MenuNode {
+    id: any;
+    name?: string;
+    modId: any;
+    /** 已归一为内部路由；解析不出时为空串 */
+    page: string;
+    external?: boolean;
+    /** 父节点 id（顶层为 0） */
+    pid: any;
+}
+
+/**
+ * 摊平归一后的菜单树（顺序与侧边栏渲染一致：带 page 的父节点先于其子节点）。
+ *
+ * 侧边栏高亮、面包屑祖先、路由权限判定三处必须共用同一份摊平口径，
+ * 否则「第一个节点」「当前节点」这类判断会在不同地方得出不同答案。
+ * 入参必须是 normalizeModList 归一后的树（含草稿箱注入）。
+ */
+export function flattenMenuNodes(list?: any[] | null, pid: any = 0): MenuNode[] {
+    const arr: MenuNode[] = [];
+    (Array.isArray(list) ? list : []).forEach((element: any) => {
+        if (!element) return;
+        const { id, name, modId, page, external } = element;
+        arr.push({ id, name, modId, page, external, pid });
+        if (Array.isArray(element.children) && element.children.length) {
+            arr.push(...flattenMenuNodes(element.children, id));
+        }
+    });
+    return arr;
+}
+
+/**
+ * 用户「第一个可用页面」：登录落地、以及访问无权路由时的兜底目标。
+ *
+ * 规则与 App.initShell 保持一致 —— 取第一个模块，它有子节点时落第一个子节点，
+ * 否则落它自己。两处若不一致，会出现"登录后进 A、被拦后又跳 B"。
+ * 本工程第一个模块通常是「我的公告」，其 page 就是 "/"（应用入口页本身）。
+ */
+export function firstMenuPath(list?: any[] | null): string {
+    const arr = Array.isArray(list) ? list : [];
+    const first = arr.find((m: any) => m && (m.page || (m.children && m.children.length)));
+    if (!first) return "";
+    const target =
+        Array.isArray(first.children) && first.children.length ? first.children[0] : first;
+    return target?.page || "";
+}