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

feat(视图): chart调整

Browse Source
This commit is contained in:
junjie 2021-03-11 16:02:28 +08:00
parent 9ae93df8fb
commit b0e42fd75c
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -153,7 +153,7 @@ public class ChartViewService {
public String transMysqlSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis) {
// TODO 字段汇总 排序等
String[] field = yAxis.stream().map(y -> "CAST(" + y.getSummary() + "(" + y.getOriginName() + ") AS DECIMAL(10,2))").toArray(String[]::new);
String[] field = yAxis.stream().map(y -> "CAST(" + y.getSummary() + "(" + y.getOriginName() + ") AS DECIMAL(20,2))").toArray(String[]::new);
String[] group = xAxis.stream().map(ChartViewFieldDTO::getOriginName).toArray(String[]::new);
return MessageFormat.format("SELECT {0},{1} FROM {2} GROUP BY {3}", StringUtils.join(group, ","), StringUtils.join(field, ","), table, StringUtils.join(group, ","));
}

3
frontend/src/views/chart/components/DimensionItem.vue
View File

@ -14,8 +14,7 @@
</el-dropdown-item>
</el-dropdown-menu>
</span>
</el-dropdown></span>
</el-dropdown>
</el-dropdown>
</span>
</template>

3
frontend/src/views/chart/components/QuotaItem.vue
View File

@ -26,8 +26,7 @@
</el-dropdown-item>
</el-dropdown-menu>
</span>
</el-dropdown></span>
</el-dropdown>
</el-dropdown>
</span>
</template>