public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-06-13 01:01:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(图表): 透视表行汇总小计可以根据维度灵活配置 #11336

Browse Source
This commit is contained in:
ulleo
2024-12-26 17:35:33 +08:00
committed by 王嘉豪
parent 20624577bb
commit 090ecb433f
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableTotalSelector.vue
View File

@@ -2,7 +2,7 @@
import { onMounted, PropType, reactive, watch, ref, inject, nextTick } from 'vue'
import { useI18n } from '@/hooks/web/useI18n'
import { DEFAULT_TABLE_TOTAL } from '@/views/chart/components/editor/util/chart'
import { cloneDeep, defaultsDeep, find } from 'lodash-es'
import { cloneDeep, defaultsDeep, find, includes } from 'lodash-es'
import CustomAggrEdit from './CustomAggrEdit.vue'
const { t } = useI18n()
@@ -21,7 +21,7 @@ const props = defineProps({
}
})
watch(
[() => props.chart.customAttr.tableTotal, () => props.chart.yAxis],
[() => props.chart.customAttr.tableTotal, () => props.chart.xAxis, () => props.chart.yAxis],
() => {
init()
},
@@ -66,17 +66,17 @@ function changeRowSubTableTotal() {
const initSubTotalDimensionList = () => {
const list = []
if (props.chart.xAxis.length > 2) {
if (props.chart.xAxis.length >= 2) {
for (let i = 0; i < props.chart.xAxis.length - 1; i++) {
//排除最后一个
const old = find(
const old = includes(
state.tableTotalForm.row.subTotalsDimensions,
s => s === props.chart.xAxis[i].dataeaseName
props.chart.xAxis[i].dataeaseName
)
list.push({
displayName: props.chart.xAxis[i].name,
name: props.chart.xAxis[i].dataeaseName,
checked: state.tableTotalForm.row.subTotalsDimensionsNew ? old != undefined : true
checked: !!state.tableTotalForm.row.subTotalsDimensionsNew ? old : true
})
}
}