|
@@ -903,10 +903,10 @@ var LuckyFontFamilyMap = map[int]string{
|
|
|
2: "Tahoma",
|
|
|
3: "Verdana",
|
|
|
4: "微软雅黑",
|
|
|
- 5: "宋体",
|
|
|
- 6: "黑体",
|
|
|
- 7: "楷体",
|
|
|
- 8: "仿宋",
|
|
|
+ 5: "宋体",
|
|
|
+ 6: "黑体",
|
|
|
+ 7: "楷体",
|
|
|
+ 8: "仿宋",
|
|
|
9: "新宋体",
|
|
|
10: "华文新魏",
|
|
|
11: "华文行楷",
|
|
@@ -1684,11 +1684,16 @@ func GetTableDataByMixedTableData(config [][]request.MixedTableCellDataReq) (sel
|
|
|
for _, row := range config {
|
|
|
dataCol := make([]LuckySheetDataValue, 0)
|
|
|
for _, cell := range row {
|
|
|
- dataCol = append(dataCol, LuckySheetDataValue{
|
|
|
+ tmp := LuckySheetDataValue{
|
|
|
Value: cell.Value,
|
|
|
Monitor: cell.ShowValue,
|
|
|
MergeCell: LuckySheetDataConfigMerge{},
|
|
|
- })
|
|
|
+ }
|
|
|
+ if cell.ShowStyle != "" {
|
|
|
+ showFormatValue := fmt.Sprintf("%v", cell.ShowFormatValue)
|
|
|
+ tmp.Monitor = showFormatValue
|
|
|
+ }
|
|
|
+ dataCol = append(dataCol, tmp)
|
|
|
}
|
|
|
tableDataList = append(tableDataList, dataCol)
|
|
|
}
|