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

fix(视图): 堆叠图label，tooltip偶尔不显示的问题

Browse Source
This commit is contained in:
junjun 2022-08-08 11:32:39 +08:00
parent d25af1c3c0
commit 9ffd195f16
2 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
frontend/src/views/chart/chart/common/common_antv.js
View File

@ -143,15 +143,24 @@ export function getLabel(chart) {
yAxis = JSON.parse(JSON.stringify(chart.yaxis))
}
for (let i = 0; i < yAxis.length; i++) {
const f = yAxis[i]
if (f.name === param.category) {
if (f.formatterCfg) {
res = valueFormatter(param.value, f.formatterCfg)
} else {
res = valueFormatter(param.value, formatterItem)
if (chart.type === 'bar-stack' || chart.type === 'line-stack') {
const f = yAxis[0]
if (f.formatterCfg) {
res = valueFormatter(param.value, f.formatterCfg)
} else {
res = valueFormatter(param.value, formatterItem)
}
} else {
for (let i = 0; i < yAxis.length; i++) {
const f = yAxis[i]
if (f.name === param.category) {
if (f.formatterCfg) {
res = valueFormatter(param.value, f.formatterCfg)
} else {
res = valueFormatter(param.value, formatterItem)
}
break
}
break
}
}
return res
@ -187,7 +196,15 @@ export function getTooltip(chart) {
}
let obj
if (chart.type === 'word-cloud') {
if (chart.type === 'bar-stack' || chart.type === 'line-stack') {
obj = { name: param.category, value: param.value }
const f = yAxis[0]
if (f.formatterCfg) {
res = valueFormatter(param.value, f.formatterCfg)
} else {
res = valueFormatter(param.value, formatterItem)
}
} else if (chart.type === 'word-cloud') {
obj = { name: param.text, value: param.value }
for (let i = 0; i < yAxis.length; i++) {
const f = yAxis[i]
@ -217,7 +234,7 @@ export function getTooltip(chart) {
res = valueFormatter(param.value, formatterItem)
}
}
} else if (chart.type.includes('bar') || chart.type.includes('line') || chart.type.includes('scatter') || chart.type.includes('radar')) {
} else if (chart.type.includes('bar') || chart.type.includes('line') || chart.type.includes('scatter') || chart.type.includes('radar') || chart.type.includes('area')) {
obj = { name: param.category, value: param.value }
for (let i = 0; i < yAxis.length; i++) {
const f = yAxis[i]

4
frontend/src/views/chart/view/ChartEdit.vue
View File

@ -1667,7 +1667,9 @@ export default {
view.type === 'treemap' ||
view.type === 'liquid' ||
view.type === 'word-cloud' ||
view.type === 'waterfall') {
view.type === 'waterfall' ||
view.type === 'bar-stack' ||
view.type === 'line-stack') {
if (view.yaxis.length > 1) {
view.yaxis.splice(1, view.yaxis.length)
}