fix: 修复深色导航与会商悬浮样式

This commit is contained in:
fengxiangdebaozi committed 2026-07-16 11:21:52 +08:00
1 parent 3cd093a8a2
commit d7d101814f
5 files changed
+58 -11

No files matched your search

+9 -8
View File
@@ -31,8 +31,6 @@ function PageLayout() {
const location = useLocation();
const { theme } = useTheme();
const isDark = theme === "dark";
// 深色导航侧栏不提供收起入口,始终保持展开,避免切换主题后沿用浅色模式的收起状态。
const sidebarCollapsed = isDark ? false : collapsed;
// 浅色非嵌入:侧边栏为新版「二级导航图标卡片」窄栏(96px);wujie 嵌入仍走旧版手风琴(64/256px)。
const inWujie = useMemo(() => isWujieEnv(), []);
const lightNarrowSidebar = !isDark && !inWujie;
@@ -76,14 +74,17 @@ function PageLayout() {
return (
<RoundtableJobNotifier>
<div className="h-full flex flex-col bg-muted/20">
{pageSidebarAllowed && <Header collapsed={sidebarCollapsed} />}
{pageSidebarAllowed && <Header collapsed={collapsed} />}
<div className="flex flex-1 overflow-hidden">
{pageSidebarAllowed && (
isDark ? (
<PageSidebarDark />
<PageSidebarDark
collapsed={collapsed}
onToggleCollapsed={() => setCollapsed((prev) => !prev)}
/>
) : (
<PageSidebar
collapsed={sidebarCollapsed}
collapsed={collapsed}
onToggleCollapsed={() => setCollapsed((prev) => !prev)}
/>
)
@@ -93,8 +94,8 @@ function PageLayout() {
!pageSidebarAllowed
? ""
: isDark
// 深色 sidebar 固定展开 118px(10 + 98 + 10 gap)。
? "pl-[118px]"
// 深色 sidebar:展开 118px(10 + 98 + 10 gap),收起时主内容不留左内边距。
? (collapsed ? "pl-0" : "pl-[118px]")
: lightNarrowSidebar
// 浅色新版窄栏:展开三级列时 96→236px,主内容左内边距随之过渡
? `transition-[padding] duration-300 ${lightExpanded ? "pl-[236px]" : "pl-[96px]"}`
@@ -108,7 +109,7 @@ function PageLayout() {
path="workspace/*"
element={
<WorkspaceRoutes
pageSidebarCollapsed={sidebarCollapsed}
pageSidebarCollapsed={collapsed}
pageSidebarHidden={!pageSidebarAllowed}
headerHidden={!pageSidebarAllowed}
compactWorkspaceSidebar={pageSidebarAllowed}