diff --git a/frontend/src/components/AddTagPopover.tsx b/frontend/src/components/AddTagPopover.tsx
index 5de0deb..d92e2b7 100644
--- 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({
添加标签
{/* Available Tags */}
-
-
选择现有标签
-
- {availableTags.map((tag) => (
-
{
- onAddTag?.(tag.name);
- setShowPopover(false);
- }}
- >
-
- {tag.name}
-
- ))}
+ {availableTags?.length ? (
+
+
选择现有标签
+
+ {availableTags.map((tag) => (
+
{
+ onAddTag?.(tag.name);
+ setShowPopover(false);
+ }}
+ >
+
+ {tag.name}
+
+ ))}
+
-
+ ) : (
+
+ )}
{/* Create New Tag */}
diff --git a/frontend/src/components/DetailHeader.tsx b/frontend/src/components/DetailHeader.tsx
index b3c910e..788de0b 100644
--- a/frontend/src/components/DetailHeader.tsx
+++ b/frontend/src/components/DetailHeader.tsx
@@ -103,8 +103,8 @@ function DetailHeader
({
@@ -115,16 +115,7 @@ function DetailHeader({
}
return (
-
+
);
})}
diff --git a/frontend/src/pages/DataCleansing/Home/components/TaskList.tsx b/frontend/src/pages/DataCleansing/Home/components/TaskList.tsx
index fca97d2..ef446a2 100644
--- 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: ,
+ danger: true,
+ icon: ,
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() {
diff --git a/frontend/src/pages/DataCleansing/Home/components/TemplateList.tsx b/frontend/src/pages/DataCleansing/Home/components/TemplateList.tsx
index 46c07c4..ba26a18 100644
--- 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: ,
+ danger: true,
+ icon: ,
onClick: (template: CleansingTemplate) => deleteTemplate(template), // 可实现删除逻辑
},
];
diff --git a/frontend/src/pages/DataManagement/Create/CreateDataset.tsx b/frontend/src/pages/DataManagement/Create/CreateDataset.tsx
index 4042630..9121f83 100644
--- 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
index 0847372..f43ba7f 100644
--- 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
index 6a6442e..cc93a81 100644
--- 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,7 +154,7 @@ export default function DatasetDetail() {
// { key: "csv", label: "CSV 格式", icon: },
// { key: "coco", label: "COCO 格式", icon: },
// ],
- onMenuClick: handleExportFormat,
+ onClick: () => handleDownload(),
},
{
key: "refresh",
@@ -161,6 +162,15 @@ export default function DatasetDetail() {
icon: ,
onClick: handleRefresh,
},
+ {
+ key: "delete",
+ label: "删除",
+ danger: true,
+ icon: ,
+ onClick: () => {
+ console.log("delete dataset");
+ },
+ }
];
return (
diff --git a/frontend/src/pages/DataManagement/Home/DataManagement.tsx b/frontend/src/pages/DataManagement/Home/DataManagement.tsx
index 54ce569..76430ed 100644
--- 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,6 +26,7 @@ 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();
@@ -32,7 +34,7 @@ export default function DatasetManagementPage() {
const [viewMode, setViewMode] = useState<"card" | "list">("card");
const [editDatasetOpen, setEditDatasetOpen] = useState(false);
const [currentDataset, setCurrentDataset] = useState(null);
-
+ const [showUploadDialog, setShowUploadDialog] = useState(false);
const [statisticsData, setStatisticsData] = useState({
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: ,
onClick: (item: Dataset) => {
- console.log(item);
setCurrentDataset(item);
setEditDatasetOpen(true);
},
},
+ {
+ key: "import",
+ label: "导入",
+ icon: ,
+ onClick: (item: Dataset) => {
+ handleImportData(item);
+ },
+ },
{
key: "download",
label: "下载",
@@ -343,7 +357,19 @@ export default function DatasetManagementPage() {
setEditDatasetOpen(false)}
+ onClose={() => {
+ setCurrentDataset(null);
+ setEditDatasetOpen(false);
+ }}
+ onRefresh={fetchData}
+ />
+ {
+ setCurrentDataset(null);
+ setShowUploadDialog(false);
+ }}
onRefresh={fetchData}
/>
diff --git a/frontend/src/pages/DataManagement/dataset.api.ts b/frontend/src/pages/DataManagement/dataset.api.ts
index c800b82..59f8a0e 100644
--- 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
index ecee1cc..4ac6f63 100644
--- 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
= {
[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 },