Merge branch 'feature/eta1.9.6_chart_series' into debug

services/data/chart_info.go

@@ -2434,7 +2434,7 @@ func AddChartInfo(req data_manage.AddChartInfoReq, sysUserId int, sysUserRealNam
 
 	// 图表额外配置
 	var allExtraConfig string
-	extraConfig, allExtraConfig, err, errMsg = HandleExtraConfig(chartType, extraConfig)
+	extraConfig, allExtraConfig, err, errMsg = HandleExtraConfig(0, chartType, extraConfig)
 	if err != nil {
 		if errMsg == `` {
 			errMsg = "指标异常！"
@@ -2830,7 +2830,7 @@ func EditChartInfo(req data_manage.EditChartInfoReq, sysUser *system.Admin, lang
 	}
 
 	// 图表额外配置
-	extraConfig, allExtraConfig, err, errMsg := HandleExtraConfig(req.ChartType, req.ExtraConfig)
+	extraConfig, allExtraConfig, err, errMsg := HandleExtraConfig(req.ChartInfoId, req.ChartType, req.ExtraConfig)
 	if err != nil {
 		if errMsg == `` {
 			errMsg = "指标异常！"

services/data/chart_info_excel_balance.go

@@ -177,7 +177,7 @@ func addBalanceExcelChart(req request.AddBalanceTableChartReq, sysUserId int, sy
 	}
 
 	// 图表额外配置
-	extraConfig, _, err, errMsg = HandleExtraConfig(chartType, extraConfig)
+	extraConfig, _, err, errMsg = HandleExtraConfig(0, chartType, extraConfig)
 	if err != nil {
 		if errMsg == `` {
 			errMsg = "指标异常！"
@@ -480,7 +480,7 @@ func editBalanceExcelChart(req request.AddBalanceTableChartReq) (chartInfo *data
 	}*/
 
 	// 图表额外配置
-	extraConfig, _, err, errMsg = HandleExtraConfig(chartType, extraConfig)
+	extraConfig, _, err, errMsg = HandleExtraConfig(0, chartType, extraConfig)
 	if err != nil {
 		if errMsg == `` {
 			errMsg = "指标异常！"