Merge branch 'ETA_1.9.4' into debug

services/data/chart_info.go

@@ -525,6 +525,9 @@ func GetChartEdbData(chartInfoId, chartType int, calendar, startDate, endDate st
 	case 2: // 季节性图
 		if seasonExtraConfig != "" {
 			dataResp, err = SeasonChartData(edbList, seasonExtraConfig)
+		} else {
+			// 兼容无配置的老图
+			dataResp = new(data_manage.SeasonChartResp)
 		}
 	case 6: //时序组合图
 		//判断是否堆积
@@ -3217,6 +3220,9 @@ func GetChartConvertEdbData(chartInfoId, chartType int, calendar, startDate, end
 	case 2: // 季节性图
 		if seasonExtraConfig != "" {
 			dataResp, err = SeasonChartData(edbList, seasonExtraConfig)
+		} else {
+			// 兼容无配置的老图
+			dataResp = new(data_manage.SeasonChartResp)
 		}
 	case 7: // 柱形图
 		barChartConf := extraConfig.(data_manage.BarChartInfoReq)
@@ -3742,6 +3748,9 @@ func GetChartEdbDataV2(chartInfoId, chartType int, calendar, startDate, endDate
 	case 2: // 季节性图
 		if seasonExtraConfig != "" {
 			dataResp, err = SeasonChartData(edbList, seasonExtraConfig)
+		} else {
+			// 兼容无配置的老图
+			dataResp = new(data_manage.SeasonChartResp)
 		}
 	case 6: //时序组合图
 		//判断是否堆积

services/data/chart_theme.go

@@ -80,6 +80,9 @@ func GetThemePreviewChartEdbData(chartType int, calendar, startDate, endDate str
 	case 2: // 季节性图
 		if seasonExtraConfig != "" {
 			dataResp, err = SeasonChartData(edbList, seasonExtraConfig)
+		} else {
+			// 兼容无配置的老图
+			dataResp = new(data_manage.SeasonChartResp)
 		}
 	case 7: // 柱形图
 		barChartConf := extraConfig.(data_manage.BarChartInfoReq)