zwxi 9 months ago
parent
commit
f8e4a736f9
2 changed files with 16 additions and 8 deletions
  1. 1 8
      controllers/chart.go
  2. 15 0
      services/data/chart_theme.go

+ 1 - 8
controllers/chart.go

@@ -279,14 +279,7 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *models.ChartInfo, key string) (
 		return
 	}
 
-	// 兼容历史数据,加入新字段LineOptionList
-	newConfig, e := data.ConvertOldChartOptions(chartTheme.Config)
-	if e != nil {
-		chartInfo.ChartThemeStyle = chartTheme.Config
-	} else {
-		chartInfo.ChartThemeStyle = newConfig
-	}
-
+	chartInfo.ChartThemeStyle = chartTheme.Config
 	chartInfo.ChartThemeId = chartTheme.ChartThemeId
 
 	chartInfoId := chartInfo.ChartInfoId

+ 15 - 0
services/data/chart_theme.go

@@ -25,6 +25,11 @@ func GetChartThemeConfig(chartThemeId, source, chartType int) (chartTheme *chart
 
 	// 如果找到了,那么就返回
 	if chartTheme != nil {
+		// 兼容历史数据,加入新字段LineOptionList
+		newConfig, e := ConvertOldChartOptions(chartTheme.Config)
+		if e == nil {
+			chartTheme.Config = newConfig
+		}
 		return
 	}
 
@@ -46,12 +51,22 @@ func GetChartThemeConfig(chartThemeId, source, chartType int) (chartTheme *chart
 
 	// 如果找到了,那么就返回
 	if chartTheme != nil {
+		// 兼容历史数据,加入新字段LineOptionList
+		newConfig, e := ConvertOldChartOptions(chartTheme.Config)
+		if e == nil {
+			chartTheme.Config = newConfig
+		}
 		return
 	}
 
 	// 如果还是没找到,那就系统的主题id
 	chartTheme, err = chart_theme.GetSystemChartTheme(chartThemeType.ChartThemeTypeId)
 
+	// 兼容历史数据,加入新字段LineOptionList
+	newConfig, e := ConvertOldChartOptions(chartTheme.Config)
+	if e == nil {
+		chartTheme.Config = newConfig
+	}
 	return
 }