Merge branch 'dhk-1' of http://192.168.0.200/knowledge-base-bj/deerflow-server into dhk-1

解决 StrategyRoutes.tsx import 冲突：保留双方各自唯一的页面导入(AgentsPage/ChatPage/ChatsPage + AdminUserLeaderboardPage/SettingsPage)，去掉与下方重复的 13 个 import。 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-05 19:46:19 +08:00
commit f845805706
@@ -1,48 +1,47 @@
 import { Navigate, Route, Routes } from "react-router-dom";
 import { Toaster } from "sonner";

+import { SidebarProvider } from "@/components/ui/sidebar";
 import { getStoredAuth } from "@/core/auth";
 import { RouteBaseProvider } from "@/core/route-base";
-import { SidebarProvider } from "@/components/ui/sidebar";
-
 import GeneralQA from "@/strategy-components/components/chat-qa/GeneralQA";
-import { ChatRuntime } from "./WorkspaceRoutes";
-import AgentsPage from "./AgentsPage";
-import ChatsPage from "./ChatsPage";
-import ChatPage from "./ChatPage";
-import NewAgentPage from "./NewAgentPage";
+import FanganTyPage from "@/strategy-components/components/task-components/FanganTy";
+import SentimentAnalyzes from "@/strategy-components/components/task-components/SentimentAnalyzes";
+import TaskManagement from "@/strategy-components/components/task-components/TaskManagement";
+import TaskPgFrom from "@/strategy-components/components/task-components/TaskPgFrom";
+import TaskXkFrom from "@/strategy-components/components/task-components/TaskXkFrom";
+import TaskAnalyzes from "@/strategy-components/components/task-components/TaskAnalyzes";
+import XingdongTyPage from "@/strategy-components/components/task-components/XingdongTy";
+import XXTyPage from "@/strategy-components/components/task-components/XXTy";
+import { ActionAnalyzes } from "@/strategy-components/components/task-components/ActionAnalyzes";
+import KnowledgeBaseResourceManagement from "@/strategy-components/components/resource-management/KnowledgeBaseResourceManagement";
+import NetworkActorResourceManagement from "@/strategy-components/components/resource-management/NetworkActorResourceManagement";
+import RoundtablePlanningPage from "@/roundtable-planning/pages/RoundtablePlanningPage";
+import "@/roundtable-planning/styles/roundtable-planning.css";
 import AgentChatPage from "./AgentChatPage";
-import SkillsPage from "./SkillsPage";
-import SkillEvolutionPage from "./SkillEvolutionPage";
-import MemoryPage from "./MemoryPage";
-import ScheduledTasksPage from "./ScheduledTasksPage";
-import ScheduledTaskRunDetailPage from "./ScheduledTaskRunDetailPage";
-import RecommendedQuestionsPage from "./RecommendedQuestionsPage";
-import PromptPrefixSettingsPage from "./PromptPrefixSettingsPage";
-import PrivateSquareSettingsPage from "./PrivateSquareSettingsPage";
-import LlmMetricsPage from "./LlmMetricsPage";
-import UsersPage from "./UsersPage";
-import AdminScheduledTasksPage from "./AdminScheduledTasksPage";
-import AdminUserActivityPage from "./AdminUserActivityPage";
+import AgentsPage from "./AgentsPage";
+import ChatPage from "./ChatPage";
+import ChatsPage from "./ChatsPage";
 import AdminUserLeaderboardPage from "./AdminUserLeaderboardPage";
 import AdminUserLeaderboardSettingsPage from "./AdminUserLeaderboardSettingsPage";
-import TagsPage from "./TagsPage";
 import LightAppNewNotePage from "./LightAppNewNotePage";
 import LightAppNoteListPage from "./LightAppNoteListPage";
 import LightAppNoteQAPage from "./LightAppNoteQAPage";
