fix: fixed an issue where files inside folders could not be deleted

Author: hefanli

backend/services/data-management-service/src/main/java/com/datamate/datamanagement/application/DatasetFileApplicationService.java

@@ -229,9 +229,9 @@ public DatasetFile getDatasetFile(Dataset dataset, String fileId, String prefix)
      * 删除文件
      */
     @Transactional
-    public void deleteDatasetFile(String datasetId, String fileId) {
+    public void deleteDatasetFile(String datasetId, String fileId, String prefix) {
         Dataset dataset = datasetRepository.getById(datasetId);
-        DatasetFile file = getDatasetFile(dataset, fileId, null);
+        DatasetFile file = getDatasetFile(dataset, fileId, prefix);
         dataset.setFiles(new ArrayList<>(Collections.singleton(file)));
         datasetFileRepository.removeById(fileId);
         if (CommonUtils.isUUID(fileId)) {

backend/services/data-management-service/src/main/java/com/datamate/datamanagement/interfaces/rest/DatasetFileController.java

@@ -65,10 +65,11 @@ public Response<PagedResponse<DatasetFile>> getDatasetFiles(
     @GetMapping("/{fileId}")
     public ResponseEntity<Response<DatasetFileResponse>> getDatasetFileById(
             @PathVariable("datasetId") String datasetId,
-            @PathVariable("fileId") String fileId) {
+            @PathVariable("fileId") String fileId,
+            @RequestParam(value = "prefix", required = false, defaultValue = "") String prefix) {
         try {
             Dataset dataset = datasetApplicationService.getDataset(datasetId);
-            DatasetFile datasetFile = datasetFileApplicationService.getDatasetFile(dataset, fileId, null);
+            DatasetFile datasetFile = datasetFileApplicationService.getDatasetFile(dataset, fileId, prefix);
             return ResponseEntity.ok(Response.ok(DatasetConverter.INSTANCE.convertToResponse(datasetFile)));
         } catch (IllegalArgumentException e) {
             return ResponseEntity.status(HttpStatus.NOT_FOUND).body(Response.error(SystemErrorCode.UNKNOWN_ERROR, null));
@@ -78,9 +79,10 @@ public ResponseEntity<Response<DatasetFileResponse>> getDatasetFileById(
     @DeleteMapping("/{fileId}")
     public ResponseEntity<Response<Void>> deleteDatasetFile(
             @PathVariable("datasetId") String datasetId,
-            @PathVariable("fileId") String fileId) {
+            @PathVariable("fileId") String fileId,
+            @RequestParam(value = "prefix", required = false, defaultValue = "") String prefix) {
         try {
-            datasetFileApplicationService.deleteDatasetFile(datasetId, fileId);
+            datasetFileApplicationService.deleteDatasetFile(datasetId, fileId, prefix);
             return ResponseEntity.ok().build();
         } catch (IllegalArgumentException e) {
             return ResponseEntity.status(HttpStatus.NOT_FOUND).body(Response.error(SystemErrorCode.UNKNOWN_ERROR, null));

frontend/src/pages/DataManagement/Detail/useFilesOperation.ts

@@ -113,12 +113,12 @@ export function useFilesOperation(dataset: Dataset) {
     setPreviewFileDetail(undefined);
     try {
       // 获取文件元信息（来自 t_dm_dataset_files）
-      const detailRes: any = await getDatasetFileByIdUsingGet(datasetId, file.id);
+      const prefix = pagination.prefix || "";
+      const detailRes: any = await getDatasetFileByIdUsingGet(datasetId, file.id, prefix);
       const detail = detailRes?.data || detailRes;
       setPreviewFileDetail(detail);
 
       const image = isImageFile(detail?.fileName || file.fileName, detail?.fileType);
-      const prefix = pagination.prefix || "";
       const { blob, blobUrl } = await downloadFileByIdUsingGet(datasetId, prefix, file.id, file.fileName, "preview");
 
       if (image) {
@@ -136,7 +136,8 @@ export function useFilesOperation(dataset: Dataset) {
 
   const handleDeleteFile = async (file) => {
     try {
-      await deleteDatasetFileUsingDelete(dataset.id, file.id);
+      const prefix = pagination.prefix || "";
+      await deleteDatasetFileUsingDelete(dataset.id, file.id, prefix);
       fetchFiles(); // 刷新文件列表
       message.success({ content: `文件 ${file.fileName} 已删除` });
     } catch (error) {
@@ -191,7 +192,7 @@ export function useFilesOperation(dataset: Dataset) {
       // 先删除文件
       for (const file of files) {
         try {
-          await deleteDatasetFileUsingDelete(dataset.id, file.id);
+          await deleteDatasetFileUsingDelete(dataset.id, file.id, directoryPath);
         } catch (e) {
           console.error("删除文件失败", file, e);
         }

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

@@ -57,10 +57,11 @@ export function queryDatasetFilesUsingGet(id: string | number, params?: any) {
 // 根据ID获取单个数据集文件详情
 export function getDatasetFileByIdUsingGet(
   datasetId: string | number,
-  fileId: string | number
+  fileId: string | number,
+  prefix: string
 ) {
   return get(
-    `/api/data-management/datasets/${datasetId}/files/${fileId}`
+    `/api/data-management/datasets/${datasetId}/files/${fileId}`, { prefix: prefix}
   );
 }
 
@@ -124,9 +125,10 @@ export function downloadFileByIdUsingGet(
 // 删除数据集文件
 export function deleteDatasetFileUsingDelete(
   datasetId: string | number,
-  fileId: string | number
+  fileId: string | number,
+  prefix: string
 ) {
-  return del(`/api/data-management/datasets/${datasetId}/files/${fileId}`);
+  return del(`/api/data-management/datasets/${datasetId}/files/${fileId}`, { prefix: prefix });
 }
 
 // 重命名数据集文件（仅修改主名称，后缀保持不变）

frontend/src/utils/request.ts

@@ -368,7 +368,8 @@ class Request {
       const isQueryParams =
         Object.keys(params).length === 1 &&
         (Object.prototype.hasOwnProperty.call(params, "id") ||
-          Object.prototype.hasOwnProperty.call(params, "ids"));
+          Object.prototype.hasOwnProperty.call(params, "ids") ||
+          Object.prototype.hasOwnProperty.call(params, "prefix"));
 
       if (isQueryParams) {
         fullURL = this.buildURL(url, params);