代码修改

frontend-web/src/pages/PageRoutes.tsx

@@ -24,10 +24,7 @@ function PageLayout() {
       <div className="flex flex-1 overflow-hidden">
         {sidebarEnabled && (
           isDark ? (
-            <PageSidebarDark
-              collapsed={collapsed}
-              onToggleCollapsed={() => setCollapsed((prev) => !prev)}
-            />
+            <PageSidebarDark />
           ) : (
             <PageSidebar
               collapsed={collapsed}
@@ -37,7 +34,13 @@ function PageLayout() {
         )}
         <main
           className={`flex-1 overflow-hidden transition-[padding] duration-300 ${
-            !sidebarEnabled ? "" : collapsed ? "pl-16" : "pl-64"
+            !sidebarEnabled
+              ? ""
+              : isDark
+                ? "pl-[118px]"
+                : collapsed
+                  ? "pl-16"
+                  : "pl-64"
           }`}
         >
           <Routes>
@@ -50,6 +53,7 @@ function PageLayout() {
                   pageSidebarHidden={!sidebarEnabled}
                   headerHidden={!sidebarEnabled}
                   compactWorkspaceSidebar={sidebarEnabled}
+                  pageSidebarDark={isDark}
                 />
               }
             />

frontend-web/src/pages/WorkspaceRoutes.tsx

@@ -47,18 +47,25 @@ export function WorkspaceLayout({
   pageSidebarHidden = false,
   headerHidden = false,
   compactWorkspaceSidebar = false,
+  pageSidebarDark = false,
 }: {
   children: ReactNode;
   pageSidebarCollapsed: boolean;
   pageSidebarHidden?: boolean;
   headerHidden?: boolean;
   compactWorkspaceSidebar?: boolean;
+  pageSidebarDark?: boolean;
 }) {
   const pageSidebarWidth = pageSidebarHidden
     ? "0rem"
-    : pageSidebarCollapsed
-      ? "4rem"
-      : "16rem";
+    : pageSidebarDark
+      // dark page sidebar 视觉右边界是 108px（外框 98 + 内层 translateX 10），
+      // 再 +10px gap 让 workspace sidebar 跟它之间留一条间隔；
+      // 与 PageRoutes.tsx 的 main pl-[118px] 保持一致
+      ? "118px"
+      : pageSidebarCollapsed
+        ? "4rem"
+        : "16rem";
 
   return (
     <SidebarProvider
@@ -97,17 +104,20 @@ export default function WorkspaceRoutes({
   pageSidebarHidden = false,
   headerHidden = false,
   compactWorkspaceSidebar = false,
+  pageSidebarDark = false,
 }: {
   pageSidebarCollapsed?: boolean;
   pageSidebarHidden?: boolean;
   headerHidden?: boolean;
   compactWorkspaceSidebar?: boolean;
+  pageSidebarDark?: boolean;
 }) {
   const layoutProps = {
     pageSidebarCollapsed,
     pageSidebarHidden,
     headerHidden,
     compactWorkspaceSidebar,
+    pageSidebarDark,
   };
 
   return (