From 3c8496b4fc2d3e75e3c4cd28947775aaa2c4a1a1 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Thu, 25 Jul 2024 18:18:03 +0800 Subject: [PATCH 1/3] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF?= =?UTF-8?q?=E3=80=81=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):=20=E6=B8=85?= =?UTF-8?q?=E7=90=86=E6=9C=AA=E4=BD=BF=E7=94=A8=E8=BE=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-backend/src/main/resources/db/migration/V2.10__ddl.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/core/core-backend/src/main/resources/db/migration/V2.10__ddl.sql b/core/core-backend/src/main/resources/db/migration/V2.10__ddl.sql index 734fe6580e..ea825754fb 100644 --- a/core/core-backend/src/main/resources/db/migration/V2.10__ddl.sql +++ b/core/core-backend/src/main/resources/db/migration/V2.10__ddl.sql @@ -1 +1,2 @@ INSERT INTO `core_sys_setting` (`id`, `pkey`, `pval`, `type`, `sort`) VALUES (10, 'basic.exportFileLiveTime', '30', 'text', 2); +delete from visualization_background where id ='dark_1'; \ No newline at end of file From 4ac31b772891cd8e12d113614eadb07045ce4128 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Thu, 25 Jul 2024 18:19:38 +0800 Subject: [PATCH 2/3] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF?= =?UTF-8?q?=E3=80=81=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):=20=E6=B8=85?= =?UTF-8?q?=E7=90=86=E6=9C=AA=E4=BD=BF=E7=94=A8=E8=BE=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-backend/src/main/resources/db/desktop/V2.10__ddl.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 core/core-backend/src/main/resources/db/desktop/V2.10__ddl.sql diff --git a/core/core-backend/src/main/resources/db/desktop/V2.10__ddl.sql b/core/core-backend/src/main/resources/db/desktop/V2.10__ddl.sql new file mode 100644 index 0000000000..ea825754fb --- /dev/null +++ b/core/core-backend/src/main/resources/db/desktop/V2.10__ddl.sql @@ -0,0 +1,2 @@ +INSERT INTO `core_sys_setting` (`id`, `pkey`, `pval`, `type`, `sort`) VALUES (10, 'basic.exportFileLiveTime', '30', 'text', 2); +delete from visualization_background where id ='dark_1'; \ No newline at end of file From 50d4295ac22c0d6ef2ea628129480d262b004f65 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Fri, 26 Jul 2024 09:04:40 +0800 Subject: [PATCH 3/3] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF?= =?UTF-8?q?=E3=80=81=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=BA=94=E7=94=A8=E5=90=8D=E7=A7=B0=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E6=97=B6=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/DataVisualizationServer.java | 20 +++++++++++++------ .../api/visualization/dataVisualization.ts | 5 ++++- .../visualization/DataVisualizationApi.java | 5 +++++ 3 files changed, 23 insertions(+), 7 deletions(-) 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 = "画布更新")