From d4eb6266d9b645f012196700abf8909888aea23e Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 28 Nov 2022 21:01:04 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E6=A0=A1=E9=AA=8C=E6=8F=8F=E8=BF=B0?= =?UTF-8?q?=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/system/datasource/DsForm.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/system/datasource/DsForm.vue b/frontend/src/views/system/datasource/DsForm.vue index d8227cf5bb..ff73aeeccf 100644 --- a/frontend/src/views/system/datasource/DsForm.vue +++ b/frontend/src/views/system/datasource/DsForm.vue @@ -385,8 +385,8 @@ export default { desc: [ { min: 0, - max: 200, - message: i18n.t('datasource.input_limit', { num: '0~200' }), + max: 50, + message: i18n.t('datasource.input_limit', { num: '0~50' }), trigger: 'blur' } ], From 72026e9a6a454e0bae7d4e4030d2a98047a0d787 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 28 Nov 2022 22:31:26 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E8=84=B1=E6=95=8F=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/chart/util/ChartDataBuild.java | 2 +- .../service/dataset/PermissionService.java | 57 ++++++++++++------- .../src/main/resources/application.properties | 23 +------- frontend/src/views/dataset/data/ViewTable.vue | 6 +- 4 files changed, 38 insertions(+), 50 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java b/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java index 2e50a71a12..71e32cb73f 100644 --- a/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java +++ b/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java @@ -1011,7 +1011,7 @@ public class ChartDataBuild { } else { switch (columnPermissionItem.getDesensitizationRule().getCustomBuiltInRule()) { case RetainBeforeMAndAfterN: - if (StringUtils.isEmpty(originStr) || originStr.length() < columnPermissionItem.getDesensitizationRule().getM() + columnPermissionItem.getDesensitizationRule().getN() + 1) { + if (StringUtils.isEmpty(originStr) || originStr.length() <= columnPermissionItem.getDesensitizationRule().getM() + columnPermissionItem.getDesensitizationRule().getN() + 1) { desensitizationStr = String.join("", Collections.nCopies(columnPermissionItem.getDesensitizationRule().getM(), "X")) + "***" + String.join("", Collections.nCopies(columnPermissionItem.getDesensitizationRule().getN(), "X")); } else { desensitizationStr = StringUtils.substring(originStr, 0, columnPermissionItem.getDesensitizationRule().getM() - 1) + "***" + StringUtils.substring(originStr, originStr.length() - columnPermissionItem.getDesensitizationRule().getN(), originStr.length() - 1); 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 add7270d39..77fba010d0 100644 --- a/backend/src/main/java/io/dataease/service/dataset/PermissionService.java +++ b/backend/src/main/java/io/dataease/service/dataset/PermissionService.java @@ -13,6 +13,7 @@ import io.dataease.plugins.common.dto.chart.ChartCustomFilterItemDTO; import io.dataease.plugins.common.dto.chart.ChartFieldCustomFilterDTO; import io.dataease.plugins.config.SpringContextUtil; import io.dataease.plugins.xpack.auth.dto.request.*; +import io.dataease.plugins.xpack.auth.dto.response.Item; import io.dataease.plugins.xpack.auth.service.ColumnPermissionService; import io.dataease.plugins.xpack.auth.service.RowPermissionService; import org.apache.commons.collections4.CollectionUtils; @@ -112,14 +113,14 @@ public class PermissionService { } if (CollectionUtils.isNotEmpty(fieldRoleColumnPermissionItems)) { if (fieldRoleColumnPermissionItems.stream().map(ColumnPermissionItem::getOpt).collect(Collectors.toList()).contains(ColumnPermissionConstants.Desensitization)) { - desensitizationList.put(field.getDataeaseName(), fieldUserColumnPermissionItems.get(0)); + desensitizationList.put(field.getDataeaseName(), fieldRoleColumnPermissionItems.get(0)); result.add(field); } return; } if (CollectionUtils.isNotEmpty(fieldDeptColumnPermissionItems)) { if (fieldDeptColumnPermissionItems.stream().map(ColumnPermissionItem::getOpt).collect(Collectors.toList()).contains(ColumnPermissionConstants.Desensitization)) { - desensitizationList.put(field.getDataeaseName(), fieldUserColumnPermissionItems.get(0)); + desensitizationList.put(field.getDataeaseName(), fieldDeptColumnPermissionItems.get(0)); result.add(field); } return; @@ -209,34 +210,46 @@ public class PermissionService { dataSetColumnPermissionsDTO.setAuthTargetType("user"); datasetColumnPermissions.addAll(columnPermissionService.searchPermissions(dataSetColumnPermissionsDTO)); if (CollectionUtils.isNotEmpty(roleIds)) { - dataSetColumnPermissionsDTO.setAuthTargetIds(roleIds); - dataSetColumnPermissionsDTO.setAuthTargetType("role"); - List roleColumnPermissionsDTOS = new ArrayList<>(); - for (DataSetColumnPermissionsDTO columnPermissionsDTO : columnPermissionService.searchPermissions(dataSetColumnPermissionsDTO)) { - columnPermissionsDTO.getWhiteListUser(); - List userIdList = new Gson().fromJson(columnPermissionsDTO.getWhiteListUser(), new TypeToken>() { - }.getType()); - if (CollectionUtils.isEmpty(userIdList) || !userIdList.contains(userId)) { - roleColumnPermissionsDTOS.add(columnPermissionsDTO); + DataSetColumnPermissionsDTO request = new DataSetColumnPermissionsDTO(); + request.setDatasetId(datasetId); + request.setAuthTargetType("role"); + List items = (List)columnPermissionService.authObjs(request); + roleIds = roleIds.stream().filter(id -> {return items.stream().map(Item::getId).collect(Collectors.toList()).contains(id);}).collect(Collectors.toList()); + if(CollectionUtils.isNotEmpty(roleIds)){ + dataSetColumnPermissionsDTO.setAuthTargetIds(roleIds); + dataSetColumnPermissionsDTO.setAuthTargetType("role"); + List roleColumnPermissionsDTOS = new ArrayList<>(); + for (DataSetColumnPermissionsDTO columnPermissionsDTO : columnPermissionService.searchPermissions(dataSetColumnPermissionsDTO)) { + columnPermissionsDTO.getWhiteListUser(); + List userIdList = new Gson().fromJson(columnPermissionsDTO.getWhiteListUser(), new TypeToken>() { + }.getType()); + if (CollectionUtils.isEmpty(userIdList) || !userIdList.contains(userId)) { + roleColumnPermissionsDTOS.add(columnPermissionsDTO); + } } + datasetColumnPermissions.addAll(roleColumnPermissionsDTOS); } - datasetColumnPermissions.addAll(roleColumnPermissionsDTOS); } if (deptId != null) { - dataSetColumnPermissionsDTO.setAuthTargetIds(Collections.singletonList(deptId)); - dataSetColumnPermissionsDTO.setAuthTargetType("dept"); - List deptColumnPermissionsDTOS = new ArrayList<>(); - for (DataSetColumnPermissionsDTO columnPermissionsDTO : columnPermissionService.searchPermissions(dataSetColumnPermissionsDTO)) { - List userIdList = new Gson().fromJson(columnPermissionsDTO.getWhiteListUser(), new TypeToken>() { - }.getType()); - if (CollectionUtils.isEmpty(userIdList) || !userIdList.contains(userId)) { - deptColumnPermissionsDTOS.add(columnPermissionsDTO); + DataSetColumnPermissionsDTO request = new DataSetColumnPermissionsDTO(); + request.setDatasetId(datasetId); + request.setAuthTargetType("dept"); + List items = (List)columnPermissionService.authObjs(request); + if(items.stream().map(Item::getId).collect(Collectors.toList()).contains(deptId)){ + dataSetColumnPermissionsDTO.setAuthTargetIds(Collections.singletonList(deptId)); + dataSetColumnPermissionsDTO.setAuthTargetType("dept"); + List deptColumnPermissionsDTOS = new ArrayList<>(); + for (DataSetColumnPermissionsDTO columnPermissionsDTO : columnPermissionService.searchPermissions(dataSetColumnPermissionsDTO)) { + List userIdList = new Gson().fromJson(columnPermissionsDTO.getWhiteListUser(), new TypeToken>() { + }.getType()); + if (CollectionUtils.isEmpty(userIdList) || !userIdList.contains(userId)) { + deptColumnPermissionsDTOS.add(columnPermissionsDTO); + } } + datasetColumnPermissions.addAll(deptColumnPermissionsDTOS); } - datasetColumnPermissions.addAll(deptColumnPermissionsDTOS); } - return datasetColumnPermissions; } diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties index bc8f5acbb8..e2095991b5 100644 --- a/backend/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -73,28 +73,7 @@ dataease.sqlinjection.whitelists=/dataset/table/sqlPreview,/dataset/table/update server.compression.enabled=true server.compression.mime-types=application/javascript,text/css,application/json,application/xml,text/html,text/xml,text/plain server.compression.min-response-size=1024 -#\u4E0B\u9762\u7684\u914D\u7F6E\u65B0\u589E\u5230/opt/dataease/conf/dataease/properties -#\u7F13\u5B58\u7C7B\u578B -##spring.cache.type=redis -#spring.cache.type=ehcache -#redis\u516C\u5171\u914D\u7F6E -#spring.redis.timeout=10000 -#spring.redis.lettuce.pool.max-active=8 -#spring.redis.lettuce.pool.max-wait=-1 -#spring.redis.lettuce.pool.max-idle=8 -#\u5355\u673A\u6A21\u5F0Fredis\u914D\u7F6E -#spring.redis.database=0 -#spring.redis.host=192.168.0.110 -#spring.redis.port=6379 -#spring.redis.password=DataEase_ZNB@REDIS -#\u54E8\u5175\u6A21\u5F0Fredis\u914D\u7F6E -#spring.redis.sentinel.master=mymaster -#spring.redis.sentinel.nodes=192.168.0.110:26379,192.168.0.110:26380,192.168.0.110:26381 -#spring.redis.sentinel.password= -#cluster\u6A21\u5F0Fredis\u914D\u7F6E -#spring.redis.cluster.nodes=192.168.0.110:7001,192.168.0.110:7002,192.168.0.110:7003,192.168.0.110:7004,192.168.0.110:7005,192.168.0.110:7006 -#spring.redis.cluster.max-redirects=3 -#spring.redis.password=DataEase_ZNB@REDIS + server.servlet.context-parameters.configurationStrategy=SYSTEM_PROPERTIES server.servlet.session.cookie.http-only=true server.servlet.session.tracking-modes=cookie diff --git a/frontend/src/views/dataset/data/ViewTable.vue b/frontend/src/views/dataset/data/ViewTable.vue index efc676bbd2..72c9a87188 100644 --- a/frontend/src/views/dataset/data/ViewTable.vue +++ b/frontend/src/views/dataset/data/ViewTable.vue @@ -462,11 +462,7 @@ export default { tabClick() { if (this.tabActive === 'dataPreview') { - const reload = localStorage.getItem('reloadDsData') - if (reload === 'true') { - localStorage.setItem('reloadDsData', 'false') - this.initTable(this.param.id) - } + this.initTable(this.param.id) } }, From c52dc9a2dfdb03285e9975f2d0a9b8ef0fbb043c Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 28 Nov 2022 23:08:27 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/dataset/data/UpdateInfo.vue | 20 ++-- .../src/views/system/task/DatasetTaskList.vue | 112 ++++++++++-------- 2 files changed, 73 insertions(+), 59 deletions(-) diff --git a/frontend/src/views/dataset/data/UpdateInfo.vue b/frontend/src/views/dataset/data/UpdateInfo.vue index a44ebedf1f..fc9075b9d7 100644 --- a/frontend/src/views/dataset/data/UpdateInfo.vue +++ b/frontend/src/views/dataset/data/UpdateInfo.vue @@ -136,7 +136,7 @@ key="__operation" :label="$t('commons.operating')" fixed="right" - min-width="100" + min-width="180" >