Merge branch 'master' of http://192.168.0.200/knowledge-base-bj/deerflow-server into xuhd

frontend-web/src/pages/LoginPage.tsx

@@ -3,8 +3,18 @@
 import { useParams, useRouter, useSearchParams } from "next/navigation";
 import { useEffect, useMemo, useState } from "react";
 
+import { useTheme } from "@/contexts/ThemeContext";
 import { loginByUsername } from "@/core/auth/api";
 import { setStoredAuth } from "@/core/auth";
+import {
+  persistExternalLoginParams,
+  resolveThemeFromQuery,
+} from "@/core/auth/external-login";
+import {
+  GENERAL_QA_ROUTE,
+  loginByYUserId,
+  persistToolsToken,
+} from "@/core/auth/yuser-login";
 import {
   isSidebarEnabledFromSearch,
   persistSidebarEnabled,
@@ -18,6 +28,7 @@ export default function LoginPage() {
   const { username } = useParams<{ username?: string }>();
   const router = useRouter();
   const searchParams = useSearchParams();
+  const { setTheme } = useTheme();
   const sidebarEnabled = useMemo(
     () => isSidebarEnabledFromSearch(searchParams.toString()),
     [searchParams],
@@ -26,9 +37,33 @@ export default function LoginPage() {
     const raw = username?.trim();
     return raw && raw.length > 0 ? raw : DEFAULT_USERNAME;
   }, [username]);
+  // 外部跳转参数：theme 直接调 setTheme；ticket/userId/env 持久化到 localStorage
+  const yUserId = searchParams.get("yUserId")?.trim() ?? "";
+  const toolToken = searchParams.get("token")?.trim() ?? "";
+  const externalParams = useMemo(() => ({
+    theme: searchParams.get("theme") ?? "",
+    ticket: searchParams.get("ticket") ?? "",
+    userId: searchParams.get("userId") ?? "",
+    env: searchParams.get("env") ?? "",
+  }), [searchParams]);
   const [status, setStatus] = useState<LoginStatus>("loading");
   const [errorMessage, setErrorMessage] = useState<string>("");
 
+  // 主题切换：theme=dark-blue → 深色，其他值或缺省 → 浅色
+  useEffect(() => {
+    if (!externalParams.theme) return;
+    setTheme(resolveThemeFromQuery(externalParams.theme));
+  }, [externalParams.theme, setTheme]);
+
+  // ticket / userId / env 持久化（与 login 请求并行做，互不阻塞）
+  useEffect(() => {
+    persistExternalLoginParams({
+      ticket: externalParams.ticket,
+      userId: externalParams.userId,
+      env: externalParams.env,
+    });
+  }, [externalParams.ticket, externalParams.userId, externalParams.env]);
+
   useEffect(() => {
     let cancelled = false;
 
@@ -36,6 +71,12 @@ export default function LoginPage() {
       setStatus("loading");
       setErrorMessage("");
       try {
+        if (yUserId) {
+          await loginByYUserId(yUserId, toolToken || null);
+        } else if (toolToken) {
+          persistToolsToken(toolToken);
+        }
+
         const auth = await loginByUsername(resolvedUsername);
         if (cancelled) {
           return;
@@ -43,7 +84,7 @@ export default function LoginPage() {
         setStoredAuth(auth);
         persistSidebarEnabled(sidebarEnabled);
         setStatus("success");
-        router.replace("/page/workspace/chats/new");
+        router.replace(yUserId ? GENERAL_QA_ROUTE : "/page/workspace/chats/new");
       } catch (error) {
         if (cancelled) {
           return;
@@ -59,7 +100,7 @@ export default function LoginPage() {
     return () => {
       cancelled = true;
     };
-  }, [resolvedUsername, router, sidebarEnabled]);
+  }, [resolvedUsername, router, sidebarEnabled, yUserId, toolToken]);
 
   return (
     <div className="flex min-h-screen items-center justify-center bg-background px-6">

frontend-web/src/pages/PageRoutes.tsx

@@ -36,8 +36,16 @@ function PageLayout() {
           )
         )}
         <main
-          className={`flex-1 overflow-hidden transition-[padding] duration-300 ${
-            !sidebarEnabled ? "" : collapsed ? "pl-16" : "pl-64"
+          className={`flex-1 overflow-hidden ${
+            !sidebarEnabled
+              ? ""
+              : isDark
+                // 深色 sidebar：展开 118px（10 + 98 + 10 gap），收起 = 0 sidebar 完全消失，
+                // 只剩左下角浮动按钮（fixed，叠在 main 上不影响布局）。
+                // 不加 transition：transition + sidebar 立刻 unmount 不同步会抽搐
+                ? (collapsed ? "pl-0" : "pl-[118px]")
+                // 浅色仍保留过渡动画（pl-16 ↔ pl-64 平滑收展）
+                : `transition-[padding] duration-300 ${collapsed ? "pl-16" : "pl-64"}`
           }`}
         >
           <Routes>
@@ -50,6 +58,7 @@ function PageLayout() {
                   pageSidebarHidden={!sidebarEnabled}
                   headerHidden={!sidebarEnabled}
                   compactWorkspaceSidebar={sidebarEnabled}
+                  pageSidebarDark={isDark}
                 />
               }
             />

frontend-web/src/pages/WorkspaceRoutes.tsx

@@ -47,18 +47,27 @@ 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 = 118px
+      //   收起: sidebar 主体完全消失（连同其占据的宽度），workspace 内容铺到屏幕左边；
+      //         左下角浮动按钮是 fixed，叠在主内容上不影响 layout
+      // 与 PageRoutes.tsx 的 main pl-[118px] / pl-0 保持一致
+      ? (pageSidebarCollapsed ? "0rem" : "118px")
+      : pageSidebarCollapsed
+        ? "4rem"
+        : "16rem";
 
   return (
     <SidebarProvider
@@ -97,17 +106,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 (