|
@@ -245,90 +245,30 @@ func GetEnNameMapByCnNameList(cnNameList []string) (contentEnMap map[string]stri
|
|
|
|
|
|
// handleSectionScatterChartData 截面组合图的英文文案处理
|
|
|
func handleChartSectionCombineData(extraConfig data_manage.ChartSectionAllExtraConf) (newExtraConfig data_manage.ChartSectionAllExtraConf, err error, errMsg string) {
|
|
|
- translateNameList := make([]string, 0)
|
|
|
- translateNameMap := make(map[string]bool, 0)
|
|
|
- for _, v := range extraConfig.DateConfList {
|
|
|
- if _, ok := translateNameMap[v.DateConfName]; !ok && v.DateConfNameEn == "" {
|
|
|
- translateNameMap[v.DateConfName] = true
|
|
|
- tmpName := strings.TrimSuffix(v.DateConfName, " ")
|
|
|
- tmpName = strings.TrimPrefix(tmpName, " ")
|
|
|
- translateNameList = append(translateNameList, tmpName)
|
|
|
+ for k, v := range extraConfig.DateConfList {
|
|
|
+ if v.DateConfNameEn == "" {
|
|
|
+ extraConfig.DateConfList[k].DateConfNameEn = v.DateConfName
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if _, ok := translateNameMap[extraConfig.UnitList.LeftName]; !ok && extraConfig.UnitList.LeftNameEn == "" {
|
|
|
- translateNameMap[extraConfig.UnitList.LeftName] = true
|
|
|
- tmpName := strings.TrimSuffix(extraConfig.UnitList.LeftName, " ")
|
|
|
- tmpName = strings.TrimPrefix(tmpName, " ")
|
|
|
- translateNameList = append(translateNameList, tmpName)
|
|
|
- }
|
|
|
- if _, ok := translateNameMap[extraConfig.UnitList.RightName]; !ok && extraConfig.UnitList.RightNameEn == "" {
|
|
|
- translateNameMap[extraConfig.UnitList.RightName] = true
|
|
|
- tmpName := strings.TrimSuffix(extraConfig.UnitList.RightName, " ")
|
|
|
- tmpName = strings.TrimPrefix(tmpName, " ")
|
|
|
- translateNameList = append(translateNameList, tmpName)
|
|
|
- }
|
|
|
- if _, ok := translateNameMap[extraConfig.UnitList.RightTwoName]; !ok && extraConfig.UnitList.RightTwoNameEn == "" {
|
|
|
- translateNameMap[extraConfig.UnitList.RightTwoName] = true
|
|
|
- tmpName := strings.TrimSuffix(extraConfig.UnitList.RightTwoName, " ")
|
|
|
- tmpName = strings.TrimPrefix(tmpName, " ")
|
|
|
- translateNameList = append(translateNameList, tmpName)
|
|
|
+ if extraConfig.UnitList.LeftNameEn == "" {
|
|
|
+ extraConfig.UnitList.LeftNameEn = extraConfig.UnitList.LeftName
|
|
|
}
|
|
|
-
|
|
|
- for _, v := range extraConfig.XDataList {
|
|
|
- if _, ok := translateNameMap[v.Name]; !ok && v.NameEn == "" {
|
|
|
- translateNameMap[v.Name] = true
|
|
|
- tmpName := strings.TrimSuffix(v.Name, " ")
|
|
|
- tmpName = strings.TrimPrefix(tmpName, " ")
|
|
|
- translateNameList = append(translateNameList, tmpName)
|
|
|
- }
|
|
|
- }
|
|
|
- for _, v := range extraConfig.SeriesList {
|
|
|
- if v.SeriesNameEn == `` {
|
|
|
- if _, ok := translateNameMap[v.SeriesName]; !ok {
|
|
|
- translateNameMap[v.SeriesName] = true
|
|
|
- tmpName := strings.TrimSuffix(v.SeriesName, " ")
|
|
|
- tmpName = strings.TrimPrefix(tmpName, " ")
|
|
|
- translateNameList = append(translateNameList, tmpName)
|
|
|
- }
|
|
|
- }
|
|
|
+ if extraConfig.UnitList.RightNameEn == "" {
|
|
|
+ extraConfig.UnitList.RightNameEn = extraConfig.UnitList.RightName
|
|
|
}
|
|
|
-
|
|
|
- // 获取英文名称map
|
|
|
- enNameMap, _, _ := GetEnNameMapByCnNameList(translateNameList)
|
|
|
-
|
|
|
- for k, seriesItem := range extraConfig.SeriesList {
|
|
|
- if len(seriesItem.EdbInfoList) <= 0 {
|
|
|
- errMsg = "指标不能为空"
|
|
|
- err = errors.New(errMsg)
|
|
|
- return
|
|
|
- }
|
|
|
- if seriesItem.SeriesNameEn == `` { //系列英文名称
|
|
|
- if tmpNameEn, ok := enNameMap[seriesItem.SeriesName]; ok {
|
|
|
- seriesItem.SeriesNameEn = tmpNameEn
|
|
|
- }
|
|
|
- }
|
|
|
- extraConfig.SeriesList[k] = seriesItem
|
|
|
+ if extraConfig.UnitList.RightTwoNameEn == "" {
|
|
|
+ extraConfig.UnitList.RightTwoNameEn = extraConfig.UnitList.RightTwoName
|
|
|
}
|
|
|
|
|
|
for k, v := range extraConfig.XDataList {
|
|
|
- if tmpNameEn, ok := enNameMap[v.Name]; ok && v.NameEn == "" {
|
|
|
- extraConfig.XDataList[k].NameEn = tmpNameEn
|
|
|
+ if v.NameEn == "" {
|
|
|
+ extraConfig.XDataList[k].NameEn = v.Name
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- if tmpNameEn, ok := enNameMap[extraConfig.UnitList.LeftName]; ok && extraConfig.UnitList.LeftNameEn == "" {
|
|
|
- extraConfig.UnitList.LeftName = tmpNameEn
|
|
|
- }
|
|
|
- if tmpNameEn, ok := enNameMap[extraConfig.UnitList.RightName]; ok && extraConfig.UnitList.RightNameEn == "" {
|
|
|
- extraConfig.UnitList.RightName = tmpNameEn
|
|
|
- }
|
|
|
- if tmpNameEn, ok := enNameMap[extraConfig.UnitList.RightTwoName]; ok && extraConfig.UnitList.RightTwoNameEn == "" {
|
|
|
- extraConfig.UnitList.RightTwoName = tmpNameEn
|
|
|
- }
|
|
|
- for k, v := range extraConfig.DateConfList {
|
|
|
- if tmpNameEn, ok := enNameMap[v.DateConfName]; ok && v.DateConfNameEn == "" {
|
|
|
- extraConfig.DateConfList[k].DateConfNameEn = tmpNameEn
|
|
|
+ for k, v := range extraConfig.SeriesList {
|
|
|
+ if v.SeriesNameEn == `` {
|
|
|
+ extraConfig.SeriesList[k].SeriesNameEn = v.SeriesName
|
|
|
}
|
|
|
}
|
|
|
|