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

Merge pull request #6419 from dataease/pr@dev@fix_map_mark_detail

Browse Source 
fix: echarts地图标记功能详情
This commit is contained in:
fit2cloud-chenyw 2023-10-30 14:28:21 +08:00 committed by GitHub
commit 1b94f40e01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -604,7 +604,7 @@ public class ChartViewService {
List<ChartViewFieldDTO> viewFields = gson.fromJson(view.getViewFields(), tokenType);
final Map<String, List<ChartViewFieldDTO>> extFieldsMap = new LinkedHashMap<>();
if (CollectionUtils.isNotEmpty(viewFields)) {
String[] busiFlagArray = new String[] {"daxis", "locationXaxis", "locationYaxis"};
String[] busiFlagArray = new String[]{"daxis", "locationXaxis", "locationYaxis"};
Map<String, Boolean> flagMap = new HashMap<>();
for (String s : busiFlagArray) {
flagMap.put(s, false);
@ -1069,7 +1069,10 @@ public class ChartViewService {
if (containDetailField(view) && CollectionUtils.isNotEmpty(viewFields)) {
detailFieldList.addAll(xAxis);
detailFieldList.addAll(viewFields);
String resultMode = view.getResultMode();
view.setResultMode(null);
detailFieldSql = qp.getSQLWithPage(true, dataTableInfoDTO.getTable(), detailFieldList, fieldCustomFilter, rowPermissionsTree, extFilterList, ds, view, pageInfo);
view.setResultMode(resultMode);
}
}
} else if (StringUtils.equalsIgnoreCase(table.getType(), DatasetType.SQL.name())) {
@ -1089,7 +1092,10 @@ public class ChartViewService {
if (containDetailField(view) && CollectionUtils.isNotEmpty(viewFields)) {
detailFieldList.addAll(xAxis);
detailFieldList.addAll(viewFields);
String resultMode = view.getResultMode();
view.setResultMode(null);
detailFieldSql = qp.getSQLWithPage(false, sql, detailFieldList, fieldCustomFilter, rowPermissionsTree, extFilterList, ds, view, pageInfo);
view.setResultMode(resultMode);
}
}
} else if (StringUtils.equalsIgnoreCase(table.getType(), DatasetType.CUSTOM.name())) {
@ -1110,7 +1116,10 @@ public class ChartViewService {
if (containDetailField(view) && CollectionUtils.isNotEmpty(viewFields)) {
detailFieldList.addAll(xAxis);
detailFieldList.addAll(viewFields);
String resultMode = view.getResultMode();
view.setResultMode(null);
detailFieldSql = qp.getSQLWithPage(false, sql, detailFieldList, fieldCustomFilter, rowPermissionsTree, extFilterList, ds, view, pageInfo);
view.setResultMode(resultMode);
}
}
} else if (StringUtils.equalsIgnoreCase(table.getType(), DatasetType.UNION.name())) {
@ -1131,7 +1140,10 @@ public class ChartViewService {
if (containDetailField(view) && CollectionUtils.isNotEmpty(viewFields)) {
detailFieldList.addAll(xAxis);
detailFieldList.addAll(viewFields);
String resultMode = view.getResultMode();
view.setResultMode(null);
detailFieldSql = qp.getSQLWithPage(false, sql, detailFieldList, fieldCustomFilter, rowPermissionsTree, extFilterList, ds, view, pageInfo);
view.setResultMode(resultMode);
}
}
}
@ -1182,7 +1194,10 @@ public class ChartViewService {
if (containDetailField(view) && CollectionUtils.isNotEmpty(viewFields)) {
detailFieldList.addAll(xAxis);
detailFieldList.addAll(viewFields);
String resultMode = view.getResultMode();
view.setResultMode(null);
detailFieldSql = qp.getSQLTableInfo(tableName, detailFieldList, fieldCustomFilter, rowPermissionsTree, extFilterList, ds, view);
view.setResultMode(resultMode);
}
}
if (CollectionUtils.isNotEmpty(assistFields)) {