Merge branch 'main' into dev

Author: Dallas98

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

@@ -44,12 +44,17 @@ public DatasetFileController(DatasetFileApplicationService datasetFileApplicatio
     @GetMapping
     public Response<PagedResponse<DatasetFile>> getDatasetFiles(
             @PathVariable("datasetId") String datasetId,
+            @RequestParam(value = "isWithDirectory", required = false) boolean isWithDirectory,
             @RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
             @RequestParam(value = "size", required = false, defaultValue = "20") Integer size,
             @RequestParam(value = "prefix", required = false, defaultValue = "") String prefix) {
         PagingQuery pagingQuery = new PagingQuery(page, size);
-        PagedResponse<DatasetFile> filesPage = datasetFileApplicationService.getDatasetFilesWithDirectory(
-                datasetId, prefix, pagingQuery);
+        PagedResponse<DatasetFile> filesPage;
+        if (isWithDirectory) {
+            filesPage = datasetFileApplicationService.getDatasetFilesWithDirectory(datasetId, prefix, pagingQuery);
+        } else {
+            filesPage = datasetFileApplicationService.getDatasetFiles(datasetId, null, null, null, pagingQuery);
+        }
         return Response.ok(filesPage);
     }
 

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

@@ -35,6 +35,7 @@ export function useFilesOperation(dataset: Dataset) {
     const params: any = {
       page: current ? current : pagination.current,
       size: pageSize ? pageSize : pagination.pageSize,
+      isWithDirectory: true,
     };
 
     if (prefix !== undefined) {

scripts/db/setting-management-init.sql

@@ -43,5 +43,5 @@ values ('sys.knowledge.base.count', '200', 'number', '10,200,500', '知识库最
        ('TAVILY_API_KEY', 'tvly-dev-xxx', 'string', '', 'deer-flow使用的搜索引擎所需的apiKey', 1, 1, 1, 'system', 'system'),
        ('BRAVE_SEARCH_API_KEY', 'api-xxx', 'string', '', 'deer-flow使用的搜索引擎所需的apiKey', 1, 1, 1, 'system', 'system'),
        ('JINA_API_KEY', '', 'string', '', 'deer-flow使用的JINA搜索引擎所需的apiKey', 1, 1, 1, 'system', 'system'),
-       ('sys.management.dataset.pvc.name', 'dataset-pvc', 'string', '', '数据集所在pvc名称', 1, 0, 1, 'system', 'system'),
+       ('sys.management.dataset.pvc.name', 'datamate-dataset-pvc', 'string', '', '数据集所在pvc名称', 1, 0, 1, 'system', 'system'),
        ('test_bool', 'true', 'boolean', '', '测试布尔值', 1, 1, 1, 'system', 'system');