center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #7003 from dataease/pr@dev@fix_symol_map_tooltips

Browse Source 
fix: 符号地图标签提示未去重
This commit is contained in:
fit2cloud-chenyw 2023-12-05 11:44:20 +08:00 committed by GitHub
commit baeb7f154b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
extensions/dataease-extensions-view/view-symbolmap/view-symbolmap-backend/src/main/java/io/dataease/plugins/view/official/handler/SymbolMapRSHandler.java
View File

@ -11,10 +11,8 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
import javax.annotation.PostConstruct;
@ -124,7 +122,7 @@ public class SymbolMapRSHandler implements PluginViewRSHandler<Map> {
ChartQuotaDTO chartQuotaDTO = new ChartQuotaDTO();
chartQuotaDTO.setId(curY.getId());
axisChartDataDTO.getQuotaList().add(chartQuotaDTO);
axisChartDataDTO.getProperties().put(curY.getName(), row[i + step]);
axisChartDataDTO.getProperties().put(curY.getName(), formatLabel(curY, row[i + step]));
axisChartDataDTO.setLongitude(dimensionList.get(0).getValue());
axisChartDataDTO.setLatitude(dimensionList.get(1).getValue());
if (StringUtils.equals(curY.getTypeField(), "yAxis") && !valueFilled) {
@ -139,4 +137,13 @@ public class SymbolMapRSHandler implements PluginViewRSHandler<Map> {
map.put("data", datalist);
return map;
}
private String formatLabel(PluginViewField field, String val) {
if (StringUtils.isBlank(val)) return val;
String typeField = field.getTypeField();
if (StringUtils.isNotBlank(typeField) && trans2Ykeys.contains(typeField)) {
return Arrays.stream(val.split(",")).distinct().collect(Collectors.joining(","));
}
return val;
}
}