feat: enhance dataset management features with improved tag handling, download functionality, and UI updates

chenghh-9609 · chenghh-9609 · commit a6d4b5160120 · 2025-10-23T10:33:42.000+08:00
diff --git a/frontend/src/components/AddTagPopover.tsx b/frontend/src/components/AddTagPopover.tsx
@@ -1,4 +1,4 @@
-import { Button, Input, Popover, theme, Tag } from "antd";
+import { Button, Input, Popover, theme, Tag, Empty } from "antd";
 import { PlusOutlined } from "@ant-design/icons";
 import { useEffect, useMemo, useState } from "react";
 
@@ -70,24 +70,28 @@ export default function AddTagPopover({
               添加标签
             </h4>
             {/* Available Tags */}
-            <div className="space-y-2">
-              <h5 className="text-sm">选择现有标签</h5>
-              <div className="max-h-32 overflow-y-auto space-y-1">
-                {availableTags.map((tag) => (
-                  <span
-                    key={tag.id}
-                    className="h-7 w-full justify-start text-xs cursor-pointer flex items-center px-2 rounded hover:bg-gray-100"
-                    onClick={() => {
-                      onAddTag?.(tag.name);
-                      setShowPopover(false);
-                    }}
-                  >
-                    <PlusOutlined className="w-3 h-3 mr-1" />
-                    {tag.name}
-                  </span>
-                ))}
+            {availableTags?.length ? (
+              <div className="space-y-2">
+                <h5 className="text-sm">选择现有标签</h5>
+                <div className="max-h-32 overflow-y-auto space-y-1">
+                  {availableTags.map((tag) => (
+                    <span
+                      key={tag.id}
+                      className="h-7 w-full justify-start text-xs cursor-pointer flex items-center px-2 rounded hover:bg-gray-100"
+                      onClick={() => {
+                        onAddTag?.(tag.name);
+                        setShowPopover(false);
+                      }}
+                    >
+                      <PlusOutlined className="w-3 h-3 mr-1" />
+                      {tag.name}
+                    </span>
+                  ))}
+                </div>
               </div>
-            </div>
+            ) : (
+              <Empty description="没有可用标签，请先创建标签。" />
+            )}
 
             {/* Create New Tag */}
             <div className="space-y-2 border-t border-gray-100 pt-3">
diff --git a/frontend/src/components/DetailHeader.tsx b/frontend/src/components/DetailHeader.tsx
@@ -103,8 +103,8 @@ function DetailHeader<T>({
                 <Dropdown
                   key={op.key}
                   menu={{
-                    items: op.items as ItemType[],
-                    onClick: op.onMenuClick,
+                    items: op?.items as ItemType[],
+                    onClick: op?.onMenuClick,
                   }}
                 >
                   <Tooltip title={op.label}>
@@ -115,16 +115,7 @@ function DetailHeader<T>({
             }
             return (
               <Tooltip key={op.key} title={op.label}>
-                <Button
-                  key={op.key}
-                  onClick={op.onClick}
-                  className={
-                    op.danger
-                      ? "text-red-600 border-red-200 bg-transparent"
-                      : ""
-                  }
-                  icon={op.icon}
-                />
+                <Button {...op} />
               </Tooltip>
             );
           })}
diff --git a/frontend/src/pages/DataCleansing/Home/components/TaskList.tsx b/frontend/src/pages/DataCleansing/Home/components/TaskList.tsx
@@ -65,7 +65,7 @@ export default function TaskList() {
     fetchData();
   };
 
-  const taskOperations = (record) => {
+  const taskOperations = (record: CleansingTask) => {
     const isRunning = record.status?.value === TaskStatus.RUNNING;
     const showStart = [
       TaskStatus.PENDING,
@@ -91,7 +91,8 @@ export default function TaskList() {
       {
         key: "delete",
         label: "删除",
-        icon: <DeleteOutlined style={{ color: "#f5222d" }} />,
+        danger: true,
+        icon: <DeleteOutlined />,
         onClick: deleteTask, // implement delete logic
       },
     ];
@@ -106,6 +107,13 @@ export default function TaskList() {
       width: 150,
       ellipsis: true,
     },
+    {
+      title: "任务ID",
+      dataIndex: "id",
+      key: "id",
+      width: 150,
+      ellipsis: true,
+    },
     {
       title: "源数据集",
       dataIndex: "srcDatasetId",
@@ -231,6 +239,7 @@ export default function TaskList() {
                 <Button
                   type="text"
                   icon={op.icon}
+                  danger={op?.danger}
                   onClick={() => op.onClick(record)}
                 />
               </Tooltip>
diff --git a/frontend/src/pages/DataCleansing/Home/components/TemplateList.tsx b/frontend/src/pages/DataCleansing/Home/components/TemplateList.tsx
@@ -31,7 +31,8 @@ export default function TemplateList() {
     {
       key: "delete",
       label: "删除模板",
-      icon: <DeleteOutlined style={{ color: "#f5222d" }} />,
+      danger: true,
+      icon: <DeleteOutlined />,
       onClick: (template: CleansingTemplate) => deleteTemplate(template), // 可实现删除逻辑
     },
   ];
diff --git a/frontend/src/pages/DataManagement/Create/CreateDataset.tsx b/frontend/src/pages/DataManagement/Create/CreateDataset.tsx
@@ -27,9 +27,9 @@ export default function DatasetCreate() {
       files: undefined,
     };
     try {
-      await createDatasetUsingPost(params);
+      const { data } = await createDatasetUsingPost(params);
       message.success(`数据集创建成功`);
-      navigate("/data/management");
+      navigate("/data/management/detail/" + data.id);
     } catch (error) {
       console.error(error);
       message.error("数据集创建失败，请重试");
diff --git a/frontend/src/pages/DataManagement/Create/EditDataset.tsx b/frontend/src/pages/DataManagement/Create/EditDataset.tsx
@@ -5,7 +5,7 @@ import {
 } from "../dataset.api";
 import { useEffect, useState } from "react";
 import { Dataset, DatasetType } from "../dataset.model";
-import { App, Button, Drawer, Form, Modal } from "antd";
+import { App, Button, Form, Modal } from "antd";
 
 export default function EditDataset({
   open,
@@ -16,7 +16,7 @@ export default function EditDataset({
   open: boolean;
   data: Dataset | null;
   onClose: () => void;
-  onRefresh?: () => void;
+  onRefresh?: (showMessage?: boolean) => void;
 }) {
   const [form] = Form.useForm();
   const { message } = App.useApp();
@@ -60,7 +60,7 @@ export default function EditDataset({
       await updateDatasetByIdUsingPut(data?.id, params);
       onClose();
       message.success("数据集更新成功");
-      onRefresh?.();
+      onRefresh?.(false);
     } catch (error) {
       console.error(error);
       message.error("数据集更新失败，请重试");
diff --git a/frontend/src/pages/DataManagement/Detail/DatasetDetail.tsx b/frontend/src/pages/DataManagement/Detail/DatasetDetail.tsx
@@ -5,6 +5,7 @@ import {
   DownloadOutlined,
   UploadOutlined,
   EditOutlined,
+  DeleteOutlined,
 } from "@ant-design/icons";
 import DetailHeader from "@/components/DetailHeader";
 import { mapDataset, datasetTypeMap } from "../dataset.const";
@@ -77,8 +78,8 @@ export default function DatasetDetail() {
     if (showMessage) message.success({ content: "数据刷新成功" });
   };
 
-  const handleExportFormat = async ({ type }) => {
-    await downloadFile(dataset.id, type, `${dataset.name}-${type}.zip`);
+  const handleDownload = async () => {
+    await downloadFile(dataset.id);
     message.success("文件下载成功");
   };
 
@@ -153,14 +154,23 @@ export default function DatasetDetail() {
       //   { key: "csv", label: "CSV 格式", icon: <FileTextOutlined /> },
       //   { key: "coco", label: "COCO 格式", icon: <FileImageOutlined /> },
       // ],
-      onMenuClick: handleExportFormat,
+      onClick: () => handleDownload(),
     },
     {
       key: "refresh",
       label: "刷新",
       icon: <ReloadOutlined />,
       onClick: handleRefresh,
     },
+    {
+      key: "delete",
+      label: "删除",
+      danger: true,
+      icon: <DeleteOutlined />,
+      onClick: () => {
+        console.log("delete dataset");
+      },
+    }
   ];
 
   return (
diff --git a/frontend/src/pages/DataManagement/Home/DataManagement.tsx b/frontend/src/pages/DataManagement/Home/DataManagement.tsx
@@ -4,6 +4,7 @@ import {
   EditOutlined,
   DeleteOutlined,
   PlusOutlined,
+  UploadOutlined,
 } from "@ant-design/icons";
 import TagManager from "@/components/TagManagement";
 import { Link, useNavigate } from "react-router";
@@ -25,14 +26,15 @@ import {
 } from "../dataset.api";
 import { formatBytes } from "@/utils/unit";
 import EditDataset from "../Create/EditDataset";
+import ImportConfiguration from "../Detail/components/ImportConfiguration";
 
 export default function DatasetManagementPage() {
   const navigate = useNavigate();
   const { message } = App.useApp();
   const [viewMode, setViewMode] = useState<"card" | "list">("card");
   const [editDatasetOpen, setEditDatasetOpen] = useState(false);
   const [currentDataset, setCurrentDataset] = useState<Dataset | null>(null);
-
+  const [showUploadDialog, setShowUploadDialog] = useState(false);
   const [statisticsData, setStatisticsData] = useState<any>({
     count: {},
     size: {},
@@ -131,6 +133,11 @@ export default function DatasetManagementPage() {
     message.success("数据删除成功");
   };
 
+  const handleImportData = (dataset: Dataset) => {
+    setCurrentDataset(dataset);
+    setShowUploadDialog(true);
+  };
+
   useEffect(() => {
     fetchStatistics();
   }, []);
@@ -141,11 +148,18 @@ export default function DatasetManagementPage() {
       label: "编辑",
       icon: <EditOutlined />,
       onClick: (item: Dataset) => {
-        console.log(item);
         setCurrentDataset(item);
         setEditDatasetOpen(true);
       },
     },
+    {
+      key: "import",
+      label: "导入",
+      icon: <UploadOutlined />,
+      onClick: (item: Dataset) => {
+        handleImportData(item);
+      },
+    },
     {
       key: "download",
       label: "下载",
@@ -343,7 +357,19 @@ export default function DatasetManagementPage() {
       <EditDataset
         open={editDatasetOpen}
         data={currentDataset}
-        onClose={() => setEditDatasetOpen(false)}
+        onClose={() => {
+          setCurrentDataset(null);
+          setEditDatasetOpen(false);
+        }}
+        onRefresh={fetchData}
+      />
+      <ImportConfiguration
+        data={currentDataset}
+        open={showUploadDialog}
+        onClose={() => {
+          setCurrentDataset(null);
+          setShowUploadDialog(false);
+        }}
         onRefresh={fetchData}
       />
     </div>
diff --git a/frontend/src/pages/DataManagement/dataset.api.ts b/frontend/src/pages/DataManagement/dataset.api.ts
@@ -61,16 +61,8 @@ export function uploadDatasetFileUsingPost(id: string | number, data: any) {
   return post(`/api/data-management/datasets/${id}/files`, data);
 }
 
-export function downloadFile(
-  id: string | number,
-  fileId: string | number,
-  filename?: string
-) {
-  return download(
-    `/api/data-management/datasets/${id}/files/download`,
-    null,
-    filename
-  );
+export function downloadFile(id: string | number) {
+  return download(`/api/data-management/datasets/${id}/files/download`);
 }
 
 // 删除数据集文件
diff --git a/frontend/src/pages/DataManagement/dataset.const.tsx b/frontend/src/pages/DataManagement/dataset.const.tsx
@@ -186,7 +186,7 @@ export const datasetStatusMap = {
 
 export const dataSourceMap: Record<string, { label: string; value: string }> = {
   [DataSource.UPLOAD]: { label: "本地上传", value: DataSource.UPLOAD },
-  [DataSource.COLLECTION]: { label: "本地归集 ", value: DataSource.COLLECTION },
+  // [DataSource.COLLECTION]: { label: "本地归集 ", value: DataSource.COLLECTION },
   // [DataSource.DATABASE]: { label: "数据库导入", value: DataSource.DATABASE },
   // [DataSource.NAS]: { label: "NAS导入", value: DataSource.NAS },
   // [DataSource.OBS]: { label: "OBS导入", value: DataSource.OBS },
