feat(client): 导航布局收敛与移动端菜单(E3)

- Sidebar/Topbar 统一交互与样式
- 移动端抽屉菜单(Dialog)+ 账号下拉菜单(DropdownMenu)
- 导航项抽取为 NavLinks 便于后续扩展
这个提交包含在:
2026-02-08 23:22:22 +08:00
父节点 c7619e55b4
当前提交 8196bc6e77
共修改 4 个文件,包含 174 行新增和 76 行删除
@@ -0,0 +1,70 @@
import { NavLink } from "react-router-dom";
import { useAuth } from "../../auth/AuthContext";
import { hasAnyPermission } from "../../auth/permissions";
import { cn } from "../../lib/utils";
export type NavItem = {
to: string;
label: string;
anyOf?: string[];
};
export const NAV_ITEMS: NavItem[] = [
{ to: "/dashboard", label: "仪表盘" },
{
to: "/reimbursements",
label: "我的报销",
anyOf: ["expense.view_own", "expense.view_all"],
},
{
to: "/workflow/tasks",
label: "待我处理",
anyOf: ["expense.approve"],
},
{
to: "/invoice-pool",
label: "票据中心",
anyOf: ["invoice.upload", "invoice.view_own", "invoice.manage"],
},
{
to: "/audit-logs",
label: "审计工作台",
anyOf: ["system.audit.view"],
},
{ to: "/settings/profile", label: "个人设置" },
];
export function NavLinks({ onNavigate }: { onNavigate?: () => void }) {
const { permissions } = useAuth();
const visibleItems = NAV_ITEMS.filter((item) => {
if (!item.anyOf) {
return true;
}
return hasAnyPermission(permissions, item.anyOf);
});
return (
<nav className="space-y-1">
{visibleItems.map((item) => (
<NavLink
key={item.to}
to={item.to}
onClick={() => onNavigate?.()}
className={({ isActive }) =>
cn(
"block rounded-lg px-3 py-2.5 text-sm font-medium transition-colors",
isActive
? "bg-primary-50 text-primary"
: "text-slate-700 hover:bg-slate-50 hover:text-slate-900",
)
}
>
{item.label}
</NavLink>
))}
</nav>
);
}
+4 -62
查看文件
@@ -1,49 +1,6 @@
import { NavLink } from "react-router-dom"; import { NavLinks } from "./NavLinks";
import { useAuth } from "../../auth/AuthContext";
import { hasAnyPermission } from "../../auth/permissions";
type NavItem = {
to: string;
label: string;
anyOf?: string[];
};
const NAV_ITEMS: NavItem[] = [
{ to: "/dashboard", label: "仪表盘" },
{
to: "/reimbursements",
label: "我的报销",
anyOf: ["expense.view_own", "expense.view_all"],
},
{
to: "/workflow/tasks",
label: "待我处理",
anyOf: ["expense.approve"],
},
{
to: "/invoice-pool",
label: "票据中心",
anyOf: ["invoice.upload", "invoice.view_own", "invoice.manage"],
},
{
to: "/audit-logs",
label: "审计工作台",
anyOf: ["system.audit.view"],
},
{ to: "/settings/profile", label: "个人设置" },
];
export function Sidebar() { export function Sidebar() {
const { permissions } = useAuth();
const visibleItems = NAV_ITEMS.filter((item) => {
if (!item.anyOf) {
return true;
}
return hasAnyPermission(permissions, item.anyOf);
});
return ( return (
<aside className="hidden w-64 shrink-0 border-r border-slate-200 bg-white lg:flex lg:flex-col"> <aside className="hidden w-64 shrink-0 border-r border-slate-200 bg-white lg:flex lg:flex-col">
<div className="border-b border-slate-200 px-6 py-5"> <div className="border-b border-slate-200 px-6 py-5">
@@ -51,24 +8,9 @@ export function Sidebar() {
<h1 className="mt-1 text-lg font-bold text-slate-900">海音达工作台</h1> <h1 className="mt-1 text-lg font-bold text-slate-900">海音达工作台</h1>
</div> </div>
<nav className="flex-1 space-y-1 p-4"> <div className="flex-1 p-4">
{visibleItems.map((item) => ( <NavLinks />
<NavLink </div>
key={item.to}
to={item.to}
className={({ isActive }) =>
[
"block rounded-lg px-3 py-2 text-sm font-medium transition-colors",
isActive
? "bg-primary-50 text-primary"
: "text-slate-700 hover:bg-slate-50 hover:text-slate-900",
].join(" ")
}
>
{item.label}
</NavLink>
))}
</nav>
</aside> </aside>
); );
} }
+99 -13
查看文件
@@ -1,16 +1,91 @@
import { useState } from "react";
import { Link } from "react-router-dom"; import { Link } from "react-router-dom";
import { useAuth } from "../../auth/AuthContext"; import { useAuth } from "../../auth/AuthContext";
import { Button } from "../ui/button";
import {
Dialog,
DialogClose,
DialogContent,
DialogTrigger,
} from "../ui/dialog";
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuSeparator,
DropdownMenuTrigger,
} from "../ui/dropdown-menu";
import { NavLinks } from "./NavLinks";
function MenuIcon() {
return (
<svg
aria-hidden="true"
fill="none"
height="20"
viewBox="0 0 24 24"
width="20"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M4 6h16M4 12h16M4 18h16"
stroke="currentColor"
strokeLinecap="round"
strokeWidth="2"
/>
</svg>
);
}
export function Topbar() { export function Topbar() {
const { me, logout } = useAuth(); const { me, logout } = useAuth();
const roleCodes = me?.roleCodes ?? []; const roleCodes = me?.roleCodes ?? [];
const [mobileNavOpen, setMobileNavOpen] = useState(false);
return ( return (
<header className="sticky top-0 z-20 border-b border-slate-200 bg-white/95 px-4 py-3 backdrop-blur sm:px-6"> <header className="sticky top-0 z-20 border-b border-slate-200 bg-white/95 px-4 py-3 backdrop-blur sm:px-6">
<div className="flex items-center justify-between gap-4"> <div className="flex items-center justify-between gap-4">
<div> <div className="flex items-center gap-2">
<Dialog open={mobileNavOpen} onOpenChange={setMobileNavOpen}>
<DialogTrigger asChild>
<Button
className="lg:hidden"
size="icon"
variant="secondary"
aria-label="打开菜单"
type="button"
>
<MenuIcon />
</Button>
</DialogTrigger>
<DialogContent className="left-0 top-0 h-full w-72 max-w-[80vw] translate-x-0 translate-y-0 rounded-none rounded-r-xl p-0">
<div className="flex h-full flex-col">
<div className="flex items-center justify-between border-b border-slate-200 px-4 py-4">
<div>
<p className="text-xs font-semibold uppercase tracking-wide text-primary">
hyb-oa
</p>
<p className="mt-1 text-sm font-bold text-slate-900">海音达工作台</p>
</div>
<DialogClose asChild>
<Button size="icon" variant="ghost" aria-label="关闭菜单" type="button">
✕
</Button>
</DialogClose>
</div>
<div className="flex-1 overflow-auto p-4">
<NavLinks onNavigate={() => setMobileNavOpen(false)} />
</div>
</div>
</DialogContent>
</Dialog>
<div>
<p className="text-sm text-secondary">欢迎回来</p> <p className="text-sm text-secondary">欢迎回来</p>
<p className="text-base font-semibold text-slate-900">{me?.name ?? "-"}</p> <p className="text-base font-semibold text-slate-900">{me?.name ?? "-"}</p>
</div>
</div> </div>
<div className="flex items-center gap-3"> <div className="flex items-center gap-3">
@@ -19,18 +94,29 @@ export function Topbar() {
<p className="text-sm font-medium text-slate-900">{roleCodes.join(" / ") || "-"}</p> <p className="text-sm font-medium text-slate-900">{roleCodes.join(" / ") || "-"}</p>
</div> </div>
<Link className="btn-secondary text-sm" to="/settings/profile"> <DropdownMenu>
个人设置 <DropdownMenuTrigger asChild>
</Link> <Button variant="secondary" type="button">
<button {me?.name ?? "账号"}
className="btn-primary text-sm" </Button>
onClick={() => { </DropdownMenuTrigger>
void logout();
}} <DropdownMenuContent align="end">
type="button" <DropdownMenuItem asChild className="cursor-pointer">
> <Link to="/settings/profile">个人设置</Link>
退出登录 </DropdownMenuItem>
</button> <DropdownMenuSeparator />
<DropdownMenuItem
className="cursor-pointer text-red-600 focus:text-red-600"
onSelect={(event) => {
event.preventDefault();
void logout();
}}
>
退出登录
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
</div> </div>
</div> </div>
</header> </header>
@@ -1,7 +1,7 @@
ID,Title,Description,Acceptance,Test_Method,Tools,Dev_Status,Review1_Status,Regression_Status,Files,Dependencies,Notes ID,Title,Description,Acceptance,Test_Method,Tools,Dev_Status,Review1_Status,Regression_Status,Files,Dependencies,Notes
E1,CSV快照收口(试运行上线版),新建P4试运行上线版执行合同快照承接全部前后端与联动工作,新CSV通过校验且依赖关系正确旧快照不改动,python3 /home/shunli/.codex/skills/plan/scripts/validate_issues_csv.py issues/2026-02-08_21-50-09-p4-trialrun-ready.csv,manual,DONE,DONE,DONE,issues/2026-02-08_21-50-09-p4-trialrun-ready.csv,[],none E1,CSV快照收口(试运行上线版),新建P4试运行上线版执行合同快照承接全部前后端与联动工作,新CSV通过校验且依赖关系正确旧快照不改动,python3 /home/shunli/.codex/skills/plan/scripts/validate_issues_csv.py issues/2026-02-08_21-50-09-p4-trialrun-ready.csv,manual,DONE,DONE,DONE,issues/2026-02-08_21-50-09-p4-trialrun-ready.csv,[],none
E2,前端UI组件基线(成熟复用),引入UI primitives与移动端44px触控规范并保持现有token策略,三大业务页可复用组件且typecheck与build通过,cd client && npm run typecheck && npm run build,manual,DONE,DONE,DONE,client/src/components/ui/* | client/src/lib/* | client/src/styles/mobile-touch.css | client/src/index.css | client/tailwind.config.js | client/package.json,"[""E1""]",本地拷贝shadcn风格组件子集并记录来源/许可证与回滚路径 E2,前端UI组件基线(成熟复用),引入UI primitives与移动端44px触控规范并保持现有token策略,三大业务页可复用组件且typecheck与build通过,cd client && npm run typecheck && npm run build,manual,DONE,DONE,DONE,client/src/components/ui/* | client/src/lib/* | client/src/styles/mobile-touch.css | client/src/index.css | client/tailwind.config.js | client/package.json,"[""E1""]",本地拷贝shadcn风格组件子集并记录来源/许可证与回滚路径
E3,前端布局导航收敛,统一Sidebar与Topbar交互视觉响应式与权限菜单体验,四角色菜单正确窄屏可用路由守卫无闪烁,"manual: 按server与client README启动联调并验证employee manager finance finance_mgr菜单与守卫",manual,TODO,TODO,TODO,client/src/layouts/AppShellLayout.tsx | client/src/components/navigation/* | client/src/components/common/PageHeader.tsx | client/src/router/*,"[""E2""]",none E3,前端布局导航收敛,统一Sidebar与Topbar交互视觉响应式与权限菜单体验,四角色菜单正确窄屏可用路由守卫无闪烁,"manual: 按server与client README启动联调并验证employee manager finance finance_mgr菜单与守卫",manual,DONE,TODO,TODO,client/src/layouts/AppShellLayout.tsx | client/src/components/navigation/* | client/src/components/common/PageHeader.tsx | client/src/router/*,"[""E2""]",none
E4,待办页精修(列表详情动作),用UI primitives收敛待办列表与详情动作区统一加载空态错误并补data-testid,approve reject return transfer动作可用且动作后列表详情刷新一致,cd client && npm run typecheck && npm run build,manual,TODO,TODO,TODO,client/src/pages/WorkflowTasksPage.tsx | client/src/pages/WorkflowTaskDetailPage.tsx | client/src/api/workflow.ts,"[""E3""]",为E2E补稳定选择器data-testid E4,待办页精修(列表详情动作),用UI primitives收敛待办列表与详情动作区统一加载空态错误并补data-testid,approve reject return transfer动作可用且动作后列表详情刷新一致,cd client && npm run typecheck && npm run build,manual,TODO,TODO,TODO,client/src/pages/WorkflowTasksPage.tsx | client/src/pages/WorkflowTaskDetailPage.tsx | client/src/api/workflow.ts,"[""E3""]",为E2E补稳定选择器data-testid
E5,报销页精修(列表详情联动),收敛报销列表详情展示并优化支付凭证与票据区块一致性并补data-testid,employee可create submit withdraw且finance可pay并填写凭证字段,cd client && npm run typecheck && npm run build,manual,TODO,TODO,TODO,client/src/pages/ReimbursementsPage.tsx | client/src/pages/ReimbursementDetailPage.tsx | client/src/api/reimbursements.ts,"[""E3""]",为E2E补稳定选择器data-testid E5,报销页精修(列表详情联动),收敛报销列表详情展示并优化支付凭证与票据区块一致性并补data-testid,employee可create submit withdraw且finance可pay并填写凭证字段,cd client && npm run typecheck && npm run build,manual,TODO,TODO,TODO,client/src/pages/ReimbursementsPage.tsx | client/src/pages/ReimbursementDetailPage.tsx | client/src/api/reimbursements.ts,"[""E3""]",为E2E补稳定选择器data-testid
E6,票据中心精修(OCR与预览),收敛上传列表详情并强化OCR状态展示绑定与签名预览交互并补data-testid,OCR_PROVIDER=mock联调可轮询pending_ocr且ocr_failed展示原因且预览可用,cd client && npm run typecheck && npm run build,manual,TODO,TODO,TODO,client/src/pages/InvoicePoolPage.tsx | client/src/api/invoicePool.ts | client/src/api/http.ts,"[""E3""]",为E2E补稳定选择器data-testid E6,票据中心精修(OCR与预览),收敛上传列表详情并强化OCR状态展示绑定与签名预览交互并补data-testid,OCR_PROVIDER=mock联调可轮询pending_ocr且ocr_failed展示原因且预览可用,cd client && npm run typecheck && npm run build,manual,TODO,TODO,TODO,client/src/pages/InvoicePoolPage.tsx | client/src/api/invoicePool.ts | client/src/api/http.ts,"[""E3""]",为E2E补稳定选择器data-testid
1 ID Title Description Acceptance Test_Method Tools Dev_Status Review1_Status Regression_Status Files Dependencies Notes
2 E1 CSV快照收口(试运行上线版) 新建P4试运行上线版执行合同快照承接全部前后端与联动工作 新CSV通过校验且依赖关系正确旧快照不改动 python3 /home/shunli/.codex/skills/plan/scripts/validate_issues_csv.py issues/2026-02-08_21-50-09-p4-trialrun-ready.csv manual DONE DONE DONE issues/2026-02-08_21-50-09-p4-trialrun-ready.csv [] none
3 E2 前端UI组件基线(成熟复用) 引入UI primitives与移动端44px触控规范并保持现有token策略 三大业务页可复用组件且typecheck与build通过 cd client && npm run typecheck && npm run build manual DONE DONE DONE client/src/components/ui/* | client/src/lib/* | client/src/styles/mobile-touch.css | client/src/index.css | client/tailwind.config.js | client/package.json ["E1"] 本地拷贝shadcn风格组件子集并记录来源/许可证与回滚路径
4 E3 前端布局导航收敛 统一Sidebar与Topbar交互视觉响应式与权限菜单体验 四角色菜单正确窄屏可用路由守卫无闪烁 manual: 按server与client README启动联调并验证employee manager finance finance_mgr菜单与守卫 manual TODO DONE TODO TODO client/src/layouts/AppShellLayout.tsx | client/src/components/navigation/* | client/src/components/common/PageHeader.tsx | client/src/router/* ["E2"] none
5 E4 待办页精修(列表详情动作) 用UI primitives收敛待办列表与详情动作区统一加载空态错误并补data-testid approve reject return transfer动作可用且动作后列表详情刷新一致 cd client && npm run typecheck && npm run build manual TODO TODO TODO client/src/pages/WorkflowTasksPage.tsx | client/src/pages/WorkflowTaskDetailPage.tsx | client/src/api/workflow.ts ["E3"] 为E2E补稳定选择器data-testid
6 E5 报销页精修(列表详情联动) 收敛报销列表详情展示并优化支付凭证与票据区块一致性并补data-testid employee可create submit withdraw且finance可pay并填写凭证字段 cd client && npm run typecheck && npm run build manual TODO TODO TODO client/src/pages/ReimbursementsPage.tsx | client/src/pages/ReimbursementDetailPage.tsx | client/src/api/reimbursements.ts ["E3"] 为E2E补稳定选择器data-testid
7 E6 票据中心精修(OCR与预览) 收敛上传列表详情并强化OCR状态展示绑定与签名预览交互并补data-testid OCR_PROVIDER=mock联调可轮询pending_ocr且ocr_failed展示原因且预览可用 cd client && npm run typecheck && npm run build manual TODO TODO TODO client/src/pages/InvoicePoolPage.tsx | client/src/api/invoicePool.ts | client/src/api/http.ts ["E3"] 为E2E补稳定选择器data-testid