Skip to content

Commit d6576a9

Browse files
committed
feat: improve labels & tooltip display in pie chart
1 parent a6a1cfa commit d6576a9

File tree

2 files changed

+31
-6
lines changed
  • frontend/src/views/chat/component/charts
  • g2-ssr/charts

2 files changed

+31
-6
lines changed

frontend/src/views/chat/component/charts/Pie.ts

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,25 @@ export class Pie extends BaseG2Chart {
3636
labels: [
3737
{
3838
position: 'outside',
39-
text: (data: any) =>
40-
`${data[series[0].value]}: ${data[y[0].value]}${_data.isPercent ? '%' : ''}`,
39+
text: (data: any) => {
40+
console.log(
41+
`${data[series[0].value]}: ${data[y[0].value]}${_data.isPercent ? '%' : ''}`
42+
)
43+
return `${data[series[0].value]}: ${data[y[0].value]}${_data.isPercent ? '%' : ''}`
44+
},
45+
transform: [{ type: 'exceedAdjust' }, { type: 'overlapHide' }],
4146
},
4247
],
43-
tooltip: (data) => {
44-
return { name: y[0].name, value: `${data[y[0].value]}${_data.isPercent ? '%' : ''}` }
48+
tooltip: {
49+
title: (data: any) => data[series[0].value],
50+
items: [
51+
(data: any) => {
52+
return {
53+
name: y[0].name,
54+
value: `${data[y[0].value]}${_data.isPercent ? '%' : ''}`,
55+
}
56+
},
57+
],
4558
},
4659
}
4760

g2-ssr/charts/pie.js

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,22 @@ function getPieOptions(baseOptions, axis, data) {
2929
position: 'outside',
3030
text: (data) =>
3131
`${data[series[0].value]}: ${data[y[0].value]}${_data.isPercent ? '%' : ''}`,
32+
transform: [
33+
{ type: 'exceedAdjust' },
34+
{ type: 'overlapHide' },
35+
],
3236
},
3337
],
34-
tooltip: (data) => {
35-
return {name: y[0].name, value: `${data[y[0].value]}${_data.isPercent ? '%' : ''}`}
38+
tooltip: {
39+
title: (data) => data[series[0].value],
40+
items: [
41+
(data) => {
42+
return {
43+
name: y[0].name,
44+
value: `${data[y[0].value]}${_data.isPercent ? '%' : ''}`,
45+
}
46+
},
47+
],
3648
},
3749
}
3850

0 commit comments

Comments
 (0)