|
|
@@ -167,8 +167,12 @@ func GetMixedTableCellData(mixedTableReq request.MixedTableReq) (newMixedTableCe
|
|
|
CellInfo: cell,
|
|
|
}
|
|
|
case request.EdbDT: // 指标类型
|
|
|
- if edbInfo, ok := edbInfoMap[cell.EdbInfoId]; ok {
|
|
|
- cell.ShowValue = edbInfo.EdbName
|
|
|
+ if cell.Value == `` {
|
|
|
+ if edbInfo, ok := edbInfoMap[cell.EdbInfoId]; ok {
|
|
|
+ cell.ShowValue = edbInfo.EdbName
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ cell.ShowValue = cell.Value
|
|
|
}
|
|
|
case request.InsertDataDT, request.PopInsertDataDT: // 数据类型
|
|
|
// 数值先清空
|
|
|
@@ -418,7 +422,7 @@ func GetMixedTableCellData(mixedTableReq request.MixedTableReq) (newMixedTableCe
|
|
|
config[k] = row
|
|
|
}
|
|
|
|
|
|
- // 处理显示值
|
|
|
+ // 处理指定指标的日期
|
|
|
for k, row := range config {
|
|
|
for i, cell := range row {
|
|
|
cell.ShowFormatValue = cell.ShowValue
|
