fix: tighten workspace controls
This commit is contained in:
109
modules/shared/components/AccountMenu.tsx
Normal file
109
modules/shared/components/AccountMenu.tsx
Normal file
@@ -0,0 +1,109 @@
|
||||
"use client";
|
||||
|
||||
import Link from "next/link";
|
||||
import { useRouter } from "next/navigation";
|
||||
import { Ellipsis, LogOut, Settings } from "lucide-react";
|
||||
import { useEffect, useRef, useState } from "react";
|
||||
|
||||
import { Button } from "@/components/ui/button";
|
||||
import type { Permission, PublicAccount } from "@/modules/core/types";
|
||||
import { UserAvatar } from "@/modules/shared/components/UserAvatar";
|
||||
|
||||
type AccountMenuProps = {
|
||||
account: PublicAccount;
|
||||
permissions: Permission[];
|
||||
};
|
||||
|
||||
export function AccountMenu({ account, permissions }: AccountMenuProps): React.ReactElement {
|
||||
const router = useRouter();
|
||||
const menuRef = useRef<HTMLDivElement>(null);
|
||||
const [isOpen, setIsOpen] = useState(false);
|
||||
const [isPending, setIsPending] = useState(false);
|
||||
const canReadAccounts = permissions.includes("account:read");
|
||||
const settingsHref = canReadAccounts ? `/app/settings/users?q=${encodeURIComponent(account.email)}` : "/app/settings/global";
|
||||
|
||||
useEffect(() => {
|
||||
if (!isOpen) {
|
||||
return;
|
||||
}
|
||||
|
||||
function handlePointerDown(event: PointerEvent): void {
|
||||
const target = event.target;
|
||||
if (target instanceof Node && !menuRef.current?.contains(target)) {
|
||||
setIsOpen(false);
|
||||
}
|
||||
}
|
||||
|
||||
function handleKeyDown(event: KeyboardEvent): void {
|
||||
if (event.key === "Escape") {
|
||||
setIsOpen(false);
|
||||
}
|
||||
}
|
||||
|
||||
document.addEventListener("pointerdown", handlePointerDown);
|
||||
document.addEventListener("keydown", handleKeyDown);
|
||||
|
||||
return () => {
|
||||
document.removeEventListener("pointerdown", handlePointerDown);
|
||||
document.removeEventListener("keydown", handleKeyDown);
|
||||
};
|
||||
}, [isOpen]);
|
||||
|
||||
async function handleSignOut(): Promise<void> {
|
||||
setIsPending(true);
|
||||
await fetch("/api/auth/logout", { method: "POST" });
|
||||
router.refresh();
|
||||
router.replace("/login");
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="relative" ref={menuRef}>
|
||||
<div className="flex min-w-0 items-center gap-3 rounded-md bg-secondary/55 p-2">
|
||||
<UserAvatar avatarUrl={account.avatarUrl} name={account.name} size="sm" />
|
||||
<div className="min-w-0 flex-1">
|
||||
<p className="truncate text-sm font-medium leading-tight">{account.name}</p>
|
||||
<p className="truncate text-xs leading-tight text-muted-foreground">{account.email}</p>
|
||||
</div>
|
||||
<Button
|
||||
aria-expanded={isOpen}
|
||||
aria-haspopup="menu"
|
||||
aria-label="打开账号菜单"
|
||||
onClick={() => setIsOpen((current) => !current)}
|
||||
size="icon"
|
||||
type="button"
|
||||
variant="ghost"
|
||||
className="size-9 shrink-0"
|
||||
>
|
||||
<Ellipsis className="size-4" aria-hidden="true" />
|
||||
</Button>
|
||||
</div>
|
||||
|
||||
{isOpen ? (
|
||||
<div
|
||||
className="absolute bottom-full right-0 z-30 mb-2 w-52 rounded-md border bg-popover p-1 text-popover-foreground shadow-lg"
|
||||
role="menu"
|
||||
>
|
||||
<Link
|
||||
className="flex min-h-10 items-center gap-2 rounded-sm px-3 text-sm font-medium hover:bg-secondary"
|
||||
href={settingsHref}
|
||||
onClick={() => setIsOpen(false)}
|
||||
role="menuitem"
|
||||
>
|
||||
<Settings className="size-4 text-muted-foreground" aria-hidden="true" />
|
||||
用户设置
|
||||
</Link>
|
||||
<button
|
||||
className="flex min-h-10 w-full items-center gap-2 rounded-sm px-3 text-left text-sm font-medium hover:bg-secondary disabled:opacity-55"
|
||||
disabled={isPending}
|
||||
onClick={handleSignOut}
|
||||
role="menuitem"
|
||||
type="button"
|
||||
>
|
||||
<LogOut className="size-4 text-muted-foreground" aria-hidden="true" />
|
||||
退出登录
|
||||
</button>
|
||||
</div>
|
||||
) : null}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
83
modules/shared/components/AppBreadcrumbs.tsx
Normal file
83
modules/shared/components/AppBreadcrumbs.tsx
Normal file
@@ -0,0 +1,83 @@
|
||||
"use client";
|
||||
|
||||
import Link from "next/link";
|
||||
import { usePathname } from "next/navigation";
|
||||
import { ChevronRight } from "lucide-react";
|
||||
|
||||
type BreadcrumbItem = {
|
||||
href?: string;
|
||||
label: string;
|
||||
};
|
||||
|
||||
const routeLabels: Record<string, string> = {
|
||||
"/app/dashboard": "运营看板",
|
||||
"/app/elders": "老人档案",
|
||||
"/app/beds": "床位房间",
|
||||
"/app/health": "健康照护",
|
||||
"/app/care": "护理服务",
|
||||
"/app/emergency": "安全应急",
|
||||
"/app/devices": "设备运维",
|
||||
"/app/notices": "公告通知",
|
||||
"/app/alerts": "规则预警",
|
||||
"/app/family": "家属服务",
|
||||
"/app/settings/global": "全局配置",
|
||||
"/app/settings/organizations": "机构管理",
|
||||
"/app/settings/users": "用户管理",
|
||||
"/app/settings/roles": "角色权限",
|
||||
"/app/settings/audit": "审计日志",
|
||||
"/app/settings/status": "运行状态",
|
||||
};
|
||||
|
||||
function getBreadcrumbs(pathname: string): BreadcrumbItem[] {
|
||||
if (pathname === "/app" || pathname === "/app/dashboard") {
|
||||
return [{ label: "工作台" }];
|
||||
}
|
||||
|
||||
if (pathname.startsWith("/app/settings/organizations/")) {
|
||||
return [
|
||||
{ href: "/app/dashboard", label: "工作台" },
|
||||
{ href: "/app/settings/users", label: "系统设置" },
|
||||
{ href: "/app/settings/organizations", label: "机构管理" },
|
||||
{ label: "机构详情" },
|
||||
];
|
||||
}
|
||||
|
||||
if (pathname.startsWith("/app/settings")) {
|
||||
return [
|
||||
{ href: "/app/dashboard", label: "工作台" },
|
||||
{ href: "/app/settings/users", label: "系统设置" },
|
||||
{ label: routeLabels[pathname] ?? "设置" },
|
||||
];
|
||||
}
|
||||
|
||||
return [
|
||||
{ href: "/app/dashboard", label: "工作台" },
|
||||
{ label: routeLabels[pathname] ?? "工作区" },
|
||||
];
|
||||
}
|
||||
|
||||
export function AppBreadcrumbs(): React.ReactElement {
|
||||
const pathname = usePathname();
|
||||
const breadcrumbs = getBreadcrumbs(pathname);
|
||||
|
||||
return (
|
||||
<nav aria-label="面包屑" className="flex min-w-0 items-center gap-1 text-sm">
|
||||
{breadcrumbs.map((item, index) => {
|
||||
const isLast = index === breadcrumbs.length - 1;
|
||||
|
||||
return (
|
||||
<span className="flex min-w-0 items-center gap-1" key={`${item.label}-${index}`}>
|
||||
{index > 0 ? <ChevronRight className="size-3.5 shrink-0 text-muted-foreground" aria-hidden="true" /> : null}
|
||||
{item.href && !isLast ? (
|
||||
<Link className="shrink-0 font-medium hover:text-primary" href={item.href}>
|
||||
{item.label}
|
||||
</Link>
|
||||
) : (
|
||||
<span className={isLast ? "min-w-0 truncate text-muted-foreground" : "shrink-0 font-medium"}>{item.label}</span>
|
||||
)}
|
||||
</span>
|
||||
);
|
||||
})}
|
||||
</nav>
|
||||
);
|
||||
}
|
||||
@@ -20,6 +20,8 @@ import type { LucideIcon } from "lucide-react";
|
||||
|
||||
import type { Permission, PublicAccount } from "@/modules/core/types";
|
||||
import { SignOutButton } from "@/modules/auth/components/SignOutButton";
|
||||
import { AccountMenu } from "@/modules/shared/components/AccountMenu";
|
||||
import { AppBreadcrumbs } from "@/modules/shared/components/AppBreadcrumbs";
|
||||
import { UserAvatar } from "@/modules/shared/components/UserAvatar";
|
||||
|
||||
type NavItem = {
|
||||
@@ -194,14 +196,7 @@ export function AppShell({ children, account, permissions }: AppShellProps): Rea
|
||||
</nav>
|
||||
|
||||
<div className="border-t p-3">
|
||||
<div className="flex min-w-0 items-center gap-3 rounded-md bg-secondary/55 p-2">
|
||||
<UserAvatar avatarUrl={account.avatarUrl} name={account.name} size="sm" />
|
||||
<div className="min-w-0 flex-1">
|
||||
<p className="truncate text-sm font-medium leading-tight">{account.name}</p>
|
||||
<p className="truncate text-xs leading-tight text-muted-foreground">{account.email}</p>
|
||||
</div>
|
||||
</div>
|
||||
<SignOutButton className="mt-2 w-full justify-start" />
|
||||
<AccountMenu account={account} permissions={permissions} />
|
||||
</div>
|
||||
</div>
|
||||
</aside>
|
||||
@@ -212,9 +207,7 @@ export function AppShell({ children, account, permissions }: AppShellProps): Rea
|
||||
<span className="inline-flex size-10 items-center justify-center rounded-md bg-primary text-primary-foreground xl:hidden">
|
||||
<Stethoscope className="size-5" aria-hidden="true" />
|
||||
</span>
|
||||
<div>
|
||||
<p className="text-sm font-medium">工作台</p>
|
||||
</div>
|
||||
<AppBreadcrumbs />
|
||||
</div>
|
||||
<div className="flex min-w-0 items-center gap-2 xl:hidden">
|
||||
<div className="hidden min-w-0 items-center gap-2 sm:flex">
|
||||
|
||||
Reference in New Issue
Block a user