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

syc366 · syc366 · commit 1d199da44aa2 · 2025-10-15T17:32:49.000+08:00
diff --git a/frontend/src/components/SearchControls.tsx b/frontend/src/components/SearchControls.tsx
@@ -117,11 +117,11 @@ export function SearchControls({
 
   return (
     <div className={className}>
-      <div className="flex items-center justify-between gap-4">
+      <div className="flex items-center justify-between gap-8">
         {/* Left side - Search and Filters */}
         <div className="flex items-center gap-2 flex-1">
           {/* Search */}
-          <div className="relative flex-1 max-w-200">
+          <div className="relative flex-1">
             <Input
               allowClear
               placeholder={searchPlaceholder}
diff --git a/frontend/src/pages/DataCleansing/Create/CreateTask.tsx b/frontend/src/pages/DataCleansing/Create/CreateTask.tsx
@@ -18,6 +18,7 @@ export default function CleansingTaskCreate() {
     name: "",
     description: "",
     srcDatasetId: "",
+    srcDatasetName: "",
     destDatasetName: "",
     destDatasetType: DatasetSubType.TEXT_DOCUMENT,
     type: DatasetType.TEXT,
@@ -34,7 +35,7 @@ export default function CleansingTaskCreate() {
   const handleSave = async () => {
     const task = {
       ...taskConfig,
-      operators: selectedOperators,
+      instance: selectedOperators,
     };
     console.log("创建任务:", task);
     navigate("/data/cleansing");
diff --git a/frontend/src/pages/DataCleansing/Create/CreateTempate.tsx b/frontend/src/pages/DataCleansing/Create/CreateTempate.tsx
@@ -13,13 +13,11 @@ export default function CleansingTemplateCreate() {
   const [templateConfig, setTemplateConfig] = useState({
     name: "",
     description: "",
-    type: "",
   });
 
   const handleSave = async () => {
-    const values = form.getFieldsValue();
     const template = {
-      ...values,
+      ...templateConfig,
       operators: selectedOperators,
     };
     console.log("创建模板:", template);
@@ -38,11 +36,10 @@ export default function CleansingTemplateCreate() {
 
   const canProceed = () => {
     const values = form.getFieldsValue();
-    console.log(values);
 
     switch (currentStep) {
       case 1:
-        return values.name && values.type;
+        return values.name;
       case 2:
         return selectedOperators.length > 0;
       default:
diff --git a/frontend/src/pages/DataCleansing/Create/components/CreateTaskStepOne.tsx b/frontend/src/pages/DataCleansing/Create/components/CreateTaskStepOne.tsx
@@ -49,14 +49,27 @@ export default function CreateTaskStepOne({
     return options;
   }, [taskConfig?.type]);
 
+  const handleValuesChange = (currentValue, allValues) => {
+    const [key, value] = Object.entries(currentValue)[0];
+    let dataset = null;
+    if (key === "srcDatasetId") {
+      dataset = datasets.find((d) => d.id === value);
+      setTaskConfig({
+        ...taskConfig,
+        ...allValues,
+        srcDatasetName: dataset?.name || "",
+      });
+    } else {
+      setTaskConfig({ ...taskConfig, ...allValues });
+    }
+  };
+
   return (
     <Form
       layout="vertical"
       form={form}
       initialValues={taskConfig}
-      onValuesChange={(_, values) =>
-        setTaskConfig({ ...taskConfig, ...values })
-      }
+      onValuesChange={handleValuesChange}
     >
       <h2 className="font-medium text-gray-900 text-lg mb-2">任务信息</h2>
       <Form.Item label="任务名称" name="name" required>
diff --git a/frontend/src/pages/DataCleansing/Create/components/CreateTemplateStepOne.tsx b/frontend/src/pages/DataCleansing/Create/components/CreateTemplateStepOne.tsx
@@ -1,5 +1,3 @@
-import RadioCard from "@/components/RadioCard";
-import { templateTypes } from "@/mock/cleansing";
 import { Input, Form } from "antd";
 
 const { TextArea } = Input;
@@ -35,19 +33,6 @@ export default function CreateTemplateStepOne({
       <Form.Item label="模板描述" name="description">
         <TextArea placeholder="描述模板的用途和特点" rows={4} />
       </Form.Item>
-      <Form.Item
-        label="模板类型"
-        name="type"
-        rules={[{ required: true, message: "请选择模板类型" }]}
-      >
-        <RadioCard
-          options={templateTypes}
-          value={templateConfig.type}
-          onChange={(type) => {
-            setTemplateConfig({ ...templateConfig, type });
-          }}
-        />
-      </Form.Item>
     </Form>
   );
 }
diff --git a/frontend/src/pages/DataCleansing/Create/components/OperatorConfig.tsx b/frontend/src/pages/DataCleansing/Create/components/OperatorConfig.tsx
@@ -1,8 +1,8 @@
 import React from "react";
 import { Tag, Divider, Form } from "antd";
-import { SettingOutlined } from "@ant-design/icons";
 import ParamConfig from "./ParamConfig";
 import { OperatorI } from "../../cleansing.model";
+import { Settings } from "lucide-react";
 
 // OperatorConfig/OperatorTemplate 类型需根据主文件实际导入
 interface OperatorConfigProps {
@@ -28,7 +28,7 @@ const OperatorConfig: React.FC<OperatorConfigProps> = ({
     <div className="w-1/4 flex flex-col h-screen">
       <div className="px-4 pb-4 border-b border-gray-200">
         <span className="font-semibold text-base flex items-center gap-2">
-          <SettingOutlined />
+          <Settings />
           参数配置
         </span>
       </div>
@@ -69,7 +69,7 @@ const OperatorConfig: React.FC<OperatorConfigProps> = ({
           </div>
         ) : (
           <div className="text-center py-12 text-gray-400">
-            <SettingOutlined className="text-5xl mb-4 opacity-50" />
+            <Settings className="text-5xl mb-4 opacity-50" />
             <div>请选择一个算子进行参数配置</div>
           </div>
         )}
diff --git a/frontend/src/pages/DataCleansing/Create/components/OperatorLibrary.tsx b/frontend/src/pages/DataCleansing/Create/components/OperatorLibrary.tsx
@@ -3,6 +3,7 @@ import { Card, Input, Select, Tooltip, Collapse, Tag, Checkbox } from "antd";
 import { StarFilled, StarOutlined, SearchOutlined } from "@ant-design/icons";
 import type { OperatorI } from "@/pages/DataCleansing/cleansing.model";
 import { CategoryI } from "@/pages/OperatorMarket/operator.model";
+import { Layers } from "lucide-react";
 
 interface OperatorListProps {
   operators: OperatorI[];
@@ -150,13 +151,14 @@ const OperatorLibrary: React.FC<OperatorLibraryProps> = ({
   return (
     <div className="w-1/4 h-screen flex flex-col">
       <div className="pb-4 border-b border-gray-200">
-        <span className="font-semibold text-base">
+        <span className="flex items-center font-semibold text-base">
+          <Layers className="w-4 h-4 mr-2" />
           算子库({operatorList.length})
         </span>
       </div>
       <div className="flex flex-col h-full pt-4 pr-4 overflow-hidden">
         {/* 过滤器 */}
-        <div className="flex gap-2 border-b border-gray-100">
+        <div className="flex gap-2 border-b border-gray-100 pb-4">
           <Input
             prefix={<SearchOutlined />}
             placeholder="搜索算子..."
diff --git a/frontend/src/pages/DataCleansing/Create/components/OperatorOrchestration.tsx b/frontend/src/pages/DataCleansing/Create/components/OperatorOrchestration.tsx
@@ -1,11 +1,8 @@
 import React, { useState } from "react";
 import { Card, Input, Tag, Select, Button } from "antd";
-import {
-  SettingOutlined,
-  DeleteOutlined,
-  ShareAltOutlined,
-} from "@ant-design/icons";
+import { DeleteOutlined } from "@ant-design/icons";
 import { CleansingTemplate, OperatorI } from "../../cleansing.model";
+import { Workflow } from "lucide-react";
 
 interface OperatorFlowProps {
   selectedOperators: OperatorI[];
@@ -78,7 +75,7 @@ const OperatorFlow: React.FC<OperatorFlowProps> = ({
       <div className="px-4 pb-2 border-b border-gray-200">
         <div className="flex justify-between items-start">
           <span className="font-semibold text-base flex items-center gap-2">
-            <SettingOutlined />
+            <Workflow className="w-5 h-5" />
             算子编排({selectedOperators.length}){" "}
             <Button
               type="link"
@@ -114,7 +111,7 @@ const OperatorFlow: React.FC<OperatorFlowProps> = ({
       >
         {selectedOperators.length === 0 && (
           <div className="text-center py-16 text-gray-400 border-2 border-dashed border-gray-100 rounded-lg">
-            <ShareAltOutlined className="text-5xl mb-4 opacity-50" />
+            <Workflow className="text-5xl mb-4 opacity-50" />
             <div className="text-lg font-medium mb-2">开始构建您的算子流程</div>
             <div className="text-sm">
               从左侧算子库拖拽算子到此处，或点击算子添加
diff --git a/frontend/src/pages/DataCleansing/Home/components/TaskList.tsx b/frontend/src/pages/DataCleansing/Home/components/TaskList.tsx
@@ -31,14 +31,6 @@ export default function TaskList() {
   const { message } = App.useApp();
   const [viewMode, setViewMode] = useState<"card" | "list">("list");
   const filterOptions = [
-    {
-      key: "type",
-      label: "类型",
-      options: [
-        { label: "所有类型", value: "all" },
-        ...Object.values(templateTypesMap),
-      ],
-    },
     {
       key: "status",
       label: "状态",
diff --git a/frontend/src/pages/DataManagement/Home/DataManagement.tsx b/frontend/src/pages/DataManagement/Home/DataManagement.tsx
@@ -122,7 +122,7 @@ export default function DatasetManagementPage() {
   const handleDeleteDataset = async (id: number) => {
     if (!id) return;
     await deleteDatasetByIdUsingDelete(id);
-
+    fetchData();
     message.success("数据删除成功");
   };
 
@@ -273,17 +273,6 @@ export default function DatasetManagementPage() {
 
       {/* Statistics */}
       <div className="grid grid-cols-1 mt-4">
-        {/* <Card title="数据集统计">
-          <div className="grid grid-cols-4">
-            {statisticsData.count?.map?.((item) => (
-              <Statistic
-                key={item.title}
-                title={item.title}
-                value={item.value}
-              />
-            ))}
-          </div>
-        </Card> */}
         <Card>
           <div className="grid grid-cols-4">
             {statisticsData.size?.map?.((item) => (
diff --git a/frontend/src/pages/DataManagement/dataset.api.ts b/frontend/src/pages/DataManagement/dataset.api.ts
@@ -39,7 +39,11 @@ export function downloadDatasetUsingGet(
   id: string | number,
   filename?: string
 ) {
-  return download(`/api/data-management/datasets/${id}/download`, null, filename);
+  return download(
+    `/api/data-management/datasets/${id}/download`,
+    null,
+    filename
+  );
 }
 
 // 验证数据集
@@ -98,8 +102,10 @@ export function updateDatasetTagByIdUsingPut(id: string | number, data: any) {
 }
 
 // 删除数据集标签
-export function deleteDatasetTagByIdUsingDelete(id: string | number) {
-  return del(`/api/data-management/tags/${id}`);
+export function deleteDatasetTagByIdUsingDelete(tag) {
+  console.log(tag);
+  
+  return del(`/api/data-management/tags/${tag.id}`);
 }
 
 // 数据集质量检查
@@ -150,7 +156,9 @@ export function switchDatasetVersionUsingPut(
   id: string | number,
   versionId: string | number
 ) {
-  return put(`/api/data-management/datasets/${id}/versions/${versionId}/switch`);
+  return put(
+    `/api/data-management/datasets/${id}/versions/${versionId}/switch`
+  );
 }
 
 // 删除数据集版本
