From 8bd43a30a61e7e993c074e7cda220b5f4337cd46 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 2 Sep 2024 15:52:57 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=87=BA):?= =?UTF-8?q?=20=E5=AF=BC=E5=87=BA=E6=98=8E=E7=BB=86=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/chart/server/ChartDataServer.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java b/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java index 1f962c6b72..cdfc29206b 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java +++ b/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java @@ -9,6 +9,7 @@ import io.dataease.chart.constant.ChartConstants; import io.dataease.chart.manage.ChartDataManage; import io.dataease.constant.AuthConstant; import io.dataease.constant.CommonConstants; +import io.dataease.dataset.manage.PermissionManage; import io.dataease.dataset.server.DatasetFieldServer; import io.dataease.engine.constant.DeTypeConstants; import io.dataease.exception.DEException; @@ -38,7 +39,9 @@ import org.springframework.web.context.request.ServletRequestAttributes; import java.io.OutputStream; import java.util.ArrayList; import java.util.Arrays; +import java.util.HashMap; import java.util.List; +import java.util.stream.Collectors; /** * @Author Junjun @@ -55,7 +58,8 @@ public class ChartDataServer implements ChartDataApi { private VisualizationTemplateExtendDataManage extendDataManage; @Value("${export.views.limit:500000}") private Integer limit; - + @Resource + private PermissionManage permissionManage; @Resource private DatasetFieldServer datasetFieldServer; @@ -84,15 +88,17 @@ public class ChartDataServer implements ChartDataApi { if ("dataset".equals(request.getDownloadType())) { viewDTO.setType("table-info"); List sourceFields = datasetFieldServer.listByDatasetGroup(viewDTO.getTableId()); + List fileNames = permissionManage.filterColumnPermissions(sourceFields, new HashMap<>(), viewDTO.getTableId(), null).stream().map(DatasetTableFieldDTO::getDataeaseName).collect(Collectors.toList()); + sourceFields = sourceFields.stream().filter(datasetTableFieldDTO -> fileNames.contains(datasetTableFieldDTO.getDataeaseName())).collect(Collectors.toList()); dsHeader = sourceFields.stream() .map(DatasetTableFieldDTO::getName) .toArray(String[]::new); dsTypes = sourceFields.stream() .map(DatasetTableFieldDTO::getDeType) .toArray(Integer[]::new); - TypeReference> listTypeReference = new TypeReference>(){ + TypeReference> listTypeReference = new TypeReference>() { }; - viewDTO.setXAxis(JsonUtil.parseList(JsonUtil.toJSONString(sourceFields).toString(),listTypeReference)); + viewDTO.setXAxis(JsonUtil.parseList(JsonUtil.toJSONString(sourceFields).toString(), listTypeReference)); } if (ChartConstants.VIEW_RESULT_MODE.CUSTOM.equals(viewDTO.getResultMode())) { Integer limitCount = viewDTO.getResultCount(); From 011bb5bfb638dbf595c1a4b952952cf0c6722ed7 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 2 Sep 2024 16:03:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=87=BA):?= =?UTF-8?q?=20=E5=AF=BC=E5=87=BA=E6=98=8E=E7=BB=86=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/views/visualized/data/dataset/index.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/core/core-frontend/src/views/visualized/data/dataset/index.vue b/core/core-frontend/src/views/visualized/data/dataset/index.vue index 103918e984..52604e9c69 100644 --- a/core/core-frontend/src/views/visualized/data/dataset/index.vue +++ b/core/core-frontend/src/views/visualized/data/dataset/index.vue @@ -335,7 +335,6 @@ const exportDataset = () => { showExport.value = true exportForm.value.name = nodeInfo.name exportForm.value.expressionTree = '' - console.log(computedFiledList) nextTick(() => { rowAuth.value.init({}) rowAuth.value.relationList = [] From 40d321256d690d4cdeb2dab46741bb286beb97a1 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 2 Sep 2024 16:10:24 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20sql=20=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core-backend/src/main/resources/db/migration/V2.10__ddl.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0edcbab71d..34d6ddff6d 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 @@ -69,7 +69,7 @@ alter table `core_chart_view` add ext_color longtext comment '颜色维度field'; update visualization_outer_params_target_view_info tvi INNER JOIN core_chart_view ccv on tvi.target_view_id = ccv.id - set tvi.target_ds_id = ccv.table_id + set tvi.target_ds_id = ccv.table_id; DROP TABLE IF EXISTS `core_font`;