dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #10489 from dataease/dev

Browse Source 
merge v1.18.22
This commit is contained in:
fit2cloudrd 2024-06-25 14:13:41 +08:00 committed by GitHub
commit 1b39b563b6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Dockerfile
View File

@ -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"]

6
core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
View File

@ -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();

12
core/backend/src/main/java/io/dataease/service/exportCenter/ExportCenterService.java
View File

@ -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<String, Future> 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 {

2
core/frontend/src/views/chart/chart/common/common_antv.js
View File

@ -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'

2
sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/request/chart/ChartExtFilterRequest.java
View File

@ -36,4 +36,6 @@ public class ChartExtFilterRequest {
private String dateStyle;
@ApiModelProperty("日期格式")
private String datePattern;
@ApiModelProperty("过滤类型")
private int filterType;// 0-过滤组件，1-下钻，2-联动，外部参数
}