From d39358ecec52418b20afb914b985543b6ed8c07d Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 25 Jul 2022 17:23:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(=E6=95=B0=E6=8D=AE=E9=9B=86):=20?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E5=88=97=E6=9D=83=E9=99=90=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E7=99=BD=E5=90=8D=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/dataset/PermissionService.java | 21 +++++++++++++++++-- .../main/resources/db/migration/V38__1.13.sql | 2 ++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/dataset/PermissionService.java b/backend/src/main/java/io/dataease/service/dataset/PermissionService.java index 24dc2dca26..6ef55b9604 100644 --- a/backend/src/main/java/io/dataease/service/dataset/PermissionService.java +++ b/backend/src/main/java/io/dataease/service/dataset/PermissionService.java @@ -169,12 +169,29 @@ public class PermissionService { dataSetColumnPermissionsDTO.setAuthTargetIds(Collections.singletonList(userId)); dataSetColumnPermissionsDTO.setAuthTargetType("user"); datasetColumnPermissions.addAll(columnPermissionService.searchPermissions(dataSetColumnPermissionsDTO)); + dataSetColumnPermissionsDTO.setAuthTargetIds(roleIds); dataSetColumnPermissionsDTO.setAuthTargetType("role"); - datasetColumnPermissions.addAll(columnPermissionService.searchPermissions(dataSetColumnPermissionsDTO)); + List roleColumnPermissionsDTOS = new ArrayList<>(); + for (DataSetColumnPermissionsDTO columnPermissionsDTO : columnPermissionService.searchPermissions(dataSetColumnPermissionsDTO)) { + columnPermissionsDTO.getWhiteListUser(); + List userIdList = new Gson().fromJson(columnPermissionsDTO.getWhiteListUser(), new TypeToken>() {}.getType()); + if(!userIdList.contains(userId)){ + roleColumnPermissionsDTOS.add(columnPermissionsDTO); + } + } + datasetColumnPermissions.addAll(roleColumnPermissionsDTOS); + dataSetColumnPermissionsDTO.setAuthTargetIds(Collections.singletonList(deptId)); dataSetColumnPermissionsDTO.setAuthTargetType("dept"); - datasetColumnPermissions.addAll(columnPermissionService.searchPermissions(dataSetColumnPermissionsDTO)); + List deptColumnPermissionsDTOS = new ArrayList<>(); + for (DataSetColumnPermissionsDTO columnPermissionsDTO : columnPermissionService.searchPermissions(dataSetColumnPermissionsDTO)) { + List userIdList = new Gson().fromJson(columnPermissionsDTO.getWhiteListUser(), new TypeToken>() {}.getType()); + if(!userIdList.contains(userId)){ + deptColumnPermissionsDTOS.add(columnPermissionsDTO); + } + } + datasetColumnPermissions.addAll(deptColumnPermissionsDTOS); return datasetColumnPermissions; } diff --git a/backend/src/main/resources/db/migration/V38__1.13.sql b/backend/src/main/resources/db/migration/V38__1.13.sql index 4d771988dd..943be293a4 100644 --- a/backend/src/main/resources/db/migration/V38__1.13.sql +++ b/backend/src/main/resources/db/migration/V38__1.13.sql @@ -71,3 +71,5 @@ INSERT INTO `sys_menu` (`menu_id`, `pid`, `sub_count`, `type`, `title`, `name`, INSERT INTO `system_parameter` (`param_key`, `param_value`, `type`, `sort`) VALUES ('basic.templateAccessKey', 'dataease', 'text', NULL); INSERT INTO `system_parameter` (`param_key`, `param_value`, `type`, `sort`) VALUES ('basic.templateMarketUlr', 'https://dataease.io/templates', 'text', 4); + +ALTER TABLE `dataset_column_permissions` ADD COLUMN `white_list_user` longtext DEFAULT NULL COMMENT '白名单' AFTER `permissions` ; \ No newline at end of file From 16da8f4a7eabbe8a86cbdb0ddb9035d4edf9b52c Mon Sep 17 00:00:00 2001 From: junjun Date: Mon, 25 Jul 2022 17:47:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(=E8=A7=86=E5=9B=BE):=20=E6=A0=87?= =?UTF-8?q?=E9=A2=98=E6=94=AF=E6=8C=81=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/main.js | 4 +++ frontend/src/views/chart/view/TitleRemark.vue | 26 +++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/frontend/src/main.js b/frontend/src/main.js index dc94902478..bc30338344 100644 --- a/frontend/src/main.js +++ b/frontend/src/main.js @@ -23,6 +23,8 @@ import './utils/dialog' import DeComplexInput from '@/components/business/condition-table/DeComplexInput' import DeComplexSelect from '@/components/business/condition-table/DeComplexSelect' import DeViewSelect from '@/components/DeViewSelect' +import RemarkEditor from '@/views/chart/components/component-style/dialog/RemarkEditor' +import TitleRemark from '@/views/chart/view/TitleRemark' import '@/components/canvas/custom-component' // 注册自定义组件 import '@/utils/DateUtil' @@ -90,6 +92,8 @@ Vue.component('Treeselect', Treeselect) Vue.component('DeComplexInput', DeComplexInput) Vue.component('DeComplexSelect', DeComplexSelect) Vue.component('DeViewSelect', DeViewSelect) +Vue.component('RemarkEditor', RemarkEditor) +Vue.component('TitleRemark', TitleRemark) Vue.config.productionTip = false import vueToPdf from 'vue-to-pdf' diff --git a/frontend/src/views/chart/view/TitleRemark.vue b/frontend/src/views/chart/view/TitleRemark.vue index 1bb961df47..409f13ba5a 100644 --- a/frontend/src/views/chart/view/TitleRemark.vue +++ b/frontend/src/views/chart/view/TitleRemark.vue @@ -33,6 +33,32 @@ export default { padding: 10px; border-radius: 4px; } +::-webkit-scrollbar { + width: 0px!important; + height: 0px!important; +} +::v-deep ol { + display: block!important; + list-style-type: decimal; + margin-block-start: 1em!important; + margin-block-end: 1em!important; + margin-inline-start: 0px!important; + margin-inline-end: 0px!important; + padding-inline-start: 40px!important; +} +::v-deep ul { + display: block!important; + list-style-type: disc; + margin-block-start: 1em!important; + margin-block-end: 1em!important; + margin-inline-start: 0px!important; + margin-inline-end: 0px!important; + padding-inline-start: 40px!important; +} +::v-deep li { + display: list-item!important; + text-align: -webkit-match-parent!important; +}