diff --git a/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java b/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java index 0abc78bf7b..e53d980086 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java @@ -221,12 +221,6 @@ public class DataVisualizationServer implements DataVisualizationApi { .collect(Collectors.toMap(AppCoreDatasourceVO::getId, AppCoreDatasourceVO::getSystemDatasourceId))); Long datasetFolderPid = request.getDatasetFolderPid(); String datasetFolderName = request.getDatasetFolderName(); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("name", datasetFolderName); - queryWrapper.eq("pid", datasetFolderPid); - if (coreDatasetGroupMapper.exists(queryWrapper)) { - DEException.throwException("当前数据集分组名称已存在"); - } //新建数据集分组 DatasetGroupInfoDTO datasetFolderNewRequest = new DatasetGroupInfoDTO(); datasetFolderNewRequest.setName(datasetFolderName); @@ -393,6 +387,20 @@ public class DataVisualizationServer implements DataVisualizationApi { return newDvId.toString(); } + @Override + public String appCanvasNameCheck(DataVisualizationBaseRequest request) throws Exception { + Long datasetFolderPid = request.getDatasetFolderPid(); + String datasetFolderName = request.getDatasetFolderName(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("name", datasetFolderName); + queryWrapper.eq("pid", datasetFolderPid); + if (coreDatasetGroupMapper.exists(queryWrapper)) { + return "repeat"; + }else{ + return "success"; + } + } + @DeLog(id = "#p0.id", ot = LogOT.MODIFY, stExp = "#p0.type") @Override @Transactional diff --git a/core/core-frontend/src/api/visualization/dataVisualization.ts b/core/core-frontend/src/api/visualization/dataVisualization.ts index d13d7ffe3c..d35c8db3ce 100644 --- a/core/core-frontend/src/api/visualization/dataVisualization.ts +++ b/core/core-frontend/src/api/visualization/dataVisualization.ts @@ -49,6 +49,9 @@ export const save = data => request.post({ url: '/dataVisualization/save', data export const saveCanvas = data => request.post({ url: '/dataVisualization/saveCanvas', data, loading: true }) +export const appCanvasNameCheck = async data => + request.post({ url: '/dataVisualization/appCanvasNameCheck', data, loading: false }) + export const updateBase = data => request.post({ url: '/dataVisualization/updateBase', data }) export const updateCanvas = data => @@ -69,7 +72,7 @@ export const saveOrUpdateSubject = data => export const deleteSubject = id => request.delete({ url: '/visualizationSubject/delete/' + id }) -export const dvNameCheck = data => request.post({ url: '/dataVisualization/nameCheck', data }) +export const dvNameCheck = async data => request.post({ url: '/dataVisualization/nameCheck', data }) export const storeApi = (data): Promise => { return request.post({ url: '/store/execute', data }) diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/DataVisualizationApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/DataVisualizationApi.java index 45d3a62d53..a0528c9510 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/DataVisualizationApi.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/DataVisualizationApi.java @@ -48,6 +48,11 @@ public interface DataVisualizationApi { @Operation(summary = "画布保存") String saveCanvas(@RequestBody DataVisualizationBaseRequest request) throws Exception; + @PostMapping("/appCanvasNameCheck") + @Operation(summary = "应用名称检查") + String appCanvasNameCheck(@RequestBody DataVisualizationBaseRequest request) throws Exception; + + @PostMapping("/updateCanvas") @DePermit(value = {"#p0.id + ':manage'"}, busiFlag = "#p0.type") @Operation(summary = "画布更新")