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

2026-06-01 10:49:53 +08:00
commit 22b93e32eb
@@ -19,6 +19,13 @@ import {
 } from "@/components/ai-elements/prompt-input";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "@/components/ui/select";
 import { Textarea } from "@/components/ui/textarea";
 import { ArtifactsProvider } from "@/components/workspace/artifacts";
 import {
@@ -115,10 +122,34 @@ export default function NewAgentPage() {
      return;
    }
    const first = models[0]!.name;
-    setModelInput((prev) => prev || first);
-    setChatModelInput((prev) => prev || first);
+    setModelInput((prev) =>
+      prev && models.some((m) => m.name === prev) ? prev : first,
+    );
+    setChatModelInput((prev) =>
+      prev && models.some((m) => m.name === prev) ? prev : first,
+    );
  }, [models]);

+  const resolvedModelInput = useMemo(() => {
+    if (models.length === 0) {
+      return "";
+    }
+    if (modelInput && models.some((m) => m.name === modelInput)) {
+      return modelInput;
+    }
+    return models[0]!.name;
+  }, [modelInput, models]);
+
+  const resolvedChatModelInput = useMemo(() => {
+    if (models.length === 0) {
+      return "";
+    }
+    if (chatModelInput && models.some((m) => m.name === chatModelInput)) {
+      return chatModelInput;
+    }
+    return models[0]!.name;
+  }, [chatModelInput, models]);
+
  const [thread, sendMessage] = useThreadStream({
    threadId,
    assistantId: agentId || undefined,
@@ -347,23 +378,42 @@ export default function NewAgentPage() {
                  <span className="text-muted-foreground text-xs">
                    当前对话模型
                  </span>
-                  <select
-                    value={chatModelInput}
-                    onChange={(event) =>
-                      setChatModelInput(event.currentTarget.value)
-                    }
-                    disabled={isModelsLoading || thread.isLoading}
-                    className="border-input bg-background h-7 min-w-[10rem] rounded-md border px-2 text-xs shadow-xs outline-none"
-                  >
-                    <option value="" disabled>
-                      选择模型
-                    </option>
-                    {models.map((model) => (
-                      <option key={model.name} value={model.name}>
-                        {model.display_name || model.name}
-                      </option>
-                    ))}
-                  </select>
+                  {isModelsLoading || models.length === 0 ? (
+                    <div className="border-input bg-background text-muted-foreground flex h-7 min-w-[10rem] items-center rounded-md border px-2 text-xs shadow-xs dark:border-[#1B477E] dark:bg-[#022248]">
+                      {isModelsLoading ? "加载中…" : "暂无模型"}
+                    </div>
+                  ) : (
+                    <Select
+                      value={resolvedChatModelInput}
+                      onValueChange={setChatModelInput}
+                      disabled={thread.isLoading}
+                    >
+                      <SelectTrigger
+                        className={cn(
+                          "border-input bg-background h-7 min-w-[10rem] px-2 text-xs shadow-xs outline-none",
+                          "dark:border-[#1B477E] dark:bg-[#022248] dark:text-[#AACEFF] dark:hover:bg-[#022248]",
+                          "data-[placeholder]:text-muted-foreground",
+                          "[&_svg]:dark:text-[#AACEE2]",
+                        )}
+                      >
+                        <SelectValue placeholder="选择模型" />
+                      </SelectTrigger>
+                      <SelectContent
+                        position="popper"
+                        className="w-[var(--radix-select-trigger-width)] dark:border-[#1B477E] dark:bg-[#022248]"
+                      >
+                        {models.map((model) => (
+                          <SelectItem
+                            key={model.name}
+                            value={model.name}
+                            className="dark:text-[#AACEFF] dark:data-[highlighted]:bg-[#0062D9] dark:data-[highlighted]:text-white"
+                          >
+                            {model.display_name || model.name}
+                          </SelectItem>
+                        ))}
+                      </SelectContent>
+                    </Select>
+                  )}
                </div>
                <PromptInput
                  onSubmit={({ text }) => void handleChatSubmit(text)}
@@ -415,21 +465,41 @@ export default function NewAgentPage() {

                <div className="space-y-2">
                  <label className="text-sm font-medium">模型</label>
-                  <select
-                    value={modelInput}
-                    onChange={(event) => setModelInput(event.currentTarget.value)}
-                    disabled={isModelsLoading}
-                    className="border-input bg-background h-9 w-full rounded-md border px-3 text-sm shadow-xs outline-none"
-                  >
-                    <option value="" disabled>
-                      选择模型
-                    </option>
-                    {models.map((model) => (
-                      <option key={model.name} value={model.name}>
-                        {model.display_name || model.name}
-                      </option>
-                    ))}
-                  </select>
+                  {isModelsLoading || models.length === 0 ? (
+                    <div className="border-input bg-background text-muted-foreground flex h-9 w-full items-center rounded-md border px-3 text-sm shadow-xs dark:border-[#1B477E] dark:bg-[#022248]">
+                      {isModelsLoading ? "加载模型…" : "暂无可用模型"}
+                    </div>
+                  ) : (
+                    <Select
+                      value={resolvedModelInput}
+                      onValueChange={setModelInput}
+                    >
+                      <SelectTrigger
+                        className={cn(
+                          "border-input bg-background h-9 w-full shadow-xs outline-none",
+                          "dark:border-[#1B477E] dark:bg-[#022248] dark:text-[#AACEFF] dark:hover:bg-[#022248]",
+                          "data-[placeholder]:text-muted-foreground",
+                          "[&_svg]:dark:text-[#AACEE2]",
+                        )}
+                      >
+                        <SelectValue placeholder="选择模型" />
+                      </SelectTrigger>
+                      <SelectContent
+                        position="popper"
+                        className="w-[var(--radix-select-trigger-width)] dark:border-[#1B477E] dark:bg-[#022248]"
+                      >
+                        {models.map((model) => (
+                          <SelectItem
+                            key={model.name}
+                            value={model.name}
+                            className="dark:text-[#AACEFF] dark:data-[highlighted]:bg-[#0062D9] dark:data-[highlighted]:text-white"
+                          >
+                            {model.display_name || model.name}
+                          </SelectItem>
+                        ))}
+                      </SelectContent>
+                    </Select>
+                  )}
                  <p className="text-muted-foreground text-xs">
                    该智能体被使用时调用的模型。
                  </p>
@@ -463,7 +533,7 @@ export default function NewAgentPage() {
                      />
                    </div>
                  )}
-                  <div className="max-h-[240px] overflow-y-auto rounded-md border p-2">
+                  <div className="max-h-[240px] overflow-y-auto rounded-md border p-2 dark:border-[#1B477E] dark:bg-[#022248]">
                    {isSkillsLoading ? (
                      <p className="text-muted-foreground text-sm">技能加载中...</p>
                    ) : enabledSkills.length === 0 ? (
@@ -5,7 +5,7 @@ import { getStoredAuth } from "@/core/auth";
 import { RouteBaseProvider } from "@/core/route-base";
 import { SidebarProvider } from "@/components/ui/sidebar";

-import GeneralQA from "@/strategy-components/components/qa/GeneralQA";
+import GeneralQA from "@/strategy-components/components/chat-qa/GeneralQA";
 import { ChatRuntime } from "./WorkspaceRoutes";
 import AgentsPage from "./AgentsPage";
 import ChatsPage from "./ChatsPage";
@@ -30,6 +30,15 @@ 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";

 export default function StrategyRoutes() {
  return (
@@ -41,26 +50,91 @@ export default function StrategyRoutes() {

            {/* 问答中心 */}
            <Route path="qa/general" element={<GeneralQA />} />
+            <Route
+              path="qa/expert-qa"
+              element={
+                <GeneralQA
+                  chatHeadTitle="专家问答"
+                  chatDesign="支持单轮RAG、多轮RAG、深度检索及结果对比"
+                />
+              }
+            />
            {/* 任务管理 */}
            <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" />}
+              />
+              <Route
+                path="xk-task-dispatch"
+                element={<TaskXkFrom gopath="#/pageIndie/pageJczl" />}
+              />
+              {/* pg中任务 */}
+              <Route
+                path="effect-task-pg"
+                element={<TaskPgFrom gopath="task" />}
+              />
+              <Route
+                path="effect-action-pg"
+                element={<TaskPgFrom gopath="xd" />}
+              />
+              <Route
+                path="effect-info-pg"
+                element={<TaskPgFrom gopath="info" />}
+              />
+              {/* COH中任务 */}
+              <Route
+                path="plan-task-sentiment"
                element={
-                  <TaskXkFrom
-                    gopath={'#/pageIndie/pageHome/pageSwrw'}
+                  <SentimentAnalyzes
+                    title="3QFX"
+                    category="规划任务"
+                    subCategory="规划任务"
                  />
                }
              />
              <Route
-                path="xk-task-dispatch"
+                path="plan-task/plan-task-fx"
                element={
-                  <TaskXkFrom
-                    gopath={'#/pageIndie/pageJczl'}
+                  <TaskAnalyzes
+                    title="任务FX"
+                    category="规划任务"
+                    subCategory="规划任务"
                  />
                }
              />
+              <Route
+                path="plan-task/plan-task-action"
+                element={
+                  <ActionAnalyzes
+                    title="xdfx"
+                    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 />}
+            />
+            <Route
+              path="resource-management/resource-knowledge-base"
+              element={<KnowledgeBaseResourceManagement />}
+            />
+            <Route
+              path="resource-management/resource-evaluation-index"
+              element={
+                <TaskXkFrom gopath="#/pageIndie/pageZyjc/pageZyzl" />
+              }
+            />
            {/* 轻应用 */}
            <Route path="light-app/new-note" element={<LightAppNewNotePage />} />
            <Route path="light-app/notes" element={<LightAppNoteListPage />} />