fix

controllers/data_manage/chart_info.go

@@ -1013,13 +1013,8 @@ func (this *ChartInfoController) ChartInfoDetail() {
 			br.ErrMsg = "获取主题信息失败，Err:" + err.Error()
 			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
 
 		// 图表数据权限
@@ -1514,14 +1509,8 @@ func (this *ChartInfoController) ChartInfoDetailV2() {
 		br.ErrMsg = "获取主题信息失败，Err:" + err.Error()
 		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
 
 	dateType := chartInfo.DateType
@@ -2674,15 +2663,7 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 		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

services/data/chart_theme.go

@@ -581,6 +581,10 @@ func GetChartThemeConfig(chartThemeId, source, chartType int) (chartTheme *chart
 
 	// 如果找到了，那么就返回
 	if chartTheme != nil {
+		newConfig, e := ConvertOldChartOptions(chartTheme.Config)
+		if e == nil {
+			chartTheme.Config = newConfig
+		}
 		return
 	}
 
@@ -589,12 +593,20 @@ func GetChartThemeConfig(chartThemeId, source, chartType int) (chartTheme *chart
 	// 查找主题类型id
 	chartThemeType, err := chart_theme.GetChartThemeTypeByChartTypeAndSource(chartType, source)
 	if err != nil {
+		newConfig, e := ConvertOldChartOptions(chartTheme.Config)
+		if e == nil {
+			chartTheme.Config = newConfig
+		}
 		return
 	}
 
 	// 寻找默认的主题id
 	chartTheme, err = chart_theme.GetChartThemeId(chartThemeType.DefaultChartThemeId)
 	if err != nil && err.Error() != utils.ErrNoRow() {
+		newConfig, e := ConvertOldChartOptions(chartTheme.Config)
+		if e == nil {
+			chartTheme.Config = newConfig
+		}
 		return
 	}
 
@@ -608,6 +620,12 @@ func GetChartThemeConfig(chartThemeId, source, chartType int) (chartTheme *chart
 	// 如果还是没找到，那就系统的主题id
 	chartTheme, err = chart_theme.GetSystemChartTheme(chartThemeType.ChartThemeTypeId)
 
+	// 兼容历史数据，加入新字段LineOptionList
+	newConfig, e := ConvertOldChartOptions(chartTheme.Config)
+	if e == nil {
+		chartTheme.Config = newConfig
+	}
+
 	return
 }