From ab6022e29b4e0aee1ccadd4ce32b7ede06343afc Mon Sep 17 00:00:00 2001 From: junjun Date: Mon, 24 Jun 2024 15:01:10 +0800 Subject: [PATCH 1/4] =?UTF-8?q?refactor(=E8=A7=86=E5=9B=BE):=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=90=8C=E7=8E=AF=E6=AF=94=E6=97=A5=E6=9C=9F=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E8=BF=87=E6=BB=A4=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/service/chart/ChartViewService.java | 6 +++++- .../plugins/common/request/chart/ChartExtFilterRequest.java | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java index 0223656212..83828f608c 100644 --- a/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java +++ b/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java @@ -856,6 +856,7 @@ public class ChartViewService { ChartExtFilterRequest filterRequest = new ChartExtFilterRequest(); BeanUtils.copyBean(filterRequest, request); filterRequest.setDatasetTableFieldList(new ArrayList<>()); + filterRequest.setFilterType(0); for (String fId : fieldIds) { DatasetTableField datasetTableField = dataSetTableFieldsService.get(fId); if (datasetTableField == null) { @@ -881,6 +882,7 @@ public class ChartViewService { ChartExtFilterRequest filterRequest = new ChartExtFilterRequest(); BeanUtils.copyBean(filterRequest, request); filterRequest.setFieldId(fId); + filterRequest.setFilterType(0); DatasetTableField datasetTableField = dataSetTableFieldsService.get(fId); if (datasetTableField == null) { @@ -921,6 +923,7 @@ public class ChartViewService { DatasetTableField datasetTableField = dataSetTableFieldsService.get(request.getFieldId()); if (!desensitizationList.keySet().contains(datasetTableField.getDataeaseName()) && dataeaseNames.contains(datasetTableField.getDataeaseName())) { request.setDatasetTableField(datasetTableField); + request.setFilterType(2); if (StringUtils.equalsIgnoreCase(datasetTableField.getTableId(), view.getTableId())) { // 设置日期格式，以视图字段设置的格式为准，先不处理组件的条件，因为格式无法统一。 if (request.getDatasetTableField() != null) { @@ -1026,6 +1029,7 @@ public class ChartViewService { tmpFilter.setDatePattern(chartFieldMap.get(tmpField.getId()).getDatePattern()); tmpFilter.setFieldId(tmpField.getId()); tmpFilter.setValue(Collections.singletonList(dimValMap.get(tmpField.getId()))); + tmpFilter.setFilterType(1); extFilterList.add(tmpFilter); drillFilters.add(tmpFilter); } @@ -1105,7 +1109,7 @@ public class ChartViewService { if (StringUtils.isNotEmpty(compareCalc.getType()) && !StringUtils.equalsIgnoreCase(compareCalc.getType(), "none")) { if (Arrays.asList(ChartConstants.M_Y).contains(compareCalc.getType())) { - if (StringUtils.equalsIgnoreCase(compareCalc.getField() + "", filterDTO.getFieldId())) { + if (StringUtils.equalsIgnoreCase(compareCalc.getField() + "", filterDTO.getFieldId()) && filterDTO.getFilterType() == 0) { // -1 year try { Calendar calendar = Calendar.getInstance(); diff --git a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/request/chart/ChartExtFilterRequest.java b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/request/chart/ChartExtFilterRequest.java index dda48476c6..fec0a39840 100644 --- a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/request/chart/ChartExtFilterRequest.java +++ b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/request/chart/ChartExtFilterRequest.java @@ -36,4 +36,6 @@ public class ChartExtFilterRequest { private String dateStyle; @ApiModelProperty("日期格式") private String datePattern; + @ApiModelProperty("过滤类型") + private int filterType;// 0-过滤组件，1-下钻，2-联动，外部参数 } From c4c71bebc3ab7966fbef3f7ae761ad6450eb3024 Mon Sep 17 00:00:00 2001 From: wisonic-s Date: Mon, 24 Jun 2024 18:05:53 +0800 Subject: [PATCH 2/4] =?UTF-8?q?refactor(=E8=A7=86=E5=9B=BE):=20=E5=8E=BB?= =?UTF-8?q?=E9=99=A4=20AntV=20=E6=8F=90=E7=A4=BA=E5=8F=B3=E4=B8=8B?= =?UTF-8?q?=E8=A7=92=E5=B0=8F=E7=99=BD=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/frontend/src/views/chart/chart/common/common_antv.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/frontend/src/views/chart/chart/common/common_antv.js b/core/frontend/src/views/chart/chart/common/common_antv.js index d6bc4d671f..6d98328aea 100644 --- a/core/frontend/src/views/chart/chart/common/common_antv.js +++ b/core/frontend/src/views/chart/chart/common/common_antv.js @@ -1214,7 +1214,7 @@ export function getTooltipContainer(id) { g2Tooltip.classList.add('g2-tooltip') // 最多半屏，鼠标移入可滚动 g2Tooltip.style.maxHeight = '50%' - g2Tooltip.style.overflow = 'scroll' + g2Tooltip.style.overflowY = 'scroll' g2Tooltip.style.display = 'none' g2Tooltip.style.position = 'fixed' g2Tooltip.style.left = '0px' From db0b9dbdf636a65aef544de0cfc30b3b9b9f164c Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 25 Jun 2024 10:13:44 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E6=9C=AA=E5=AE=8C=E6=88=90=E7=9A=84=E8=A7=86=E5=9B=BE=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=20Excel=20=E4=BB=BB=E5=8A=A1=E4=BC=9A=E5=AF=BC?= =?UTF-8?q?=E8=87=B4de=20=E6=97=A0=E6=B3=95=E5=90=AF=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/exportCenter/ExportCenterService.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/core/backend/src/main/java/io/dataease/service/exportCenter/ExportCenterService.java b/core/backend/src/main/java/io/dataease/service/exportCenter/ExportCenterService.java index dfdf62e4ec..4e456f9c2e 100644 --- a/core/backend/src/main/java/io/dataease/service/exportCenter/ExportCenterService.java +++ b/core/backend/src/main/java/io/dataease/service/exportCenter/ExportCenterService.java @@ -3,6 +3,7 @@ package io.dataease.service.exportCenter; import com.google.gson.Gson; import io.dataease.auth.api.dto.CurrentUserDto; import io.dataease.auth.service.AuthUserService; +import io.dataease.auth.service.ProxyAuthService; import io.dataease.commons.constants.ParamConstants; import io.dataease.commons.constants.SysLogConstants; import io.dataease.commons.utils.*; @@ -126,7 +127,7 @@ public class ExportCenterService { private int keepAliveSeconds = 600; private Map Running_Task = new HashMap<>(); @Resource - private AuthUserService authUserService; + private ProxyAuthService proxyAuthService; @Autowired private WsService wsService; @@ -399,9 +400,9 @@ public class ExportCenterService { String dataPath = exportData_path + exportTask.getId(); File directory = new File(dataPath); boolean isCreated = directory.mkdir(); - CurrentUserDto currentUserDto = (CurrentUserDto) authUserService.getUserById(exportTask.getUserId()); + CurrentUserDto user = proxyAuthService.queryCacheUserDto(exportTask.getUserId()); Future future = scheduledThreadPoolExecutor.submit(() -> { - AuthUtils.setUser(currentUserDto); + AuthUtils.setUser(user); try { exportTask.setExportStatus("IN_PROGRESS"); exportTaskMapper.updateByPrimaryKey(exportTask); @@ -555,7 +556,7 @@ public class ExportCenterService { } wb.close(); - if (ObjectUtils.isNotEmpty(currentUserDto)) { + if (ObjectUtils.isNotEmpty(user)) { String viewId = request.getViewId(); ChartViewWithBLOBs chartViewWithBLOBs = chartViewService.get(viewId); String pid = chartViewWithBLOBs.getSceneId(); @@ -598,7 +599,8 @@ public class ExportCenterService { String dataPath = exportData_path + exportTask.getId(); File directory = new File(dataPath); boolean isCreated = directory.mkdir(); - CurrentUserDto user = (CurrentUserDto) authUserService.getUserById(exportTask.getUserId()); + CurrentUserDto user = proxyAuthService.queryCacheUserDto(exportTask.getUserId()); + Future future = scheduledThreadPoolExecutor.submit(() -> { AuthUtils.setUser(user); try { From 4d63c6b757f88943b7050a1257f423ce4ef00286 Mon Sep 17 00:00:00 2001 From: fit2cloudrd Date: Tue, 25 Jun 2024 14:00:53 +0800 Subject: [PATCH 4/4] =?UTF-8?q?refactor:=20=E8=B0=83=E6=95=B4=20healthchec?= =?UTF-8?q?k=20=E6=A3=80=E6=B5=8B=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 75a8b9cf20..067f1bc8ec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,11 +13,10 @@ ADD plugins/default/ /opt/dataease/plugins/default/ ADD core/backend/target/backend-$IMAGE_TAG.jar /opt/apps ENV JAVA_APP_JAR=/opt/apps/backend-$IMAGE_TAG.jar - ENV AB_OFF=true - ENV JAVA_OPTIONS=-Dfile.encoding=utf-8 +ENV RUNNING_PORT=8081 -HEALTHCHECK --interval=15s --timeout=5s --retries=20 --start-period=30s CMD curl -f 127.0.0.1:8081 +HEALTHCHECK --interval=15s --timeout=5s --retries=20 --start-period=30s CMD nc -zv 127.0.0.1 $RUNNING_PORT CMD ["/deployments/run-java.sh"]