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

fix(图表): 修复代码merge冲突

Browse Source
This commit is contained in:
ulleo 2024-06-14 10:16:20 +08:00
parent 8eda291a90
commit dd09edb9d6
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java
View File

@ -213,12 +213,12 @@ public class ChartDataManage {
|| ("antv".equalsIgnoreCase(view.getRender()) && "line".equalsIgnoreCase(view.getType())) || ("antv".equalsIgnoreCase(view.getRender()) && "line".equalsIgnoreCase(view.getType()))
|| StringUtils.equalsIgnoreCase(view.getType(), "flow-map") || StringUtils.equalsIgnoreCase(view.getType(), "flow-map")
|| StringUtils.equalsIgnoreCase(view.getType(), "sankey") || StringUtils.equalsIgnoreCase(view.getType(), "sankey")
|| StringUtils.equalsIgnoreCase(view.getType(), "chart-mix") || StringUtils.containsIgnoreCase(view.getType(), "chart-mix")
) { ) {
xAxis.addAll(xAxisExt); xAxis.addAll(xAxisExt);
} }
yAxis = new ArrayList<>(view.getYAxis()); yAxis = new ArrayList<>(view.getYAxis());
if (StringUtils.equalsIgnoreCase(view.getType(), "chart-mix") if (StringUtils.containsIgnoreCase(view.getType(), "chart-mix")
|| StringUtils.equalsIgnoreCase(view.getType(), "bidirectional-bar") || StringUtils.equalsIgnoreCase(view.getType(), "bidirectional-bar")
|| StringUtils.equalsIgnoreCase(view.getType(), "quadrant") || StringUtils.equalsIgnoreCase(view.getType(), "quadrant")
|| StringUtils.containsIgnoreCase(view.getType(), "progress-bar")) { || StringUtils.containsIgnoreCase(view.getType(), "progress-bar")) {

6
core/core-backend/src/main/java/io/dataease/chart/utils/ChartDataBuild.java
View File

@ -596,7 +596,9 @@ public class ChartDataBuild {
series.get(j).getData().add(axisChartDataDTO); series.get(j).getData().add(axisChartDataDTO);
} }
} }
if (CollectionUtils.isNotEmpty(series)) {
series.get(0).setCategories(categories); series.get(0).setCategories(categories);
}
map.put("data", series); map.put("data", series);
return map; return map;
@ -685,9 +687,9 @@ public class ChartDataBuild {
series.get(j).getData().add(axisChartDataDTO); series.get(j).getData().add(axisChartDataDTO);
} }
if (CollectionUtils.isNotEmpty(series)) {
series.get(0).setCategories(categories); series.get(0).setCategories(categories);
}
map.put("data", series); map.put("data", series);
return map; return map;