feat(nav): 浅色模式导航重构(顶栏一级 + 侧边栏二级图标卡 + 三级右侧列)

浅色(红/蓝)主题改为与深色一致的导航逻辑,颜色经 --brand-* 变量自动切换:
- 一级导航正常横排进顶栏(白字落在 banner 上,选中加粗 + 底部粗白线)
- 二级导航为侧边栏图标卡片(图标主题色、文字 #222222、选中铺满列宽 + 右侧粗边)
- 三级导航改到侧边栏二级右侧的「三级列」:激活二级项有三级时整列展开、
  侧边栏 96→236px 整体变宽并带过渡动画,主内容左内边距同步平滑右移
- 顶栏三级横条改为仅深色用;浅色不支持侧边栏收起
- 任务管理二级项改用区分图标(ClipboardList/Activity/Gauge/Radar)
- 字体统一用全局 --font-sans,修复雅黑兜底下加粗不生效
- 抽出 getActiveThirdLevelItems / useActiveThirdLevel 供侧边栏与 PageRoutes 共用

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
董宏凯andClaude Opus 4.8 committed 2026-06-15 16:53:21 +08:00
1 parent fbd237531e
commit ee6ab38c37
6 files changed
+543 -11

No files matched your search

@@ -9,15 +9,16 @@
*/
import type { ElementType } from "react";
import {
Activity,
BookOpen,
Bot,
Brain,
CalendarClock,
CircleHelp,
ClipboardList,
Database,
FileBox,
FileText,
Folder,
Gauge,
Grid3X3,
HelpCircle,
@@ -29,6 +30,7 @@ import {
ListChecks,
ListTodo,
Network,
Radar,
Settings,
Sparkles,
Target,
@@ -77,7 +79,7 @@ export const sidebarMenuItems: MenuItem[] = [
{
id: "xk-center-task",
label: "XK中任务",
icon: Folder,
icon: ClipboardList,
children: [
{
id: "xk-task-jc",
@@ -96,7 +98,7 @@ export const sidebarMenuItems: MenuItem[] = [
{
id: "coh-center-task",
label: "COH中任务",
icon: Folder,
icon: Activity,
children: [
{
id: "coh-task-3qfx",
@@ -121,7 +123,7 @@ export const sidebarMenuItems: MenuItem[] = [
{
id: "pg-center-task",
label: "PG中任务",
icon: Folder,
icon: Gauge,
children: [
{
id: "pg-task-pg",
@@ -146,7 +148,7 @@ export const sidebarMenuItems: MenuItem[] = [
{
id: "ty-center-task",
label: "TY中任务",
icon: Folder,
icon: Radar,
children: [
{
id: "ty-task-xdty",
@@ -296,6 +298,31 @@ export const defaultExpandedIds: ReadonlySet<string> = new Set([
"comprehensive-management",
]);
/** 该菜单项自身或任意后代的 path 是否等于当前路由 */
export function menuItemContainsPath(item: MenuItem, pathname: string): boolean {
if (item.path && item.path === pathname) {
return true;
}
return item.children?.some((child) => menuItemContainsPath(child, pathname)) ?? false;
}
/**
* 在「一级 → 二级 → 三级」菜单中,取当前路由所在的「激活二级项」的三级子项。
* 浅色侧边栏据此在二级右侧展开三级列;无三级则返回空数组(侧边栏保持窄栏)。
*/
export function getActiveThirdLevelItems(
items: MenuItem[],
pathname: string,
): MenuItem[] {
const activeTop =
items.find((item) => menuItemContainsPath(item, pathname)) ?? items[0];
const secondary = activeTop?.children ?? [];
const activeSecond = secondary.find(
(item) => (item.children?.length ?? 0) > 0 && menuItemContainsPath(item, pathname),
);
return activeSecond?.children ?? [];
}
/** 按 admin 角色过滤菜单:非 admin 不展示 ``adminOnly: true`` 的项及其子项 */
export function filterMenuItemsByRole(items: MenuItem[], isAdmin: boolean): MenuItem[] {
return items
@@ -8,12 +8,15 @@
* 浅色 PageSidebar 与深色 PageSidebarDark 共用此 hook,保证两套皮肤同步。
*/
import { useMemo } from "react";
import { useLocation } from "react-router-dom";
import { Layout } from "lucide-react";
import { getStoredAuth } from "@/core/auth";
import { useLightApps, type LightApp } from "@/strategy-components/api/light-apps";
import {
filterMenuItemsByRole,
getActiveThirdLevelItems,
sidebarMenuItems,
type MenuItem,
} from "./sidebar-menu";
@@ -61,3 +64,14 @@ export function useSidebarMenuItems(isAdmin: boolean): MenuItem[] {
[iframeApps, isAdmin],
);
}
/**
* 当前路由所在「激活二级项」的三级子项(浅色侧边栏右侧列用)。
* 供 PageRoutes(主内容左内边距随展开自适应)与浅色侧边栏共用同一份判定逻辑。
*/
export function useActiveThirdLevel(): MenuItem[] {
const isAdmin = getStoredAuth()?.system_role === "admin";
const items = useSidebarMenuItems(!!isAdmin);
const { pathname } = useLocation();
return useMemo(() => getActiveThirdLevelItems(items, pathname), [items, pathname]);
}