|
@@ -245,6 +245,7 @@ func GetEnNameMapByCnNameList(cnNameList []string) (contentEnMap map[string]stri
|
|
|
|
|
|
// handleSectionScatterChartData 截面组合图的英文文案处理
|
|
|
func handleChartSectionCombineData(extraConfig data_manage.ChartSectionAllExtraConf) (newExtraConfig data_manage.ChartSectionAllExtraConf, err error, errMsg string) {
|
|
|
+ dateConfListMapSave := make(map[string]bool)
|
|
|
for k, v := range extraConfig.DateConfList {
|
|
|
if v.DateConfNameEn == "" {
|
|
|
extraConfig.DateConfList[k].DateConfNameEn = v.DateConfName
|
|
@@ -270,9 +271,20 @@ func handleChartSectionCombineData(extraConfig data_manage.ChartSectionAllExtraC
|
|
|
if v.SeriesNameEn == `` {
|
|
|
extraConfig.SeriesList[k].SeriesNameEn = v.SeriesName
|
|
|
}
|
|
|
+ for _, info := range v.EdbInfoList {
|
|
|
+ if info.DateConfType == 1 && info.DateConfName != "" {
|
|
|
+ dateConfListMapSave[info.DateConfName] = true
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
-
|
|
|
newExtraConfig = extraConfig
|
|
|
+ // 去掉没有被引用的配置
|
|
|
+ newExtraConfig.DateConfList = make([]*data_manage.ChartSectionDateConfItem, 0)
|
|
|
+ for _, v := range extraConfig.DateConfList {
|
|
|
+ if _, ok := dateConfListMapSave[v.DateConfName]; ok {
|
|
|
+ newExtraConfig.DateConfList = append(newExtraConfig.DateConfList, v)
|
|
|
+ }
|
|
|
+ }
|
|
|
return
|
|
|
}
|
|
|
|