From bd37858cccafd025238886d375d71749c5525a7c Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Fri, 30 Jan 2026 16:48:39 +0800
Subject: [PATCH] =?UTF-8?q?refactor(dataset):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E8=B7=AF=E5=BE=84=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=92=8C=E5=85=B3=E8=81=94=E5=85=B3=E7=B3=BB=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除Dataset类中initCreateParam方法的parentPath参数
- 简化handleParentChange方法中的路径构建逻辑
- 更新错误消息将"子数据集"改为"关联数据集"
- 修改前端界面将"父数据集"相关术语统一为"关联数据集"
- 在导入配置组件中添加类型定义和改进文件处理逻辑
- 限制数据源选项排除COLLECTION类型避免错误选择
---
 .../DatasetApplicationService.java            |   9 +-
 .../domain/model/dataset/Dataset.java         |   4 +-
 .../exception/DataManagementErrorCode.java    |   4 +-
 .../DataManagement/Create/EditDataset.tsx     |   2 +-
 .../Create/components/BasicInformation.tsx    |   6 +-
 .../DataManagement/Detail/DatasetDetail.tsx   |   8 +-
 .../Detail/components/ImportConfiguration.tsx | 139 +++++++++++-------
 7 files changed, 101 insertions(+), 71 deletions(-)

