Merge branch 'bzq/mix_table_style' of eta_server/eta_chart_lib into master

models/request/mixed_table.go

@@ -167,6 +167,8 @@ type MixCellShowStyle struct {
 	Last            string      `description:"起始操作：nt|decimal" json:"last"`
 	Color           string      `description:"颜色值，#RRG" json:"color"`
 	BackgroundColor string      `description:"背景颜色值，#RRG" json:"background-color"`
+	Width           float64     `description:"单元格宽度" json:"width"`
+	Align           string      `description:"对齐方式：left|center|right" json:"align"`
 }
 
 type DateDataBeforeAfterReq struct {

services/excel/lucky_sheet.go

@@ -1247,6 +1247,17 @@ func GetTableDataByMixedTableData(config [][]request.MixedTableCellDataReq, hide
 					if styleConfig.Color != "" {
 						tmp.FontColor = styleConfig.Color
 					}
+					switch styleConfig.Align {
+					case "center":
+						tmp.HorizontalType = 0
+						tmp.Ht = 0
+					case "left":
+						tmp.HorizontalType = 1
+						tmp.Ht = 1
+					case "right":
+						tmp.HorizontalType = 2
+						tmp.Ht = 2
+					}
 					tmp.Monitor = cell.ShowFormatValue
 					// 如果没有showValue, 则使用value
 					if cell.ShowValue == "" {