xiziwen 2 months ago
parent
commit
12a9110a60
2 changed files with 4 additions and 0 deletions
  1. 1 0
      models/request/mixed_table.go
  2. 3 0
      services/excel/lucky_sheet.go

+ 1 - 0
models/request/mixed_table.go

@@ -169,6 +169,7 @@ type MixCellShowStyle struct {
 	BackgroundColor string      `description:"背景颜色值,#RRG" json:"background-color"`
 	Width           float64     `description:"单元格宽度" json:"width"`
 	Align           string      `description:"对齐方式:left|center|right" json:"align"`
+	FontSize        string      `description:"字体大小" json:"font-size"`
 }
 
 type DateDataBeforeAfterReq struct {

+ 3 - 0
services/excel/lucky_sheet.go

@@ -1271,6 +1271,9 @@ func GetTableDataByMixedTableData(config [][]request.MixedTableCellDataReq, hide
 						tmp.HorizontalType = 2
 						tmp.Ht = 2
 					}
+					if styleConfig.FontSize != "" {
+						tmp.Fs = styleConfig.FontSize
+					}
 					tmp.Monitor = cell.ShowFormatValue
 					// 如果没有showValue, 则使用value
 					if cell.ShowValue == "" {