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

Merge pull request #6080 from ulleo/dev

Browse Source 
fix: [Echarts动态排序图] 空字段导致图表报错
This commit is contained in:
ulleo 2023-09-08 11:25:12 +08:00 committed by GitHub
commit 9f37d7b6cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
extensions/dataease-extensions-view/view-racebar/view-racebar-backend/src/main/java/io/dataease/plugins/view/official/impl/RaceBarService.java
View File

@ -150,7 +150,7 @@ public class RaceBarService extends ViewPluginService {
data.forEach(ss -> { data.forEach(ss -> {
xs.add(ss[encode.get("y")]); xs.add(ss[encode.get("y")]);
String key = ss[(Integer) map.get("extIndex")]; String key = StringUtils.defaultString(ss[(Integer) map.get("extIndex")], StringUtils.EMPTY);
if (!keySet.contains(key)) { if (!keySet.contains(key)) {
keySet.add(key); keySet.add(key);
keyList.add(key); keyList.add(key);
@ -160,7 +160,7 @@ public class RaceBarService extends ViewPluginService {
Map<String, List<String[]>> groupData = data.stream().collect(Collectors.toMap( Map<String, List<String[]>> groupData = data.stream().collect(Collectors.toMap(
k -> k[(Integer) map.get("extIndex")], k -> StringUtils.defaultString(k[(Integer) map.get("extIndex")], StringUtils.EMPTY),
v -> { v -> {
List<String[]> list = new ArrayList<>(); List<String[]> list = new ArrayList<>();
list.add(v); list.add(v);
@ -179,6 +179,7 @@ public class RaceBarService extends ViewPluginService {
map.put("xs", xs); map.put("xs", xs);
return map; return map;
} }