Merge remote-tracking branch 'origin/develop_930' into develop_930

hhhhsc701 · hhhhsc701 · commit ee4e2aca9aa4 · 2025-10-21T17:34:05.000+08:00
diff --git a/frontend/src/components/AddTagPopover.tsx b/frontend/src/components/AddTagPopover.tsx
@@ -25,7 +25,6 @@ export default function AddTagPopover({
   const [showPopover, setShowPopover] = useState(false);
 
   const [newTag, setNewTag] = useState("");
-  const [detailNewTag, setDetailNewTag] = useState("");
   const [allTags, setAllTags] = useState<Tag[]>([]);
 
   const tagsSet = useMemo(() => new Set(tags.map((tag) => tag.id)), [tags]);
@@ -46,8 +45,6 @@ export default function AddTagPopover({
 
   const handleCreateAndAddTag = () => {
     if (newTag.trim()) {
-      console.log(newTag.trim());
-      
       onCreateAndTag?.(newTag.trim());
       setNewTag("");
     }
@@ -98,13 +95,13 @@ export default function AddTagPopover({
               <div className="flex gap-2">
                 <Input
                   placeholder="输入新标签名称..."
-                  value={detailNewTag}
-                  onChange={(e) => setDetailNewTag(e.target.value)}
+                  value={newTag}
+                  onChange={(e) => setNewTag(e.target.value)}
                   className="h-8 text-sm"
                 />
                 <Button
                   onClick={() => handleCreateAndAddTag()}
-                  disabled={!detailNewTag.trim()}
+                  disabled={!newTag.trim()}
                   type="primary"
                 >
                   添加
diff --git a/frontend/src/components/DevelopmentInProgress.tsx b/frontend/src/components/DevelopmentInProgress.tsx
@@ -5,7 +5,10 @@ const DevelopmentInProgress = ({ showHome = true }) => {
     <div className="mt-40 flex flex-col items-center justify-center">
       <div className="hero-icon">🚧</div>
       <h1 className="text-2xl font-bold">功能开发中</h1>
-      <p className="mt-4">我们正在全力开发新功能，为您带来更好的体验</p>
+      <p className="mt-4">
+        为了给您带来更好的体验，我们计划<b>2025.10.30</b>
+        开放此功能
+      </p>
       {showHome && (
         <Button
           type="primary"
diff --git a/frontend/src/hooks/useFetchData.ts b/frontend/src/hooks/useFetchData.ts
@@ -79,9 +79,8 @@ export default function useFetchData<T>(
         result = data?.content.map(mapDataFunc) ?? [];
       }
       setTableData(result);
-      console.log(data, result.map(mapDataFunc));
     } catch (error) {
-      console.log(error)
+      console.error(error)
       message.error("数据获取失败，请稍后重试");
     } finally {
       Loading.hide();
diff --git a/frontend/src/hooks/useSearchParams.tsx b/frontend/src/hooks/useSearchParams.tsx
@@ -0,0 +1,18 @@
+import { useMemo } from "react";
+import { useLocation } from "react-router";
+
+interface AnyObject {
+  [key: string]: any;
+}
+
+export function useSearchParams(): AnyObject {
+  const { search } = useLocation();
+  return useMemo(() => {
+    const urlParams = new URLSearchParams(search);
+    const params: AnyObject = {};
+    for (const [key, value] of urlParams.entries()) {
+      params[key] = value;
+    }
+    return params;
+  }, [search]);
+}
diff --git a/frontend/src/pages/DataAnnotation/Home/DataAnnotation.tsx b/frontend/src/pages/DataAnnotation/Home/DataAnnotation.tsx
@@ -130,14 +130,10 @@ export default function DataAnnotation() {
   ];
 
   return (
-    <div className="space-y-4">
+    <div className="flex flex-col h-full gap-4">
       {/* Header */}
       <div className="flex items-center justify-between">
-        <div className="flex items-center space-x-4">
-          <div className="flex items-center space-x-2">
-            <span className="text-xl font-bold">数据标注</span>
-          </div>
-        </div>
+        <h1 className="text-xl font-bold">数据标注</h1>
         <Button
           type="primary"
           icon={<PlusOutlined />}
@@ -149,7 +145,6 @@ export default function DataAnnotation() {
 
       {/* Filters Toolbar */}
       <SearchControls
-        className="mb-4"
         searchTerm={searchParams.keyword}
         onSearchChange={(keyword) =>
           setSearchParams({ ...searchParams, keyword })
diff --git a/frontend/src/pages/DataCleansing/Create/CreateTask.tsx b/frontend/src/pages/DataCleansing/Create/CreateTask.tsx
@@ -40,7 +40,7 @@ export default function CleansingTaskCreate() {
         },
       })),
     };
-    navigate("/data/cleansing");
+    navigate("/data/cleansing?view=task");
     await createCleaningTaskUsingPost(task);
     message.success("任务已创建");
   };
diff --git a/frontend/src/pages/DataCleansing/Create/CreateTempate.tsx b/frontend/src/pages/DataCleansing/Create/CreateTempate.tsx
@@ -28,7 +28,7 @@ export default function CleansingTemplateCreate() {
     };
 
     await createCleaningTemplateUsingPost(template);
-    navigate("/data/cleansing");
+    navigate("/data/cleansing?view=template");
   };
 
   const {
diff --git a/frontend/src/pages/DataCleansing/Home/DataCleansing.tsx b/frontend/src/pages/DataCleansing/Home/DataCleansing.tsx
@@ -1,38 +1,42 @@
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import { Tabs, Button } from "antd";
 import { PlusOutlined } from "@ant-design/icons";
 import { useNavigate } from "react-router";
 import TaskList from "./components/TaskList";
 import TemplateList from "./components/TemplateList";
 import ProcessFlowDiagram from "./components/ProcessFlowDiagram";
+import { useSearchParams } from "@/hooks/useSearchParams";
 
 export default function DataProcessingPage() {
   const navigate = useNavigate();
-  const [currentView, setCurrentView] = useState<"tasks" | "templates">(
-    "tasks"
-  );
+  const urlParams = useSearchParams();
+  const [currentView, setCurrentView] = useState<"task" | "template">("task");
+
+  useEffect(() => {
+    if (urlParams.view) {
+      setCurrentView(urlParams.view);
+    }
+  }, [urlParams]);
 
   return (
-    <div className="h-full flex flex-col">
-      <div style={{ marginBottom: 24 }}>
-        {/* Header */}
-        <div className="flex justify-between items-center">
-          <h1 className="text-xl font-bold">数据清洗</h1>
-          <div className="flex gap-2">
-            <Button
-              icon={<PlusOutlined />}
-              onClick={() => navigate("/data/cleansing/create-template")}
-            >
-              创建清洗模板
-            </Button>
-            <Button
-              type="primary"
-              icon={<PlusOutlined />}
-              onClick={() => navigate("/data/cleansing/create-task")}
-            >
-              创建清洗任务
-            </Button>
-          </div>
+    <div className="h-full flex flex-col gap-4">
+      {/* Header */}
+      <div className="flex justify-between items-center">
+        <h1 className="text-xl font-bold">数据清洗</h1>
+        <div className="flex gap-2">
+          <Button
+            icon={<PlusOutlined />}
+            onClick={() => navigate("/data/cleansing/create-template")}
+          >
+            创建清洗模板
+          </Button>
+          <Button
+            type="primary"
+            icon={<PlusOutlined />}
+            onClick={() => navigate("/data/cleansing/create-task")}
+          >
+            创建清洗任务
+          </Button>
         </div>
       </div>
       <ProcessFlowDiagram />
@@ -41,17 +45,17 @@ export default function DataProcessingPage() {
         onChange={(key) => setCurrentView(key as any)}
         items={[
           {
-            key: "tasks",
+            key: "task",
             label: "任务列表",
           },
           {
-            key: "templates",
+            key: "template",
             label: "模板管理",
           },
         ]}
       />
-      {currentView === "tasks" && <TaskList />}
-      {currentView === "templates" && <TemplateList />}
+      {currentView === "task" && <TaskList />}
+      {currentView === "template" && <TemplateList />}
     </div>
   );
 }
diff --git a/frontend/src/pages/DataCleansing/Home/components/TaskList.tsx b/frontend/src/pages/DataCleansing/Home/components/TaskList.tsx
@@ -75,22 +75,14 @@ export default function TaskList() {
     const pauseBtn = {
       key: "pause",
       label: "暂停",
-      icon: isRunning ? (
-        <PauseCircleOutlined style={{ color: "#faad14" }} />
-      ) : (
-        <PlayCircleOutlined color="#52c41a" />
-      ),
+      icon: isRunning ? <PauseCircleOutlined /> : <PlayCircleOutlined />,
       onClick: pauseTask, // implement pause/play logic
     };
 
     const startBtn = {
       key: "start",
       label: "启动",
-      icon: isRunning ? (
-        <PauseCircleOutlined style={{ color: "#faad14" }} />
-      ) : (
-        <PlayCircleOutlined style={{ color: "#52c41a" }} />
-      ),
+      icon: isRunning ? <PauseCircleOutlined /> : <PlayCircleOutlined />,
       onClick: startTask, // implement pause/play logic
     };
     return [
@@ -229,7 +221,6 @@ export default function TaskList() {
     <>
       {/* Search and Filters */}
       <SearchControls
-        className="mb-4"
         searchTerm={searchParams.keyword}
         onSearchChange={(keyword) =>
           setSearchParams({ ...searchParams, keyword })
diff --git a/frontend/src/pages/DataCleansing/Home/components/TemplateList.tsx b/frontend/src/pages/DataCleansing/Home/components/TemplateList.tsx
@@ -17,7 +17,7 @@ export default function TemplateList() {
     mapTemplate
   );
 
-  const DeleteTemplate = async (template: CleansingTemplate) => {
+  const deleteTemplate = async (template: CleansingTemplate) => {
     if (!template.id) {
       return;
     }
@@ -32,7 +32,7 @@ export default function TemplateList() {
       key: "delete",
       label: "删除模板",
       icon: <DeleteOutlined style={{ color: "#f5222d" }} />,
-      onClick: (template: CleansingTemplate) => DeleteTemplate(template), // 可实现删除逻辑
+      onClick: (template: CleansingTemplate) => deleteTemplate(template), // 可实现删除逻辑
     },
   ];
 
diff --git a/frontend/src/pages/DataManagement/Detail/DatasetDetail.tsx b/frontend/src/pages/DataManagement/Detail/DatasetDetail.tsx
@@ -71,10 +71,10 @@ export default function DatasetDetail() {
     filesOperation.fetchFiles();
   }, []);
 
-  const handleRefresh = async () => {
+  const handleRefresh = async (showMessage = true) => {
     fetchDataset();
     filesOperation.fetchFiles();
-    message.success({ content: "数据刷新成功" });
+    if (showMessage) message.success({ content: "数据刷新成功" });
   };
 
   const handleExportFormat = async ({ type }) => {
@@ -86,10 +86,13 @@ export default function DatasetDetail() {
     const refreshDataset = () => {
       fetchDataset();
     };
-    window.addEventListener("update:dataset", handleRefresh);
-    window.addEventListener("update:dataset-status", refreshDataset);
+    const refreshData = () => {
+      handleRefresh(false);
+    };
+    window.addEventListener("update:dataset", refreshData);
+    window.addEventListener("update:dataset-status", () => refreshDataset());
     return () => {
-      window.removeEventListener("update:dataset", handleRefresh);
+      window.removeEventListener("update:dataset", refreshData);
       window.removeEventListener("update:dataset-status", refreshDataset);
     };
   }, []);
@@ -181,12 +184,15 @@ export default function DatasetDetail() {
           onCreateAndTag: async (tagName) => {
             const res = await createDatasetTagUsingPost({ name: tagName });
             if (res.data) {
+              await updateDatasetByIdUsingPut(dataset.id, {
+                tags: [...dataset.tags.map((tag) => tag.name), res.data.name],
+              });
               handleRefresh();
             }
           },
           onAddTag: async (tag) => {
             const res = await updateDatasetByIdUsingPut(dataset.id, {
-              tags: [tag],
+              tags: [...dataset.tags.map((tag) => tag.name), tag],
             });
             if (res.data) {
               handleRefresh();
diff --git a/frontend/src/pages/DataManagement/Detail/components/ImportConfiguration.tsx b/frontend/src/pages/DataManagement/Detail/components/ImportConfiguration.tsx
@@ -4,6 +4,7 @@ import { Dataset, DataSource } from "../../dataset.model";
 import { useEffect, useState } from "react";
 import { queryTasksUsingGet } from "@/pages/DataCollection/collection.apis";
 import { useImportFile } from "../../hooks";
+import { updateDatasetByIdUsingPut } from "../../dataset.api";
 
 export default function ImportConfiguration({
   data,
@@ -16,6 +17,7 @@ export default function ImportConfiguration({
   onClose: () => void;
   onRefresh?: () => void;
 }) {
+  const [form] = Form.useForm();
   const [collectionOptions, setCollectionOptions] = useState([]);
   const [importConfig, setImportConfig] = useState<any>({
     source: DataSource.UPLOAD,
@@ -36,20 +38,27 @@ export default function ImportConfiguration({
     }
   };
 
+  const resetState = () => {
+    form.resetFields();
+    setImportConfig({ source: DataSource.UPLOAD });
+  };
+
   const handleImportData = async () => {
     if (importConfig.source === DataSource.UPLOAD) {
       await handleUpload(data);
-    } else {
-      // 其他导入方式的处理逻辑
-      console.log("Importing data from source:", importConfig.source);
+    } else if (importConfig.source === DataSource.COLLECTION) {
+      await updateDatasetByIdUsingPut(data?.id!, {
+        ...importConfig,
+      });
     }
+    resetState();
     onRefresh?.();
     onClose();
   };
 
   useEffect(() => {
-    fetchCollectionTasks();
-  }, []);
+    if (open) fetchCollectionTasks();
+  }, [open]);
 
   return (
     <Modal
@@ -68,6 +77,7 @@ export default function ImportConfiguration({
       }
     >
       <Form
+        form={form}
         layout="vertical"
         initialValues={importConfig || {}}
         onValuesChange={(_, allValues) => setImportConfig(allValues)}
@@ -84,7 +94,7 @@ export default function ImportConfiguration({
           />
         </Form.Item>
         {importConfig?.source === DataSource.COLLECTION && (
-          <Form.Item name="collectionId" label="归集任务" required>
+          <Form.Item name="dataSource" label="归集任务" required>
             <Select placeholder="请选择归集任务" options={collectionOptions} />
           </Form.Item>
         )}
diff --git a/frontend/src/pages/DataManagement/Home/DataManagement.tsx b/frontend/src/pages/DataManagement/Home/DataManagement.tsx
diff --git a/frontend/src/pages/DataManagement/dataset.const.tsx b/frontend/src/pages/DataManagement/dataset.const.tsx
diff --git a/frontend/src/pages/DataManagement/dataset.model.ts b/frontend/src/pages/DataManagement/dataset.model.ts
diff --git a/frontend/src/pages/OperatorMarket/Home/OperatorMarket.tsx b/frontend/src/pages/OperatorMarket/Home/OperatorMarket.tsx
