|
|
@@ -413,7 +413,16 @@ func GetMixedTableCellData(mixedTableReq request.MixedTableReq) (newMixedTableCe
|
|
|
dateCalculateList = append(dateCalculateList, cell.Uid)
|
|
|
// 遍历数组，根据公式进行计算，并将得到的结果放到对应的单元格中
|
|
|
}
|
|
|
- if cell.ShowValue != `` {
|
|
|
+ row[i] = cell
|
|
|
+ }
|
|
|
+ config[k] = row
|
|
|
+ }
|
|
|
+
|
|
|
+ // 处理显示值
|
|
|
+ for k, row := range config {
|
|
|
+ for i, cell := range row {
|
|
|
+ cell.ShowFormatValue = cell.ShowValue
|
|
|
+ if cell.ShowStyle != `` {
|
|
|
calculateCellMap[cell.Uid] = Cell{
|
|
|
Column: k,
|
|
|
Row: i,
|
|
|
@@ -422,6 +431,7 @@ func GetMixedTableCellData(mixedTableReq request.MixedTableReq) (newMixedTableCe
|
|
|
showStyleList = append(showStyleList, cell.Uid)
|
|
|
}
|
|
|
row[i] = cell
|
|
|
+ cellDataRelationMap[cell.Uid] = cell
|
|
|
}
|
|
|
config[k] = row
|
|
|
}
|
