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

refactor(图表): 优化提示显示效果

Browse Source
This commit is contained in:
wisonic-s
2025-07-29 15:02:03 +08:00
committed by wisonic-s
parent 3e06a677c4
commit 5db7dbadcc
3 changed files with 49 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/core-frontend/src/views/chart/components/js/panel/charts/g2/mix/mix-group.ts
View File

@@ -107,7 +107,16 @@ export class GroupLineMix extends G2ChartView {
children: [
{
type: 'interval',
data: left.data,
data: {
type: 'inline',
value: left.data,
transform: [
{
type: 'map',
callback: d => ({ ...d, left: true })
}
]
},
encode: {
x: 'field',
y: 'value',
@@ -121,7 +130,8 @@ export class GroupLineMix extends G2ChartView {
},
scale: {
y: {
key: 'left'
key: 'left',
nice: true
}
}
},
@@ -136,7 +146,8 @@ export class GroupLineMix extends G2ChartView {
},
scale: {
y: {
key: 'right'
key: 'right',
nice: true
}
},
axis: {
@@ -573,8 +584,9 @@ export class GroupLineMix extends G2ChartView {
const formatterCfg =
formatterMap[item.quotaList[0].id]?.formatterCfg ?? yAxis[0].formatterCfg
const value = valueFormatter(item.value, formatterCfg)
const color = view.scale.color.map(item.category) ?? item.color
const name = item.category
const colorScale = item.left ? view.scale.color : view.scale.color1
const color = colorScale.map(name) ?? item.color
result.push({ value, color, name })
})
const itemsHtml = result

22
core/core-frontend/src/views/chart/components/js/panel/charts/g2/mix/mix-stack.ts
View File

@@ -107,7 +107,16 @@ export class StackLineMix extends G2ChartView {
children: [
{
type: 'interval',
data: left.data,
data: {
type: 'inline',
value: left.data,
transform: [
{
type: 'map',
callback: d => ({ ...d, left: true })
}
]
},
encode: {
x: 'field',
y: 'value',
@@ -120,7 +129,8 @@ export class StackLineMix extends G2ChartView {
},
scale: {
y: {
key: 'left'
key: 'left',
nice: true
}
},
transform: [{ type: 'stackY' }]
@@ -136,7 +146,8 @@ export class StackLineMix extends G2ChartView {
},
scale: {
y: {
key: 'right'
key: 'right',
nice: true
}
},
axis: {
@@ -538,7 +549,7 @@ export class StackLineMix extends G2ChartView {
g2TooltipWrapper.style.zIndex = '9999'
document.body.appendChild(g2TooltipWrapper)
}
const yAxis = chart.yAxis
const { yAxis } = chart
const tooltipOptions: G2Spec = {
tooltip: d => d,
interaction: {
@@ -573,8 +584,9 @@ export class StackLineMix extends G2ChartView {
const formatterCfg =
formatterMap[item.quotaList[0].id]?.formatterCfg ?? yAxis[0].formatterCfg
const value = valueFormatter(item.value, formatterCfg)
const color = view.scale.color.map(item.category) ?? item.color
const colorScale = item.left ? view.scale.color : view.scale.color1
const name = item.category
const color = colorScale.map(name) ?? item.color
result.push({ value, color, name })
})
const itemsHtml = result

20
core/core-frontend/src/views/chart/components/js/panel/charts/g2/mix/mix.ts
View File

@@ -89,7 +89,16 @@ export class ColumnLineMix extends G2ChartView {
children: [
{
type: 'interval',
data: left.data,
data: {
type: 'inline',
value: left.data,
transform: [
{
type: 'map',
callback: d => ({ ...d, left: true })
}
]
},
encode: {
x: 'field',
y: 'value',
@@ -105,7 +114,8 @@ export class ColumnLineMix extends G2ChartView {
},
scale: {
y: {
key: 'left'
key: 'left',
nice: true
}
}
},
@@ -120,7 +130,8 @@ export class ColumnLineMix extends G2ChartView {
},
scale: {
y: {
key: 'right'
key: 'right',
nice: true
}
},
axis: {
@@ -417,8 +428,9 @@ export class ColumnLineMix extends G2ChartView {
const formatterCfg =
formatterMap[item.quotaList[0].id]?.formatterCfg ?? yAxis[0].formatterCfg
const value = valueFormatter(item.value, formatterCfg)
const color = view.scale.color.map(item.category) ?? item.color
const name = item.category
const colorScale = item.left ? view.scale.color : view.scale.color1
const color = colorScale.map(name) ?? item.color
result.push({ value, color, name })
})
const itemsHtml = result