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

Merge pull request #7849 from dataease/pr@dev@fix_pivot_aggr_sort

Browse Source 
fix(视图-透视表): 透视表汇总排序错误
This commit is contained in:
wisonic-s 2024-01-25 19:31:01 +08:00 committed by GitHub
commit 3ca63706b4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
core/frontend/src/views/chart/components/shapeAttr/TotalCfg.vue
View File

@ -304,7 +304,7 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
v-show="false && chart.type === 'table-pivot' && totalForm.col.totalSort !== 'none'" v-show="chart.type === 'table-pivot' && totalForm.col.totalSort !== 'none'"
:label="$t('chart.total_sort_field')" :label="$t('chart.total_sort_field')"
class="form-item" class="form-item"
> >