代码提交

This commit is contained in:
董宏凯 committed 2026-07-27 19:16:12 +08:00
1 parent e70bb4aa6f
commit 5bf3955b26
20 files changed
+636 -61

No files matched your search

@@ -8,6 +8,17 @@
flex-shrink: 0;
}
/* `?hideHeader=1`: keep the menu rail, but let it occupy the Header's space. */
.sidebar-contnet--header-hidden {
top: 0;
height: 100vh;
}
.sidebar-contnet--header-hidden .item-nav-content {
height: calc(100vh - 20px);
min-height: calc(100vh - 20px);
}
.sidebar-contents {
width: 98px;
min-height: calc(100% - 20px);
@@ -618,6 +629,12 @@ html.lightyellow .light-topnav-item--active::after {
width: 236px;
}
/* `?hideHeader=1`: preserve the light sidebar while removing only Header. */
.light-sidebar--header-hidden {
top: 0;
height: 100vh;
}
/* 二级列:固定 96px,竖排图标卡片 + 底部设置 */
.light-sidebar__primary {
flex: 0 0 96px;
@@ -17,9 +17,15 @@ type PageSidebarDarkProps = {
/** 是否收起(true 时只渲染左下角浮动入口,sidebar 主体隐藏) */
collapsed: boolean;
onToggleCollapsed: () => void;
/** 全局 Header 隐藏时,侧边栏从视口顶部开始占满高度。 */
headerHidden?: boolean;
};
export function PageSidebarDark({ collapsed, onToggleCollapsed }: PageSidebarDarkProps) {
export function PageSidebarDark({
collapsed,
onToggleCollapsed,
headerHidden = false,
}: PageSidebarDarkProps) {
const isAdmin = getStoredAuth()?.system_role === "admin";
const visibleMenuItems = useSidebarMenuItems(!!isAdmin);
const inWujieEnv = isWujieEnv();
@@ -213,7 +219,11 @@ export function PageSidebarDark({ collapsed, onToggleCollapsed }: PageSidebarDar
}
return (
<aside className={`sidebar-contnet ${inWujieEnv ? "" : "sidebar-contnet--top-submenu"}`}>
<aside
className={`sidebar-contnet ${inWujieEnv ? "" : "sidebar-contnet--top-submenu"} ${
headerHidden ? "sidebar-contnet--header-hidden" : ""
}`}
>
<div className="sidebar-contents">
{sidebarMenuItemsToRender.map((item) => (
<div
+19 -5
View File
@@ -49,6 +49,8 @@ import "@/components/page-sdebar.css";
type PageSidebarProps = {
collapsed: boolean;
onToggleCollapsed: () => void;
/** Global Header is hidden but this sidebar remains available. */
headerHidden?: boolean;
};
type SettingsSection = "account" | "appearance" | "memory" | "tools" | "about";
@@ -79,23 +81,28 @@ const findFirstRoutePath = (items?: MenuItem[]): string | null => {
* - wujie 嵌入环境:顶栏被宿主隐藏,一级导航无处安放,故回落到原手风琴整树菜单
* (保证嵌入模式下所有层级仍可达,零回归)。
*/
export function PageSidebar({ collapsed, onToggleCollapsed }: PageSidebarProps) {
export function PageSidebar({
collapsed,
onToggleCollapsed,
headerHidden = false,
}: PageSidebarProps) {
if (isWujieEnv()) {
return (
<LegacyAccordionSidebar
collapsed={collapsed}
onToggleCollapsed={onToggleCollapsed}
headerHidden={headerHidden}
/>
);
}
return <SecondaryNavSidebar />;
return <SecondaryNavSidebar headerHidden={headerHidden} />;
}
/**
* 浅色二级导航侧边栏(图标卡片,红/蓝主题色经 --brand-* 变量自动切换)。
* 浅色模式不支持侧边栏收起,故无收起按钮、不接收 collapsed 相关 props。
*/
function SecondaryNavSidebar() {
function SecondaryNavSidebar({ headerHidden }: { headerHidden: boolean }) {
const isAdmin = getStoredAuth()?.system_role === "admin";
const visibleMenuItems = useSidebarMenuItems(!!isAdmin);
const { t } = useI18n();
@@ -150,7 +157,11 @@ function SecondaryNavSidebar() {
open={notificationOpen}
onOpenChange={setNotificationOpen}
/>
<aside className={`light-sidebar ${expanded ? "light-sidebar--expanded" : ""}`}>
<aside
className={`light-sidebar ${expanded ? "light-sidebar--expanded" : ""} ${
headerHidden ? "light-sidebar--header-hidden" : ""
}`}
>
{/* 一级列:二级图标卡片 + 底部设置 */}
<div className="light-sidebar__primary">
<nav className="light-sidebar__list" aria-label="二级菜单">
@@ -287,6 +298,7 @@ function SecondaryNavSidebar() {
function LegacyAccordionSidebar({
collapsed,
onToggleCollapsed,
headerHidden,
}: PageSidebarProps) {
const { theme } = useTheme();
const isDark = theme === "dark";
@@ -438,7 +450,9 @@ function LegacyAccordionSidebar({
onOpenChange={setNotificationOpen}
/>
<aside
className={`fixed left-0 top-16 z-40 flex h-[calc(100vh-4rem)] flex-col overflow-hidden shadow-sm theme-transition transition-all duration-300 ${
className={`fixed left-0 z-40 flex flex-col overflow-hidden shadow-sm theme-transition transition-all duration-300 ${
headerHidden ? "top-0 h-screen" : "top-16 h-[calc(100vh-4rem)]"
} ${
isDark
? "border-r border-blue-800/30 bg-slate-900"
: "border-r border-red-100 bg-white"
@@ -184,7 +184,7 @@ export function WorkspaceNavChatList({
</Link>
</SidebarMenuButton>
</SidebarMenuItem>
{/* <SidebarMenuItem>
<SidebarMenuItem>
<SidebarMenuButton
isActive={pathname.startsWith("/page/workspace/roundtable/position")}
asChild
@@ -192,10 +192,10 @@ export function WorkspaceNavChatList({
>
<Link href="/page/workspace/roundtable/position">
<BriefcaseBusiness />
<span>岗位会商1</span>
<span>岗位会商</span>
</Link>
</SidebarMenuButton>
</SidebarMenuItem> */}
</SidebarMenuItem>
<SidebarMenuItem>
<SidebarMenuButton
isActive={pathname === "/page/workspace/scheduled/tasks"}