Skip to content

Commit ce8b08e

Browse files
committed
frontend: 修改清洗状态和页面布局
1 parent 4377956 commit ce8b08e

File tree

9 files changed

+22
-17
lines changed

9 files changed

+22
-17
lines changed

frontend/src/components/CardView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ function CardView<T extends BaseCardDataType>(props: CardViewProps<T>) {
170170

171171
return (
172172
<div className="flex-1 flex flex-col overflow-auto">
173-
<div className="flex-1 overflow-auto grid md:grid-cols-1 lg:grid-cols-2 xl:grid-cols-3 gap-4">
173+
<div className="flex-1 overflow-auto grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 2xl:grid-cols-4 gap-4">
174174
{data.map((item) => (
175175
<div
176176
key={item.id}

frontend/src/mock/mock-seed/data-cleansing.cjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ function cleaningTaskItem() {
5151
id: Mock.Random.guid().replace(/[^a-zA-Z0-9]/g, ""),
5252
name: Mock.Random.ctitle(5, 20),
5353
description: Mock.Random.csentence(5, 30),
54-
status: Mock.Random.pick(["pending", "running", "completed", "failed"]),
54+
status: Mock.Random.pick(["PENDING", "RUNNING", "COMPLETED", "FAILED", "STOPPED"]),
5555
srcDatasetId: Mock.Random.guid().replace(/[^a-zA-Z0-9]/g, ""),
5656
srcDatasetName: Mock.Random.ctitle(5, 15),
5757
destDatasetId: Mock.Random.guid().replace(/[^a-zA-Z0-9]/g, ""),

frontend/src/mock/mock-seed/data-management.cjs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -157,17 +157,17 @@ module.exports = function (router) {
157157

158158
// 获取数据集列表
159159
router.get(API.queryDatasetsUsingGet, (req, res) => {
160-
const { page = 0, size = 10, keywords, type, status, tags } = req.query;
160+
const { page = 0, size = 10, keyword, type, status, tags } = req.query;
161161
console.log("Received query params:", req.query);
162162

163163
let filteredDatasets = datasetList;
164-
if (keywords) {
165-
console.log("filter keywords:", keywords);
164+
if (keyword) {
165+
console.log("filter keyword:", keyword);
166166

167167
filteredDatasets = filteredDatasets.filter(
168168
(dataset) =>
169-
dataset.name.includes(keywords) ||
170-
dataset.description.includes(keywords)
169+
dataset.name.includes(keyword) ||
170+
dataset.description.includes(keyword)
171171
);
172172
}
173173
if (type) {

frontend/src/pages/DataAnnotation/Home/DataAnnotation.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -350,9 +350,9 @@ export default function DataAnnotation() {
350350

351351
{/* Filters Toolbar */}
352352
<SearchControls
353-
searchTerm={searchParams.keywords}
354-
onSearchChange={(keywords) =>
355-
setSearchParams({ ...searchParams, keywords })
353+
searchTerm={searchParams.keyword}
354+
onSearchChange={(keyword) =>
355+
setSearchParams({ ...searchParams, keyword })
356356
}
357357
searchPlaceholder="搜索任务..."
358358
filters={filterOptions}

frontend/src/pages/DataCleansing/cleansing.const.tsx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import {
1212
AlertOutlined,
1313
DatabaseOutlined,
1414
AppstoreOutlined,
15+
PauseCircleOutlined,
1516
} from "@ant-design/icons";
1617

1718
export const templateTypesMap = {
@@ -72,6 +73,12 @@ export const TaskStatusMap = {
7273
color: "red",
7374
icon: <AlertOutlined />,
7475
},
76+
[TaskStatus.STOPPED]: {
77+
label: "已停止",
78+
value: TaskStatus.STOPPED,
79+
color: "orange",
80+
icon: <PauseCircleOutlined />,
81+
},
7582
};
7683

7784
export const mapTask = (task: CleansingTask) => {

frontend/src/pages/DataCleansing/cleansing.model.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ export enum TaskStatus {
4646
RUNNING = "RUNNING",
4747
COMPLETED = "COMPLETED",
4848
FAILED = "FAILED",
49+
STOPPED = "STOPPED",
4950
}
5051

5152
export interface RuleCondition {

frontend/src/pages/DataManagement/Create/CreateDataset.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ export default function DatasetCreate() {
7777
// 获取归集任务列表
7878
const fetchCollectionTasks = async () => {
7979
try {
80-
const { data } = await queryTasksUsingGet({ page: 1, size: 100 });
80+
const { data } = await queryTasksUsingGet({ page: 0, size: 100 });
8181
const options = data.map((task: any) => ({
8282
label: task.name,
8383
value: task.id,

frontend/src/pages/DataManagement/dataset.api.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,6 @@ export function updateDatasetTagByIdUsingPut(id: string | number, data: any) {
103103

104104
// 删除数据集标签
105105
export function deleteDatasetTagByIdUsingDelete(tag) {
106-
console.log(tag);
107-
108106
return del(`/api/data-management/tags/${tag.id}`);
109107
}
110108

@@ -188,8 +186,7 @@ export function cancelUploadUsingPut(id) {
188186
}
189187

190188
export function uploadFileChunkUsingPost(id: string | number, params, config) {
191-
console.log('upload chunk');
192-
return upload(`/api/data-management/datasets/${id}/upload/chunk`, params, {
189+
return upload(`/api/data-management/datasets/${id}/files/upload/chunk`, params, {
193190
headers: {
194191
accept: "*/*",
195192
"Content-Type": "multipart/form-data;charset=UTF-8",

frontend/src/pages/Layout/MainLayout.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import Sidebar from "./Sidebar";
44

55
const MainLayout = () => {
66
return (
7-
<div className="w-full h-screen flex flex-col bg-gray-50">
7+
<div className="w-full h-screen flex flex-col bg-gray-50 min-w-6xl">
88
<div className="w-full h-full flex">
99
{/* Sidebar */}
1010
<Sidebar />
1111
{/* Main Content */}
12-
<div className="flex-1 flex flex-col overflow-auto p-6 min-w-4xl">
12+
<div className="flex-1 flex flex-col overflow-auto p-6">
1313
{/* Content Area */}
1414
<div className="flex-1 flex flex-col overflow-auto">
1515
<Outlet />

0 commit comments

Comments
 (0)