From 7add22f6d893217ff19aa44bcb93bbc6579f0e88 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 28 Feb 2022 11:38:51 +0800 Subject: [PATCH 1/5] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=BA=90=E5=88=A0=E9=99=A4=E6=8F=90=E7=A4=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/datasource/DatasourceController.java | 4 ++-- .../service/datasource/DatasourceService.java | 5 +++-- frontend/src/views/system/datasource/DsTree.vue | 13 ++++++++++--- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/backend/src/main/java/io/dataease/controller/datasource/DatasourceController.java b/backend/src/main/java/io/dataease/controller/datasource/DatasourceController.java index d03a15f2db..54ccb07504 100644 --- a/backend/src/main/java/io/dataease/controller/datasource/DatasourceController.java +++ b/backend/src/main/java/io/dataease/controller/datasource/DatasourceController.java @@ -74,8 +74,8 @@ public class DatasourceController { @DePermission(type = DePermissionType.DATASOURCE, level = ResourceAuthLevel.DATASOURCE_LEVEL_MANAGE) @ApiOperation("删除数据源") @PostMapping("/delete/{datasourceID}") - public void deleteDatasource(@PathVariable(value = "datasourceID") String datasourceID) throws Exception { - datasourceService.deleteDatasource(datasourceID); + public ResultHolder deleteDatasource(@PathVariable(value = "datasourceID") String datasourceID) throws Exception { + return datasourceService.deleteDatasource(datasourceID); } @RequiresPermissions("datasource:read") diff --git a/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java b/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java index 7a20a5bd39..0883d92131 100644 --- a/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java +++ b/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java @@ -163,16 +163,17 @@ public class DatasourceService { } @DeCleaner(DePermissionType.DATASOURCE) - public void deleteDatasource(String datasourceId) throws Exception { + public ResultHolder deleteDatasource(String datasourceId) throws Exception { DatasetTableExample example = new DatasetTableExample(); example.createCriteria().andDataSourceIdEqualTo(datasourceId); List datasetTables = datasetTableMapper.selectByExample(example); if(CollectionUtils.isNotEmpty(datasetTables)){ - DataEaseException.throwException(datasetTables.size() + Translator.get("i18n_datasource_not_allow_delete_msg")); + return ResultHolder.error(datasetTables.size() + Translator.get("i18n_datasource_not_allow_delete_msg")); } Datasource datasource = datasourceMapper.selectByPrimaryKey(datasourceId); datasourceMapper.deleteByPrimaryKey(datasourceId); handleConnectionPool(datasource, "delete"); + return ResultHolder.success("success"); } public void updateDatasource(Datasource datasource) { diff --git a/frontend/src/views/system/datasource/DsTree.vue b/frontend/src/views/system/datasource/DsTree.vue index e5ca81de49..e7fa48e7f6 100644 --- a/frontend/src/views/system/datasource/DsTree.vue +++ b/frontend/src/views/system/datasource/DsTree.vue @@ -268,9 +268,16 @@ export default { type: 'warning' }).then(() => { delDs(datasource.id).then(res => { - this.$success(this.$t('commons.delete_success')) - this.switchMain('DataHome', {}, this.tData) - this.refreshType(datasource) + if(res.success){ + this.$success(this.$t('commons.delete_success')) + this.switchMain('DataHome', {}, this.tData) + this.refreshType(datasource) + }else { + this.$message({ + type: 'error', + message: res.message + }) + } }) }).catch(() => { this.$message({ From d7a1f5197cd51a300106f7d9b2513589bd6b00b5 Mon Sep 17 00:00:00 2001 From: junjun Date: Mon, 28 Feb 2022 12:16:15 +0800 Subject: [PATCH 2/5] =?UTF-8?q?refactor:=20=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/controller/datasource/DatasourceController.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/backend/src/main/java/io/dataease/controller/datasource/DatasourceController.java b/backend/src/main/java/io/dataease/controller/datasource/DatasourceController.java index e305620164..967e15a70f 100644 --- a/backend/src/main/java/io/dataease/controller/datasource/DatasourceController.java +++ b/backend/src/main/java/io/dataease/controller/datasource/DatasourceController.java @@ -54,7 +54,6 @@ public class DatasourceController { return datasourceService.validate(datasourceId); } - @RequiresPermissions("datasource:read") @ApiOperation("查询当前用户数据源") @GetMapping("/list") public List getDatasourceList() throws Exception { @@ -63,7 +62,6 @@ public class DatasourceController { return datasourceService.getDatasourceList(request); } - @RequiresPermissions("datasource:read") @ApiOperation("查询当前用户数据源") @GetMapping("/list/{type}") public List getDatasourceListByType(@PathVariable String type) throws Exception { From 434fbd5b1191cd8b088ba70e3cc9b48d82791bfe Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Mon, 28 Feb 2022 13:27:22 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E5=85=AC=E5=85=B1=E9=93=BE=E6=8E=A5?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E6=97=A0=E6=B3=95=E6=89=93=E5=BC=80=E7=9B=AE?= =?UTF-8?q?=E6=A0=87=E4=BB=AA=E8=A1=A8=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/base/mapper/ext/ExtPanelLinkJumpMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelLinkJumpMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelLinkJumpMapper.xml index c7a496ea3a..096802cce0 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelLinkJumpMapper.xml +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelLinkJumpMapper.xml @@ -36,7 +36,7 @@ panel_link_jump_info.jump_type, panel_link_jump_info.target_panel_id, panel_link_jump_info.content, - panel_link_mapping.id as publicJumpId, + ifnull( panel_link_mapping.uuid, panel_link_mapping.id ) AS publicJumpId, ifnull( panel_link_jump_info.checked, 0 ) AS checked, panel_link_jump_target_view_info.target_view_id, panel_link_jump_target_view_info.target_field_id From d6f0c07ad456b85a5a9e6fcf29602cfd18dcccb4 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 28 Feb 2022 14:55:23 +0800 Subject: [PATCH 4/5] fix: Elasticsearch sql, field_multi_value_leniency -> true; the API returns the first value from the array with no guarantee of consistent results. --- .../io/dataease/controller/request/datasource/es/Requst.java | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/src/main/java/io/dataease/controller/request/datasource/es/Requst.java b/backend/src/main/java/io/dataease/controller/request/datasource/es/Requst.java index f63cdc53b8..f69c4290cc 100644 --- a/backend/src/main/java/io/dataease/controller/request/datasource/es/Requst.java +++ b/backend/src/main/java/io/dataease/controller/request/datasource/es/Requst.java @@ -6,4 +6,5 @@ import lombok.Data; public class Requst { private String query; private Integer fetch_size = 10000; + private boolean field_multi_value_leniency = true; } From 1896875fcbdbb5cd5d00df1051bce979d8a51488 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Mon, 28 Feb 2022 16:55:35 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix:=20=E4=BD=BF=E7=94=A8=E6=9C=AA=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E6=95=B0=E6=8D=AE=E9=9B=86=E5=88=9B=E5=BB=BA=E8=A7=86?= =?UTF-8?q?=E5=9B=BE=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/chart/view/TableSelector.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/views/chart/view/TableSelector.vue b/frontend/src/views/chart/view/TableSelector.vue index ebfdc2a107..92548c41f8 100644 --- a/frontend/src/views/chart/view/TableSelector.vue +++ b/frontend/src/views/chart/view/TableSelector.vue @@ -1,7 +1,7 @@