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

fix: 颜色选择器去掉清空；矩形树图标签修复；doris 计算字段支持小数

Browse Source
This commit is contained in:
junjie 2021-08-27 18:21:02 +08:00
parent cdee8d66f9
commit 5d36a577b4
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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); fieldName = String.format(DorisConstants.FROM_UNIXTIME, cast, DorisConstants.DEFAULT_DATE_FORMAT);
} else if (f.getDeType() == 2) { } else if (f.getDeType() == 2) {
fieldName = String.format(DorisConstants.CAST, originField, DorisConstants.DEFAULT_INT_FORMAT); 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 { } else {
fieldName = originField; fieldName = originField;
} }

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

@ -349,3 +349,7 @@ div:focus {
width: 5px; width: 5px;
height: 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' // y.type = 'treemap'
chart_option.series[0].data.push(y) chart_option.series[0].data.push(y)
} }
chart_option.series[0].name = chart.data.series[0].name
} }
} }
// console.log(chart_option); // console.log(chart_option);