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

fix: 提示异常

Browse Source
This commit is contained in:
wisonic-s 2023-11-01 17:02:20 +08:00
parent 16e69fccf3
commit 669e800fa3
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
core/core-frontend/src/views/chart/components/editor/editor-style/components/TooltipSelector.vue
View File

@ -69,7 +69,7 @@ const initSeriesTooltip = () => {
...next, ...next,
seriesId: next.seriesId ?? next.id, seriesId: next.seriesId ?? next.id,
show: index <= quotaAxis.value.length - 1, show: index <= quotaAxis.value.length - 1,
summary: 'sum' summary: COUNT_DE_TYPE.includes(next.deType) ? 'count' : 'sum'
} as SeriesFormatter } as SeriesFormatter
if (seriesAxisMap[tmp.seriesId]) { if (seriesAxisMap[tmp.seriesId]) {
tmp = { tmp = {
@ -136,6 +136,18 @@ const AGGREGATION_TYPE = [
{ name: t('chart.count'), value: 'count' }, { name: t('chart.count'), value: 'count' },
{ name: t('chart.count_distinct'), value: 'count_distinct' } { name: t('chart.count_distinct'), value: 'count_distinct' }
] ]
const COUNT_AGGREGATION_TYPE = [
{ name: t('chart.count'), value: 'count' },
{ name: t('chart.count_distinct'), value: 'count_distinct' }
]
const COUNT_DE_TYPE = [0, 1, 5]
const aggregationList = computed(() => {
if (COUNT_DE_TYPE.includes(curSeriesFormatter.value?.deType)) {
return COUNT_AGGREGATION_TYPE
}
return AGGREGATION_TYPE
})
watch( watch(
[() => props.chart.customAttr.tooltip, () => props.chart.customAttr.tooltip.show], [() => props.chart.customAttr.tooltip, () => props.chart.customAttr.tooltip.show],
() => { () => {
@ -188,10 +200,8 @@ const init = () => {
formatterSelector.value?.blur() formatterSelector.value?.blur()
// 新增视图 // 新增视图
const formatter = state.tooltipForm.seriesTooltipFormatter const formatter = state.tooltipForm.seriesTooltipFormatter
if (!quotaAxis.value?.length) {
if (!formatter.length) { if (!formatter.length) {
quotaData.value?.forEach(i => formatter.push({ ...i, seriesId: i.id, show: false })) quotaData.value?.forEach(i => formatter.push({ ...i, seriesId: i.id, show: false }))
}
curSeriesFormatter.value = {} curSeriesFormatter.value = {}
return return
} }
@ -209,7 +219,13 @@ const init = () => {
} }
} }
const showProperty = prop => props.propertyInner?.includes(prop) const showProperty = prop => {
const instance = chartViewManager.getChartView(props.chart.render, props.chart.type)
if (instance) {
return instance.propertyInner['tooltip-selector'].includes(prop)
}
return props.propertyInner?.includes(prop)
}
const updateSeriesTooltipFormatter = (form: AxisEditForm) => { const updateSeriesTooltipFormatter = (form: AxisEditForm) => {
const { axisType, editType } = form const { axisType, editType } = form
if ( if (
@ -575,7 +591,7 @@ onMounted(() => {
@change="changeTooltipAttr('seriesTooltipFormatter', true)" @change="changeTooltipAttr('seriesTooltipFormatter', true)"
> >
<el-option <el-option
v-for="item in AGGREGATION_TYPE" v-for="item in aggregationList"
:label="item.name" :label="item.name"
:value="item.value" :value="item.value"
:key="item.value" :key="item.value"