|
@@ -1224,6 +1224,13 @@ func GetTableDataByMixedTableData(config [][]request.MixedTableCellDataReq, hide
|
|
tmp.FontColor = styleConfig.Color
|
|
tmp.FontColor = styleConfig.Color
|
|
}
|
|
}
|
|
tmp.Monitor = cell.ShowFormatValue
|
|
tmp.Monitor = cell.ShowFormatValue
|
|
|
|
+ // 如果没有showValue, 则使用value
|
|
|
|
+ if cell.ShowValue == "" {
|
|
|
|
+ _, err := strconv.ParseFloat(cell.Value, 64)
|
|
|
|
+ if err == nil {
|
|
|
|
+ cell.ShowValue = cell.Value
|
|
|
|
+ }
|
|
|
|
+ }
|
|
_, err := strconv.ParseFloat(cell.ShowValue, 64)
|
|
_, err := strconv.ParseFloat(cell.ShowValue, 64)
|
|
if err == nil {
|
|
if err == nil {
|
|
hasPercent := false
|
|
hasPercent := false
|