|
@@ -205,7 +205,7 @@ func GetMixedTableCellData(mixedTableReq request.MixedTableReq) (newMixedTableCe
|
|
|
if val, ok2 := tmpDateValMap[relationDate]; ok2 {
|
|
|
//cell.ShowValue = fmt.Sprint(val)
|
|
|
cellKeyVal[cell.Uid] = val
|
|
|
- cell.ShowValue = utils.FormatTableDataShowValue(val)
|
|
|
+ cell.ShowValue = utils.FormatMixTableDataShowValue(val)
|
|
|
}
|
|
|
} else {
|
|
|
// 如果不是取得一个关联的日期,那么就是指定日期
|
|
@@ -236,7 +236,7 @@ func GetMixedTableCellData(mixedTableReq request.MixedTableReq) (newMixedTableCe
|
|
|
}
|
|
|
}
|
|
|
cellKeyVal[cell.Uid] = finalVal
|
|
|
- cell.ShowValue = utils.FormatTableDataShowValue(finalVal)
|
|
|
+ cell.ShowValue = utils.FormatMixTableDataShowValue(finalVal)
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
@@ -270,7 +270,7 @@ func GetMixedTableCellData(mixedTableReq request.MixedTableReq) (newMixedTableCe
|
|
|
if val, ok2 := tmpDateValMap[cell.DataTime]; ok2 {
|
|
|
//cell.ShowValue = fmt.Sprint(val)
|
|
|
cellKeyVal[cell.Uid] = val
|
|
|
- cell.ShowValue = utils.FormatTableDataShowValue(val)
|
|
|
+ cell.ShowValue = utils.FormatMixTableDataShowValue(val)
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -381,7 +381,7 @@ func GetMixedTableCellData(mixedTableReq request.MixedTableReq) (newMixedTableCe
|
|
|
}
|
|
|
val := tmpDataMap[cellDateTime]
|
|
|
cellKeyVal[cell.Uid] = val
|
|
|
- cell.ShowValue = utils.FormatTableDataShowValue(val)
|
|
|
+ cell.ShowValue = utils.FormatMixTableDataShowValue(val)
|
|
|
case request.DateCalculateDataDT: //日期计算
|
|
|
dateCalculateList = append(dateCalculateList, cell.Uid)
|
|
|
// 遍历数组,根据公式进行计算,并将得到的结果放到对应的单元格中
|
|
@@ -435,7 +435,7 @@ func GetMixedTableCellData(mixedTableReq request.MixedTableReq) (newMixedTableCe
|
|
|
}
|
|
|
|
|
|
cellKeyVal[cell.Uid] = val
|
|
|
- cell.ShowValue = utils.FormatTableDataShowValue(val)
|
|
|
+ cell.ShowValue = utils.FormatMixTableDataShowValue(val)
|
|
|
config[cellPosition.Column][cellPosition.Row] = cell
|
|
|
|
|
|
}
|
|
@@ -1051,7 +1051,7 @@ func handlerDateCalculate(dateCalculateList []string, calculateCellMap map[strin
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- cell.ShowValue = utils.FormatTableDataShowValue(val)
|
|
|
+ cell.ShowValue = utils.FormatMixTableDataShowValue(val)
|
|
|
config[cellPosition.Column][cellPosition.Row] = cell
|
|
|
}
|
|
|
}
|