-import TaskXkFrom from "@/strategy-components/components/task-components/TaskXkFrom";
-import TaskManagement from "@/strategy-components/components/task-components/TaskManagement";
-import TaskPgFrom from "@/strategy-components/components/task-components/TaskPgFrom";
-import FanganTyPage from "@/strategy-components/components/task-components/FanganTy";
-import XingdongTyPage from "@/strategy-components/components/task-components/XingdongTy";
-import XXTyPage from "@/strategy-components/components/task-components/XXTy";
-import SentimentAnalyzes from "@/strategy-components/components/task-components/SentimentAnalyzes";
-import TaskAnalyzes from "@/strategy-components/components/task-components/TaskAnalyzes";
-import { ActionAnalyzes } from "@/strategy-components/components/task-components/ActionAnalyzes";
-import NetworkActorResourceManagement from "@/strategy-components/components/resource-management/NetworkActorResourceManagement";
-import KnowledgeBaseResourceManagement from "@/strategy-components/components/resource-management/KnowledgeBaseResourceManagement";
-import RoundtablePlanningPage from "@/roundtable-planning/pages/RoundtablePlanningPage";
-import "@/roundtable-planning/styles/roundtable-planning.css";
+import MemoryPage from "./MemoryPage";
+import NewAgentPage from "./NewAgentPage";
+import PromptPrefixSettingsPage from "./PromptPrefixSettingsPage";
+import PrivateSquareSettingsPage from "./PrivateSquareSettingsPage";
+import RecommendedQuestionsPage from "./RecommendedQuestionsPage";
+import ScheduledTaskRunDetailPage from "./ScheduledTaskRunDetailPage";
+import ScheduledTasksPage from "./ScheduledTasksPage";
+import SkillEvolutionPage from "./SkillEvolutionPage";
+import SkillsPage from "./SkillsPage";
+import TagsPage from "./TagsPage";
+import UsersPage from "./UsersPage";
+import LlmMetricsPage from "./LlmMetricsPage";
+import AdminScheduledTasksPage from "./AdminScheduledTasksPage";
+import AdminUserActivityPage from "./AdminUserActivityPage";
+import { ChatRuntime } from "./WorkspaceRoutes";

 export default function StrategyRoutes() {
  return (
@@ -52,14 +51,13 @@ export default function StrategyRoutes() {
          <Routes>
            <Route index element={<Navigate to="qa/general" replace />} />

-            {/* 问答中心 */}
            <Route path="qa/general" element={<GeneralQA />} />
            <Route
              path="qa/expert-qa"
              element={
                <GeneralQA
-                  chatHeadTitle="专家问答"
-                  chatDesign="支持单轮RAG、多轮RAG、深度检索及结果对比"
+                  chatHeadTitle="æ¶“æ’³î†é—‚î†¾ç“Ÿ"
+                  chatDesign="é€îˆ›å¯”é—æ›¡ç–†RAGéŠ†ä½¸î˜¿æžç”ŠAGéŠ†ä½¹ç¹æ´ï¸½î—…ç»±ãˆ å¼·ç¼æ’´ç‰ç€µè§„ç˜®"
                />
              }
            />
@@ -71,10 +69,9 @@ export default function StrategyRoutes() {
                </ChatRuntime>
              }
            />
-            {/* 任务管理 */}
+
            <Route path="task-management" element={<TaskManagement />}>
              <Route index element={<Navigate to="xk-task-jc" replace />} />
-              {/* XK任务 */}
              <Route
                path="xk-task-jc"
                element={<TaskXkFrom gopath="#/pageIndie/pageHome/pageSwrw" />}
@@ -83,7 +80,6 @@ export default function StrategyRoutes() {
                path="xk-task-dispatch"
                element={<TaskXkFrom gopath="#/pageIndie/pageJczl" />}
              />
-              {/* pg中任务 */}
              <Route
                path="effect-task-pg"
                element={<TaskPgFrom gopath="task" />}
@@ -96,12 +92,11 @@ export default function StrategyRoutes() {
                path="effect-info-pg"
                element={<TaskPgFrom gopath="info" />}
              />
-              {/* COH中任务 */}
              <Route
                path="plan-task-sentiment"
                element={
                  <SentimentAnalyzes
-                    title="3QFX"
+                    title="三情分析"
                    category="规划任务"
                    subCategory="规划任务"
                  />
@@ -111,9 +106,9 @@ export default function StrategyRoutes() {
                path="plan-task/plan-task-fx"
                element={
                  <TaskAnalyzes
-                    title="任务FX"
-                    category="规划任务"
-                    subCategory="规划任务"
+                    title="æµ è¯²å§ŸFX"
+                    category="ç‘™å‹«åžæµ è¯²å§Ÿ"
+                    subCategory="ç‘™å‹«åžæµ è¯²å§Ÿ"
                  />
                }
              />
@@ -122,17 +117,16 @@ export default function StrategyRoutes() {
                element={
                  <ActionAnalyzes
                    title="xdfx"
-                    category="规划任务"
-                    subCategory="规划任务"
+                    category="ç‘™å‹«åžæµ è¯²å§Ÿ"
+                    subCategory="ç‘™å‹«åžæµ è¯²å§Ÿ"
                  />
                }
              />
-              {/* MNTY任务 */}
              <Route path="mnty-task-mechanism" element={<XingdongTyPage />} />
              <Route path="mnty-task-plan" element={<FanganTyPage />} />
              <Route path="mnty-task-zsty" element={<XXTyPage />} />
            </Route>
-            {/* 资源管理 */}
+
            <Route
              path="resource-management/resource-network-actor"
              element={<NetworkActorResourceManagement />}
@@ -143,16 +137,13 @@ export default function StrategyRoutes() {
            />
            <Route
              path="resource-management/resource-evaluation-index"
-              element={
-                <TaskXkFrom gopath="#/pageIndie/pageZyjc/pageZyzl" />
-              }
+              element={<TaskXkFrom gopath="#/pageIndie/pageZyjc/pageZyzl" />}
            />
-            {/* 轻应用 */}
+
            <Route path="light-app/new-note" element={<LightAppNewNotePage />} />
            <Route path="light-app/notes" element={<LightAppNoteListPage />} />
            <Route path="light-app/note-qa" element={<LightAppNoteQAPage />} />

-            {/* 对话 */}
            <Route path="chats" element={<ChatsPage />} />
            <Route
              path="chats/:thread_id"
@@ -163,7 +154,6 @@ export default function StrategyRoutes() {
              }
            />

-            {/* 智能体管理 */}
            <Route path="agents" element={<AgentsPage />} />
            <Route path="agents/new" element={<NewAgentPage />} />
            <Route
@@ -179,12 +169,10 @@ export default function StrategyRoutes() {
              }
            />

-            {/* 技能 / 记忆 */}
            <Route path="skills" element={<SkillsPage />} />
            <Route path="skills/evolution" element={<SkillEvolutionPage />} />
            <Route path="memory" element={<MemoryPage />} />

-            {/* 定时任务 */}
            <Route
              path="scheduled"
              element={<Navigate to="/page/strategy/scheduled/tasks" replace />}
@@ -195,7 +183,6 @@ export default function StrategyRoutes() {
              element={<ScheduledTaskRunDetailPage />}
            />

-            {/* 设置 / 管理 — 权限与 workspace 侧一致，非 admin 重定向到 chats/new */}
            <Route
              path="settings/recommended-questions"
              element={