zeni/go-charts
1
0
Fork 0
Code Issues Pull requests Projects Releases 47 Packages Wiki Activity Actions

fix: fix funnel percent value

Browse source
This commit is contained in:
vicanso 2022-03-05 08:16:56 +08:00
parent 5519d2eca6
commit 1894670c2a
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
examples/charts/main.go
View file

@ -575,7 +575,6 @@ func indexHandler(w http.ResponseWriter, req *http.Request) {
Data: charts.NewSeriesDataFromValues([]float64{ Data: charts.NewSeriesDataFromValues([]float64{
60, 60,
}), }),
Max: charts.NewFloatPoint(120),
}, },
{ {
Type: charts.ChartTypeFunnel, Type: charts.ChartTypeFunnel,

8
funnel.go
View file

@ -52,7 +52,7 @@ func funnelChartRender(opt funnelChartOption, result *basicRenderResult) error {
// 大的数据在前 // 大的数据在前
return seriesList[i].Data[0].Value > seriesList[j].Data[0].Value return seriesList[i].Data[0].Value > seriesList[j].Data[0].Value
}) })
max := float64(100) max := seriesList[0].Data[0].Value
min := float64(0) min := float64(0)
for _, item := range seriesList { for _, item := range seriesList {
if item.Max != nil { if item.Max != nil {
@ -76,10 +76,10 @@ func funnelChartRender(opt funnelChartOption, result *basicRenderResult) error {
textList := make([]string, len(seriesList)) textList := make([]string, len(seriesList))
for index, item := range seriesList { for index, item := range seriesList {
value := item.Data[0].Value value := item.Data[0].Value
percent := (item.Data[0].Value - min) / (max - min) widthPercent := (value - min) / (max - min)
w := int(percent * float64(width)) w := int(widthPercent * float64(width))
widthList[index] = w widthList[index] = w
p := humanize.CommafWithDigits(value, 2) + "%" p := humanize.CommafWithDigits(value/max*100, 2) + "%"
textList[index] = fmt.Sprintf("%s(%s)", item.Name, p) textList[index] = fmt.Sprintf("%s(%s)", item.Name, p)
} }