refactor: adjust series label render

bar_chart.go

@@ -93,9 +93,7 @@ func (b *barChart) render(result *defaultRenderResult, seriesList SeriesList) (B
 
 	markPointPainter := NewMarkPointPainter(seriesPainter)
 	markLinePainter := NewMarkLinePainter(seriesPainter)
-	labelPainter := NewSeriesLabelPainter(seriesPainter)
 	rendererList := []Renderer{
-		labelPainter,
 		markPointPainter,
 		markLinePainter,
 	}
@@ -106,6 +104,18 @@ func (b *barChart) render(result *defaultRenderResult, seriesList SeriesList) (B
 
 		divideValues := xRange.AutoDivide()
 		points := make([]Point, len(series.Data))
+		var labelPainter *SeriesLabelPainter
+		if series.Label.Show {
+			labelPainter = NewSeriesLabelPainter(SeriesLabelPainterParams{
+				P:           seriesPainter,
+				SeriesNames: seriesNames,
+				Label:       series.Label,
+				Theme:       opt.Theme,
+				Font:        opt.Font,
+			})
+			rendererList = append(rendererList, labelPainter)
+		}
+
 		for j, item := range series.Data {
 			if j >= xRange.divideCount {
 				continue
@@ -144,29 +154,14 @@ func (b *barChart) render(result *defaultRenderResult, seriesList SeriesList) (B
 				Y: top,
 			}
 			// 如果label不需要展示，则返回
-			if !series.Label.Show {
+			if labelPainter == nil {
 				continue
 			}
-			distance := series.Label.Distance
-			if distance == 0 {
-				distance = 5
-			}
-			text := NewValueLabelFormatter(seriesNames, series.Label.Formatter)(index, item.Value, -1)
-			labelStyle := Style{
-				FontColor: theme.GetTextColor(),
-				FontSize:  labelFontSize,
-				Font:      opt.Font,
-			}
-			if !series.Label.Color.IsZero() {
-				labelStyle.FontColor = series.Label.Color
-			}
-
-			textBox := seriesPainter.MeasureText(text)
 			labelPainter.Add(LabelValue{
-				Text:  text,
-				Style: labelStyle,
-				X:     x + (barWidth-textBox.Width())>>1,
-				Y:     barMaxHeight - h - distance,
+				Index: index,
+				Value: item.Value,
+				X:     x + barWidth>>1,
+				Y:     barMaxHeight - h,
 			})
 		}