Merge branch 'bzq1/lt_excel' of eta_server/eta_api into master

models/data_manage/excel/request/mixed_table.go

@@ -136,10 +136,12 @@ type MixCellShowStyle struct {
 	Pn              int         `description:"小数点位数增加或减少，正数表述增加，负数表示减少" json:"pn"`
 	Nt              string      `description:"变换类型：number 小数点位数改变，percent百分比," json:"nt"`
 	GlObj           interface{} `description:"公式对象：1：数值，2：百分比，3：文本" json:"glObj"`
+	Width           float64     `description:"单元格宽度" json:"width"`
 	Decimal         *int        `description:"小数点位数" json:"decimal"`
 	Last            string      `description:"起始操作：nt|decimal" json:"last"`
 	Color           string      `description:"颜色值，#RRG" json:"color"`
 	BackgroundColor string      `description:"背景颜色值，#RRG" json:"background-color"`
+	Align           string      `description:"对齐方式：left|center|right" json:"align"`
 }
 
 type DateDataBeforeAfterReq struct {

services/data/excel/mixed_table.go

@@ -465,12 +465,41 @@ func GetMixedTableCellData(mixedTableReq request.MixedTableReq, lang string) (ne
 	if err != nil {
 		return
 	}
+	config = setDefaultCellWidth(config)
 
 	newMixedTableCellDataList = config
 
 	return
 }
 
+func setDefaultCellWidth(config [][]request.MixedTableCellDataReq) (newConfig [][]request.MixedTableCellDataReq) {
+	newConfig = config
+	for i, row := range config {
+		for j, cell := range row {
+			var styleConf request.MixCellShowStyle
+			if cell.ShowStyle == `` {
+				styleConf = request.MixCellShowStyle{
+					Width: 140,
+				}
+			} else {
+				err := json.Unmarshal([]byte(cell.ShowStyle), &styleConf)
+				if err != nil {
+					continue
+				}
+				if styleConf.Width == 0 {
+					styleConf.Width = 140
+				}
+			}
+			tmpStyleConf, err := json.Marshal(styleConf)
+			if err == nil {
+				cell.ShowStyle = string(tmpStyleConf)
+			}
+			newConfig[i][j] = cell
+		}
+	}
+	return
+}
+
 // getCalculateValue 获取公式计算的结果
 func getCalculateValueByCell(calculateCellMap map[string]Cell, key string, cellKeyValMap map[string]float64) (val float64, has bool, err error, errMsg string) {
 	// 单元格的标签名
@@ -1211,11 +1240,12 @@ func handleMixCellShowStyle(showStyleList []string, calculateCellMap map[string]
 				// 前端传过来的json中有可能有glObj，需要去掉
 				if styleConf.GlObj != nil {
 					styleConf.GlObj = nil
-					tmpStyleConf, err := json.Marshal(styleConf)
-					if err == nil {
-						cell.ShowStyle = string(tmpStyleConf)
-					}
 				}
+				tmpStyleConf, err := json.Marshal(styleConf)
+				if err == nil {
+					cell.ShowStyle = string(tmpStyleConf)
+				}
+
 				config[cellPosition.Column][cellPosition.Row] = cell
 				continue
 			}

services/excel/lucky_sheet.go

@@ -1753,13 +1753,24 @@ func GetTableDataByMixedTableData(config [][]request.MixedTableCellDataReq, hide
 					if err := json.Unmarshal([]byte(cell.ShowStyle), &styleConfig); err != nil {
 						utils.FileLog.Info("表格样式showStyle解析失败", err.Error())
 					}
-					showFormatValue := fmt.Sprintf("%v", cell.ShowFormatValue)
 					if styleConfig.BackgroundColor != "" {
 						tmp.Background = styleConfig.BackgroundColor
 					}
 					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
+					}
+					showFormatValue := fmt.Sprintf("%v", cell.ShowFormatValue)
 					tmp.Monitor = showFormatValue
 					// 如果没有showValue, 则使用value
 					if cell.ShowValue == "" {