zwxi 8 bulan lalu
induk
melakukan
8e6e176995

+ 13 - 1
models/data_manage/chart_theme/request/theme.go

@@ -84,7 +84,7 @@ type OldChartOptions struct {
 	XAxisOptions   interface{}      `json:"xAxisOptions"`
 	YAxisOptions   interface{}      `json:"yAxisOptions"`
 	DrawOption     interface{}      `json:"drawOption"`
-	LineOptionList []NewLineOptions `json:"lineOptionList"`
+	LineOptionList []LineStyleOptions `json:"lineOptionList"`
 }
 
 type NewChartOptions struct {
@@ -100,3 +100,15 @@ type NewLineOptions struct {
 	MarkSize  int    `json:"markSize"`
 	MarkColor string `json:"markColor"`
 }
+
+type LineStyleOptions struct {
+	DashStyle string `json:"dashStyle"`
+	Color     string `json:"color"`
+	LineWidth int    `json:"lineWidth"`
+	LineType  string `json:"lineType"`
+	Radius    int `json:"radius"`
+	DataMark  string `json:"dataMark"`
+	MarkType  string `json:"markType"`
+	MarkSize  int `json:"markSize"`
+	MarkColor string `json:"markColor"`
+}

+ 1 - 0
services/data/chart_theme.go

@@ -621,6 +621,7 @@ func ConvertOldChartOptions(config string) (newConfig string, err error) {
 		return
 	}
 	if oldTheme.LineOptionList != nil && len(oldTheme.LineOptionList) > 0 {
+		newConfig = config
 		return
 	}
 	newTheme.OldChartOptions = oldTheme