dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #10095 from dataease/pr@dev@fix_table_pivot_distinct_sum

Browse Source 
fix(视图): 透视表去重计数小计总计计算错误
This commit is contained in:
wisonic-s 2024-06-05 10:39:13 +08:00 committed by GitHub
commit 19e63b9508
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/frontend/src/views/chart/chart/table/table-info.js
View File

@ -1063,30 +1063,30 @@ function customCalcFunc(query, data, totalCfgMap) {
switch (aggregation) {
case 'SUM': {
return data.reduce((p, n) => {
return p + n[query[EXTRA_FIELD]]
return p + parseFloat(n[query[EXTRA_FIELD]])
}, 0)
}
case 'AVG': {
const sum = data.reduce((p, n) => {
return p + n[query[EXTRA_FIELD]]
return p + parseFloat(n[query[EXTRA_FIELD]])
}, 0)
return sum / data.length
}
case 'MIN': {
const result = minBy(data, n => {
return n[query[EXTRA_FIELD]]
return parseFloat(n[query[EXTRA_FIELD]])
})
return result?.[query[EXTRA_FIELD]]
}
case 'MAX': {
const result = maxBy(data, n => {
return n[query[EXTRA_FIELD]]
return parseFloat(n[query[EXTRA_FIELD]])
})
return result?.[query[EXTRA_FIELD]]
}
default: {
return data.reduce((p, n) => {
return p + n[query[EXTRA_FIELD]]
return p + parseFloat(n[query[EXTRA_FIELD]])
}, 0)
}
}