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

Merge branch 'dev' of github.com:dataease/dataease into dev

Browse Source
This commit is contained in:
taojinlong 2021-08-30 15:51:29 +08:00
commit d2674bd472
4 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/dataease/map/utils/MapUtils.java
View File

@ -121,7 +121,7 @@ public class MapUtils {
}
private static AreaEntity root() {
return AreaEntity.builder().code("100000").name("中华人名共和国").build();
return AreaEntity.builder().code("100000").name("中华人民共和国").build();
}
public static void recursionWrite(List<AreaEntity> areaEntityList) {

2
backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java
View File

@ -121,6 +121,8 @@ public class DorisQueryProvider extends QueryProvider {
fieldName = String.format(DorisConstants.FROM_UNIXTIME, cast, DorisConstants.DEFAULT_DATE_FORMAT);
} else if (f.getDeType() == 2) {
fieldName = String.format(DorisConstants.CAST, originField, DorisConstants.DEFAULT_INT_FORMAT);
} else if (f.getDeType() == 3) {
fieldName = String.format(DorisConstants.CAST, originField, DorisConstants.DEFAULT_FLOAT_FORMAT);
} else {
fieldName = originField;
}

4
frontend/src/styles/index.scss
View File

@ -349,3 +349,7 @@ div:focus {
width: 5px;
height: 5px;
}
.el-color-dropdown__link-btn {
display: none!important;
}

1
frontend/src/views/chart/chart/treemap/treemap.js
View File

@ -54,6 +54,7 @@ export function baseTreemapOption(chart_option, chart) {
// y.type = 'treemap'
chart_option.series[0].data.push(y)
}
chart_option.series[0].name = chart.data.series[0].name
}
}
// console.log(chart_option);