(fix) metric on stack bar

kevincobain2000 · Mar 27, 2024 · c5e9c32 · c5e9c32
1 parent a9bc9df
commit c5e9c32
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 27 deletions.
diff --git a/README.md b/README.md
@@ -133,7 +133,6 @@ Extra params for `bar` chart.
 | :-------- | :------- | :----- | :--------- | :------------------------- |
 | `style`   |          | string | `vertical` | `vertical` or `horizontal` |
 | `grid`    |          | string | `show`     | `show` or `hide`           |
-| `zmetric` |          | string | `vertical` | when `z` data is provided  |
 
 
 | `data` | Required | Type     | Description                                |
@@ -166,7 +165,6 @@ https://instachart.coveritup.app/bar?title=Bar+Chart
 https://instachart.coveritup.app/bar?title=Bar+Chart
 &subtitle=Sleeping+hours
 &metric=hours
-&zmetric=days
 &theme=dark
 &data={
     "x": ["Monday", "Friday", "Sunday"],

diff --git a/pkg/bar_chart.go b/pkg/bar_chart.go
@@ -114,36 +114,19 @@ func (c *BarChart) GetStacked(xData []string, yData [][]float64, zData [][]float
 	}
 	titleSizes := GetTitleSizes(req)
 	opt := charts.ChartOption{
-		Title:  titleSizes,
-		XAxis:  charts.NewXAxisOption(xData),
-		Legend: charts.NewLegendOption(names),
-		YAxisOptions: []charts.YAxisOption{
-			{
-				Formatter: "{value}" + req.Metric,
-				Color: charts.Color{
-					R: 84,
-					G: 112,
-					B: 198,
-					A: 255,
-				},
-			},
-			{
-				Formatter: "{value}" + req.ZMetric,
-				Color: charts.Color{
-					R: 250,
-					G: 200,
-					B: 88,
-					A: 255,
-				},
-			},
-		},
+		Title:      titleSizes,
+		XAxis:      charts.NewXAxisOption(xData),
+		Legend:     charts.NewLegendOption(names),
 		SeriesList: series,
 	}
 	opt.YAxisOptions = []charts.YAxisOption{
 		{
 			SplitLineShow: showGrid,
 		},
 	}
+	opt.ValueFormatter = func(f float64) string {
+		return fmt.Sprintf("%s %s", NumberToK(&f), req.Metric)
+	}
 	opt.Type = req.Output
 	opt.Theme = req.Theme
 	opt.Legend.Padding = charts.Box{

diff --git a/pkg/chart.go b/pkg/chart.go
@@ -46,7 +46,6 @@ type ChartRequest struct {
 	ChartTitle    string `json:"title" query:"title" form:"title"`
 	ChartSubtitle string `json:"subtitle" query:"subtitle" form:"subtitle"`
 	Metric        string `json:"metric" query:"metric" form:"metric"`
-	ZMetric       string `json:"zmetric" query:"zmetric" form:"zmetric"`
 	Theme         string `json:"theme" query:"theme" form:"theme" default:"light"`
 	Width         int    `json:"width" query:"width" form:"width" default:"1024"`
 	Height        int    `json:"height" query:"height" form:"height" default:"768"`
@@ -116,7 +115,7 @@ func IsMiniChart(req *ChartRequest) bool {
 func GetPaddings(req *ChartRequest) charts.Box {
 	paddings := charts.Box{
 		Top:    10,
-		Bottom: 10,
+		Bottom: 20,
 		Left:   10,
 		Right:  10,
 	}