From a40cd1e08a9ec8ff500ba59e750aac8fcf3fc273 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 2 Mar 2022 16:09:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E5=88=9B=E5=BB=BA=E5=85=B3=E8=81=94?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E5=8F=AF=E9=80=89=E6=8B=A9[API]?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/dataease/auth/api/demo.java | 28 ------------------- .../auth/service/impl/ShiroServiceImpl.java | 1 - frontend/src/views/dataset/add/AddUnion.vue | 2 +- 3 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 backend/src/main/java/io/dataease/auth/api/demo.java diff --git a/backend/src/main/java/io/dataease/auth/api/demo.java b/backend/src/main/java/io/dataease/auth/api/demo.java deleted file mode 100644 index 04d7ce9c57..0000000000 --- a/backend/src/main/java/io/dataease/auth/api/demo.java +++ /dev/null @@ -1,28 +0,0 @@ -package io.dataease.auth.api; - - -import cn.hutool.json.JSONArray; -import cn.hutool.json.JSONObject; - -import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.*; - - - -@RestController -@RequestMapping("api/data") -public class demo { - @ApiOperation("查询") - @GetMapping("demo") - public Object listByTableId() { - JSONArray jsonArray = new JSONArray(); - for(int i=0;i<10;i++){ - JSONObject jsonObject = new JSONObject(); - for(int j=0;j<1;j++){ - jsonObject.set("column" +i + j, "value"+i+j); - } - jsonArray.put(jsonObject); - } - return jsonArray; - } -} diff --git a/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java b/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java index be7213cde8..26c74635c7 100644 --- a/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java +++ b/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java @@ -20,7 +20,6 @@ public class ShiroServiceImpl implements ShiroService { // ---------------------------------------------------------- // 放行Swagger2页面，需要放行这些 - filterChainDefinitionMap.put("/api/data/demo", ANON); filterChainDefinitionMap.put("/doc.html**", "doc"); filterChainDefinitionMap.put("/deApi**", ANON); filterChainDefinitionMap.put("/swagger-ui.html", ANON); diff --git a/frontend/src/views/dataset/add/AddUnion.vue b/frontend/src/views/dataset/add/AddUnion.vue index 4620258a46..83212808f6 100644 --- a/frontend/src/views/dataset/add/AddUnion.vue +++ b/frontend/src/views/dataset/add/AddUnion.vue @@ -139,7 +139,7 @@ export default { allChildCount: 0 }, name: '关联数据集', - customType: ['db', 'sql', 'excel'], + customType: ['db', 'sql', 'excel', 'api'], selectDsDialog: false, // 弹框临时选中的数据集 tempDs: {}, From 3851f2d4caf6ed140cea36dc25a87319a342291b Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 2 Mar 2022 17:21:40 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E8=A1=8C=E5=88=97=E6=9D=83=E9=99=90?= =?UTF-8?q?=E7=9A=84API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugins/server/ColumnPermissionsController.java | 8 ++++---- .../dataease/plugins/server/RowPermissionsController.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/backend/src/main/java/io/dataease/plugins/server/ColumnPermissionsController.java b/backend/src/main/java/io/dataease/plugins/server/ColumnPermissionsController.java index 714e6b8d36..621750a2ae 100644 --- a/backend/src/main/java/io/dataease/plugins/server/ColumnPermissionsController.java +++ b/backend/src/main/java/io/dataease/plugins/server/ColumnPermissionsController.java @@ -64,12 +64,12 @@ public class ColumnPermissionsController { return columnPermissionService.searchPermissions(request); } - @DePermission(type = DePermissionType.DATASET, level = ResourceAuthLevel.DATASET_LEVEL_MANAGE) + @DePermission(type = DePermissionType.DATASET, value = "datasetId", level = ResourceAuthLevel.DATASET_LEVEL_MANAGE) @ApiOperation("删除") - @PostMapping("/delete/{id}") - public void delete(@PathVariable String id) { + @PostMapping("/delete") + public void delete(@RequestBody DatasetColumnPermissions datasetColumnPermissions) { ColumnPermissionService columnPermissionService = SpringContextUtil.getBean(ColumnPermissionService.class); - columnPermissionService.delete(id); + columnPermissionService.delete(datasetColumnPermissions.getId()); } @DePermission(type = DePermissionType.DATASET, level = ResourceAuthLevel.DATASET_LEVEL_MANAGE) diff --git a/backend/src/main/java/io/dataease/plugins/server/RowPermissionsController.java b/backend/src/main/java/io/dataease/plugins/server/RowPermissionsController.java index 25b3276e0f..b9d4ef1ea6 100644 --- a/backend/src/main/java/io/dataease/plugins/server/RowPermissionsController.java +++ b/backend/src/main/java/io/dataease/plugins/server/RowPermissionsController.java @@ -62,12 +62,12 @@ public class RowPermissionsController { return rowPermissionService.searchRowPermissions(request); } - @DePermission(type = DePermissionType.DATASET, level = ResourceAuthLevel.DATASET_LEVEL_MANAGE) + @DePermission(type = DePermissionType.DATASET, value = "datasetId", level = ResourceAuthLevel.DATASET_LEVEL_MANAGE) @ApiOperation("删除") - @PostMapping("/delete/{id}") - public void dataSetRowPermissionInfo(@PathVariable String id) { + @PostMapping("/delete") + public void dataSetRowPermissionInfo(@RequestBody DatasetRowPermissions datasetRowPermissions) { RowPermissionService rowPermissionService = SpringContextUtil.getBean(RowPermissionService.class); - rowPermissionService.delete(id); + rowPermissionService.delete(datasetRowPermissions.getId()); } @DePermission(type = DePermissionType.DATASET, value = "datasetId", level = ResourceAuthLevel.DATASET_LEVEL_MANAGE) From 3d4e33c8cae194cb4918f4efe062ab08022607c3 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 2 Mar 2022 17:49:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E5=88=9B=E5=BB=BA=E5=85=B3=E8=81=94?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E6=97=B6=EF=BC=8C=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E7=A9=BA=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/authModel/VAuthModelService.java | 21 +++++-------------- frontend/src/views/dataset/add/AddUnion.vue | 4 ++-- .../src/views/dataset/add/union/NodeItem.vue | 6 +++--- .../src/views/system/task/DatasetTaskList.vue | 2 +- 4 files changed, 11 insertions(+), 22 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/authModel/VAuthModelService.java b/backend/src/main/java/io/dataease/service/authModel/VAuthModelService.java index 7bb93527ac..6aeffd908a 100644 --- a/backend/src/main/java/io/dataease/service/authModel/VAuthModelService.java +++ b/backend/src/main/java/io/dataease/service/authModel/VAuthModelService.java @@ -26,14 +26,12 @@ public class VAuthModelService { public List queryAuthModel(VAuthModelRequest request) { request.setUserId(String.valueOf(AuthUtils.getUser().getUserId())); - // 定时任务选数据集时，列表需去除空目录 - if (request.isClearEmptyDir()) { - request.setMode(null); - } List result = extVAuthModelMapper.queryAuthModel(request); - // 定时任务选数据集时，列表需去除空目录 + + if (request.getPrivileges() != null) { + result = filterPrivileges(request, result); + } if (request.isClearEmptyDir()) { - result = filterData(request, result); List vAuthModelDTOS = TreeUtils.mergeTree(result); setAllLeafs(vAuthModelDTOS); removeEmptyDir(vAuthModelDTOS); @@ -42,16 +40,7 @@ public class VAuthModelService { return TreeUtils.mergeTree(result); } - private List filterData(VAuthModelRequest request, List result) { - if (request.getDatasetMode() != null && request.getDatasetMode() == 1) { - result = result.stream().filter(vAuthModelDTO -> { - if (vAuthModelDTO.getNodeType().equalsIgnoreCase("spine") || (vAuthModelDTO.getNodeType().equalsIgnoreCase("leaf") && vAuthModelDTO.getMode().equals(1L)) && !vAuthModelDTO.getModelInnerType().equalsIgnoreCase("excel") && !vAuthModelDTO.getModelInnerType().equalsIgnoreCase("custom") && !vAuthModelDTO.getModelInnerType().equalsIgnoreCase("union")) { - return true; - } else { - return false; - } - }).collect(Collectors.toList()); - } + private List filterPrivileges(VAuthModelRequest request, List result) { if (request.getPrivileges() != null) { result = result.stream().filter(vAuthModelDTO -> { if (vAuthModelDTO.getNodeType().equalsIgnoreCase("spine") || (vAuthModelDTO.getNodeType().equalsIgnoreCase("leaf") && vAuthModelDTO.getPrivileges() != null && vAuthModelDTO.getPrivileges().contains(request.getPrivileges()))) { diff --git a/frontend/src/views/dataset/add/AddUnion.vue b/frontend/src/views/dataset/add/AddUnion.vue index 83212808f6..5d73a9ae08 100644 --- a/frontend/src/views/dataset/add/AddUnion.vue +++ b/frontend/src/views/dataset/add/AddUnion.vue @@ -60,7 +60,7 @@ - +
{{ $t('dataset.cancel') }} {{ $t('dataset.confirm') }} @@ -185,7 +185,7 @@ export default { mode: this.dataset[0].currentDs.mode, info: '{"union":' + JSON.stringify(this.dataset) + '}' } - post('/dataset/table/update', table).then(response => { + post('/dataset/table/updateUnion', table).then(response => { this.$emit('saveSuccess', table) this.cancel() }) diff --git a/frontend/src/views/dataset/add/union/NodeItem.vue b/frontend/src/views/dataset/add/union/NodeItem.vue index fb4d005750..e5857135f6 100644 --- a/frontend/src/views/dataset/add/union/NodeItem.vue +++ b/frontend/src/views/dataset/add/union/NodeItem.vue @@ -29,7 +29,7 @@ - +
{{ $t('dataset.cancel') }} {{ $t('dataset.confirm') }} @@ -79,7 +79,7 @@ export default { }, allChildCount: 0 }, - customType: ['db', 'sql', 'excel'], + customType: ['db', 'sql', 'excel', 'api'], selectDsDialog: false, // 弹框临时选中的数据集 tempDs: {}, @@ -129,7 +129,7 @@ export default { selectDs() { // 根据父级node，过滤不同的数据集 if (this.currentNode.currentDs.mode === 1) { - this.customType = ['db', 'sql', 'excel'] + this.customType = ['db', 'sql', 'excel', 'api'] } else if (this.currentNode.currentDs.mode === 0) { if (this.currentNode.currentDs.modelInnerType === 'db') { this.customType = ['db'] diff --git a/frontend/src/views/system/task/DatasetTaskList.vue b/frontend/src/views/system/task/DatasetTaskList.vue index 9021126c82..3fd288f7db 100644 --- a/frontend/src/views/system/task/DatasetTaskList.vue +++ b/frontend/src/views/system/task/DatasetTaskList.vue @@ -340,7 +340,7 @@ export default { { required: true, message: this.$t('dataset.required'), trigger: 'change' } ] }, - customType: ['db', 'sql'] + customType: ['db', 'sql', 'api'] } }, computed: {