diff --git a/backend/services/data-management-service/src/main/java/com/datamate/datamanagement/application/DatasetApplicationService.java b/backend/services/data-management-service/src/main/java/com/datamate/datamanagement/application/DatasetApplicationService.java
index 3e90b11..9f987ea 100644
--- a/backend/services/data-management-service/src/main/java/com/datamate/datamanagement/application/DatasetApplicationService.java
+++ b/backend/services/data-management-service/src/main/java/com/datamate/datamanagement/application/DatasetApplicationService.java
@@ -73,7 +73,7 @@ public class DatasetApplicationService {
         Dataset dataset = DatasetConverter.INSTANCE.convertToDataset(createDatasetRequest);
         Dataset parentDataset = resolveParentDataset(createDatasetRequest.getParentDatasetId(), dataset.getId());
         dataset.setParentDatasetId(parentDataset == null ? null : parentDataset.getId());
-        dataset.initCreateParam(datasetBasePath, parentDataset == null ? null : parentDataset.getPath());
+        dataset.initCreateParam(datasetBasePath);
         // 处理标签
         Set<Tag> processedTags = Optional.ofNullable(createDatasetRequest.getTags())
             .filter(CollectionUtils::isNotEmpty)
@@ -291,7 +291,9 @@ public class DatasetApplicationService {
 
     private void handleParentChange(Dataset dataset, String parentDatasetId) {
         String normalized = normalizeParentId(parentDatasetId);
-        if (Objects.equals(dataset.getParentDatasetId(), normalized)) {
+        String expectedPath = buildDatasetPath(datasetBasePath, dataset.getId());
+        if (Objects.equals(dataset.getParentDatasetId(), normalized)
+            && Objects.equals(dataset.getPath(), expectedPath)) {
             return;
         }
         long childCount = datasetRepository.countByParentId(dataset.getId());
@@ -299,8 +301,7 @@ public class DatasetApplicationService {
             throw BusinessException.of(DataManagementErrorCode.DATASET_HAS_CHILDREN);
         }
         Dataset parent = normalized == null ? null : resolveParentDataset(normalized, dataset.getId());
-        String newPath = buildDatasetPath(parent == null ? datasetBasePath : parent.getPath(), dataset.getId());
-        moveDatasetPath(dataset, newPath);
+        moveDatasetPath(dataset, expectedPath);
         dataset.setParentDatasetId(parent == null ? null : parent.getId());
     }
 
diff --git a/backend/services/data-management-service/src/main/java/com/datamate/datamanagement/domain/model/dataset/Dataset.java b/backend/services/data-management-service/src/main/java/com/datamate/datamanagement/domain/model/dataset/Dataset.java
index eeebc37..cf5375f 100644
--- a/backend/services/data-management-service/src/main/java/com/datamate/datamanagement/domain/model/dataset/Dataset.java
+++ b/backend/services/data-management-service/src/main/java/com/datamate/datamanagement/domain/model/dataset/Dataset.java
@@ -114,9 +114,9 @@ public class Dataset extends BaseEntity<String> {
         this.updatedAt = LocalDateTime.now();
     }
 
-    public void initCreateParam(String datasetBasePath, String parentPath) {
+    public void initCreateParam(String datasetBasePath) {
         this.id = UUID.randomUUID().toString();
-        String basePath = normalizeBasePath(parentPath != null && !parentPath.isBlank() ? parentPath : datasetBasePath);
+        String basePath = normalizeBasePath(datasetBasePath);
         this.path = basePath + File.separator + this.id;
         if (this.status == null) {
             this.status = DatasetStatusType.DRAFT;
diff --git a/backend/services/data-management-service/src/main/java/com/datamate/datamanagement/infrastructure/exception/DataManagementErrorCode.java b/backend/services/data-management-service/src/main/java/com/datamate/datamanagement/infrastructure/exception/DataManagementErrorCode.java
index 8312975..4955d1f 100644
--- a/backend/services/data-management-service/src/main/java/com/datamate/datamanagement/infrastructure/exception/DataManagementErrorCode.java
+++ b/backend/services/data-management-service/src/main/java/com/datamate/datamanagement/infrastructure/exception/DataManagementErrorCode.java
@@ -42,9 +42,9 @@ public enum DataManagementErrorCode implements ErrorCode {
      */
     DIRECTORY_NOT_FOUND("data_management.0007", "目录不存在"),
     /**
-     * 存在子数据集
+     * 存在关联数据集
      */
-    DATASET_HAS_CHILDREN("data_management.0008", "存在子数据集，禁止删除或移动"),
+    DATASET_HAS_CHILDREN("data_management.0008", "存在关联数据集，禁止删除或移动"),
     /**
      * 数据集文件不存在
      */
diff --git a/frontend/src/pages/DataManagement/Create/EditDataset.tsx b/frontend/src/pages/DataManagement/Create/EditDataset.tsx
index 1dac677..cabc524 100644
--- a/frontend/src/pages/DataManagement/Create/EditDataset.tsx
+++ b/frontend/src/pages/DataManagement/Create/EditDataset.tsx
@@ -96,7 +96,7 @@ export default function EditDataset({
         <BasicInformation
           data={newDataset}
           setData={setNewDataset}
-          hidden={["datasetType"]}
+          hidden={["datasetType", "dataSource"]}
         />
       </Form>
     </Modal>
diff --git a/frontend/src/pages/DataManagement/Create/components/BasicInformation.tsx b/frontend/src/pages/DataManagement/Create/components/BasicInformation.tsx
index 5eadad2..83470bd 100644
--- a/frontend/src/pages/DataManagement/Create/components/BasicInformation.tsx
+++ b/frontend/src/pages/DataManagement/Create/components/BasicInformation.tsx
@@ -74,7 +74,7 @@ export default function BasicInformation({
           value: dataset.id,
         }));
       setParentDatasetOptions([
-        { label: "根数据集", value: "" },
+        { label: "无关联数据集", value: "" },
         ...options,
       ]);
     } catch (error) {
@@ -102,11 +102,11 @@ export default function BasicInformation({
         </Form.Item>
       )}
       {!hidden.includes("parentDatasetId") && (
-        <Form.Item name="parentDatasetId" label="父数据集">
+        <Form.Item name="parentDatasetId" label="关联数据集">
           <Select
             className="w-full"
             options={parentDatasetOptions}
-            placeholder="选择父数据集（仅支持一层）"
+            placeholder="选择关联数据集（仅支持一层）"
           />
         </Form.Item>
       )}
diff --git a/frontend/src/pages/DataManagement/Detail/DatasetDetail.tsx b/frontend/src/pages/DataManagement/Detail/DatasetDetail.tsx
index 6df4367..aa3b729 100644
--- a/frontend/src/pages/DataManagement/Detail/DatasetDetail.tsx
+++ b/frontend/src/pages/DataManagement/Detail/DatasetDetail.tsx
@@ -127,7 +127,7 @@ export default function DatasetDetail() {
     if (!dataset?.parentDatasetId) {
       items.push({
         key: "children",
-        label: "子数据集",
+        label: "关联数据集",
       });
     }
     return items;
@@ -266,7 +266,7 @@ export default function DatasetDetail() {
       ? [
           {
             key: "create-child",
-            label: "创建子数据集",
+            label: "创建关联数据集",
             icon: <PlusOutlined />,
             onClick: handleCreateChildDataset,
           },
@@ -415,7 +415,7 @@ export default function DatasetDetail() {
           {activeTab === "children" && (
             <div className="pt-4">
               <div className="flex items-center justify-between mb-3">
-                <h2 className="text-base font-semibold">子数据集</h2>
+                <h2 className="text-base font-semibold">关联数据集</h2>
                 <span className="text-xs text-gray-500">
                   共 {childDatasets.length} 个
                 </span>
@@ -426,7 +426,7 @@ export default function DatasetDetail() {
                 dataSource={childDatasets}
                 loading={childDatasetsLoading}
                 pagination={false}
-                locale={{ emptyText: "暂无子数据集" }}
+                locale={{ emptyText: "暂无关联数据集" }}
               />
             </div>
           )}
diff --git a/frontend/src/pages/DataManagement/Detail/components/ImportConfiguration.tsx b/frontend/src/pages/DataManagement/Detail/components/ImportConfiguration.tsx
index a50fbb3..1c2c56e 100644
--- a/frontend/src/pages/DataManagement/Detail/components/ImportConfiguration.tsx
+++ b/frontend/src/pages/DataManagement/Detail/components/ImportConfiguration.tsx
@@ -13,11 +13,11 @@ import Dragger from "antd/es/upload/Dragger";
  * @param file 原始文件
  * @returns 分割后的文件列表，每行一个文件
  */
-async function splitFileByLines(file: UploadFile): Promise<UploadFile[]> {
-  const originFile = (file as any).originFileObj || file;
-  if (!originFile || typeof originFile.text !== "function") {
-    return [file];
-  }
+async function splitFileByLines(file: UploadFile): Promise<UploadFile[]> {
+  const originFile = file.originFileObj ?? file;
+  if (!(originFile instanceof File) || typeof originFile.text !== "function") {
+    return [file];
+  }
 
   const text = await originFile.text();
   if (!text) return [file];
@@ -36,17 +36,37 @@ async function splitFileByLines(file: UploadFile): Promise<UploadFile[]> {
     const newFileName = `${baseName}_${String(index + 1).padStart(padLength, "0")}${ext}`;
     const blob = new Blob([line], { type: "text/plain" });
     const newFile = new File([blob], newFileName, { type: "text/plain" });
-    return {
-      uid: `${file.uid}-${index}`,
-      name: newFileName,
-      size: newFile.size,
-      type: "text/plain",
-      originFileObj: newFile as any,
-    } as UploadFile;
-  });
-}
-
-export default function ImportConfiguration({
+    return {
+      uid: `${file.uid}-${index}`,
+      name: newFileName,
+      size: newFile.size,
+      type: "text/plain",
+      originFileObj: newFile as UploadFile["originFileObj"],
+    } as UploadFile;
+  });
+}
+
+type SelectOption = {
+  label: string;
+  value: string;
+};
+
+type CollectionTask = {
+  id: string;
+  name: string;
+};
+
+type ImportConfig = {
+  source: DataSource;
+  hasArchive: boolean;
+  splitByLine: boolean;
+  files?: UploadFile[];
+  dataSource?: string;
+  target?: DataSource;
+  [key: string]: unknown;
+};
+
+export default function ImportConfiguration({
   data,
   open,
   onClose,
@@ -59,19 +79,23 @@ export default function ImportConfiguration({
   updateEvent?: string;
   prefix?: string;
 }) {
-  const [form] = Form.useForm();
-  const [collectionOptions, setCollectionOptions] = useState([]);
-  const [importConfig, setImportConfig] = useState<any>({
-    source: DataSource.UPLOAD,
-    hasArchive: true,
-    splitByLine: false,
-  });
+  const [form] = Form.useForm();
+  const [collectionOptions, setCollectionOptions] = useState<SelectOption[]>([]);
+  const availableSourceOptions = dataSourceOptions.filter(
+    (option) => option.value !== DataSource.COLLECTION
+  );
+  const [importConfig, setImportConfig] = useState<ImportConfig>({
+    source: DataSource.UPLOAD,
+    hasArchive: true,
+    splitByLine: false,
+  });
   const [currentPrefix, setCurrentPrefix] = useState<string>("");
 
   // 本地上传文件相关逻辑
 
   const handleUpload = async (dataset: Dataset) => {
-    let filesToUpload = form.getFieldValue("files") || [];
+    let filesToUpload =
+      (form.getFieldValue("files") as UploadFile[] | undefined) || [];
 
     // 如果启用分行分割，处理文件
     if (importConfig.splitByLine) {
@@ -83,14 +107,14 @@ export default function ImportConfiguration({
 
     // 计算分片列表
     const sliceList = filesToUpload.map((file) => {
-      const originFile = (file as any).originFileObj || file;
-      const slices = sliceFile(originFile);
-      return {
-        originFile: originFile,  // 传入真正的 File/Blob 对象
-        slices,
-        name: file.name,
-        size: originFile.size || 0,
-      };
+      const originFile = (file.originFileObj ?? file) as Blob;
+      const slices = sliceFile(originFile);
+      return {
+        originFile: originFile,  // 传入真正的 File/Blob 对象
+        slices,
+        name: file.name,
+        size: originFile.size || 0,
+      };
     });
 
     console.log("[ImportConfiguration] Uploading with currentPrefix:", currentPrefix);
@@ -111,10 +135,13 @@ export default function ImportConfiguration({
     if (importConfig.source !== DataSource.COLLECTION) return;
     try {
       const res = await queryTasksUsingGet({ page: 0, size: 100 });
-      const options = res.data.content.map((task: any) => ({
-        label: task.name,
-        value: task.id,
-      }));
+      const tasks = Array.isArray(res?.data?.content)
+        ? (res.data.content as CollectionTask[])
+        : [];
+      const options = tasks.map((task) => ({
+        label: task.name,
+        value: task.id,
+      }));
       setCollectionOptions(options);
     } catch (error) {
       console.error("Error fetching collection tasks:", error);
@@ -123,13 +150,13 @@ export default function ImportConfiguration({
 
   const resetState = () => {
     console.log('[ImportConfiguration] resetState called, preserving currentPrefix:', currentPrefix);
-    form.resetFields();
-    form.setFieldsValue({ files: null });
-    setImportConfig({
-      source: importConfig.source ? importConfig.source : DataSource.UPLOAD,
-      hasArchive: true,
-      splitByLine: false,
-    });
+    form.resetFields();
+    form.setFieldsValue({ files: null });
+    setImportConfig({
+      source: DataSource.UPLOAD,
+      hasArchive: true,
+      splitByLine: false,
+    });
     console.log('[ImportConfiguration] resetState done, currentPrefix still:', currentPrefix);
   };
 
@@ -196,12 +223,12 @@ export default function ImportConfiguration({
           name="source"
           rules={[{ required: true, message: "请选择数据源" }]}
         >
-          <Radio.Group
-            buttonStyle="solid"
-            options={dataSourceOptions}
-            optionType="button"
-          />
-        </Form.Item>
+            <Radio.Group
+              buttonStyle="solid"
+              options={availableSourceOptions}
+              optionType="button"
+            />
+          </Form.Item>
         {importConfig?.source === DataSource.COLLECTION && (
           <Form.Item name="dataSource" label="归集任务" required>
             <Select placeholder="请选择归集任务" options={collectionOptions} />
@@ -277,12 +304,14 @@ export default function ImportConfiguration({
               label="上传文件"
               name="files"
               valuePropName="fileList"
-              getValueFromEvent={(e: any) => {
-                if (Array.isArray(e)) {
-                  return e;
-                }
-                return e && e.fileList;
-              }}
+              getValueFromEvent={(
+                event: { fileList?: UploadFile[] } | UploadFile[]
+              ) => {
+                if (Array.isArray(event)) {
+                  return event;
+                }
+                return event?.fileList;
+              }}
               rules={[
                 {
                   required: true,