Merge branch 'ETA_2.4.0' into debug

controllers/data_manage/excel/excel_info.go

@@ -3478,6 +3478,17 @@ func (c *ExcelInfoController) SaveExcelReference() {
 		return
 	}
 
+	excelInfo, err := excel3.GetExcelInfoByUnicode(req.UniqueCode)
+	if err != nil {
+		br.Msg = "获取表格信息失败"
+		br.ErrMsg = "获取表格信息失败，Err:" + err.Error()
+		return
+	}
+	if excelInfo.ExcelInfoId > 0 {
+		//删除公共图库那边的缓存
+		_ = utils.Rc.Delete(utils.HZ_CHART_LIB_EXCEL_TABLE_DETAIL + ":" + excelInfo.UniqueCode)
+	}
+
 	br.Msg = "添加成功"
 	br.Ret = 200
 	br.Success = true

models/data_manage/excel/request/mixed_table.go

@@ -143,6 +143,7 @@ type MixCellShowStyle struct {
 	Color           string      `description:"颜色值，#RRG" json:"color"`
 	BackgroundColor string      `description:"背景颜色值，#RRG" json:"background-color"`
 	Align           string      `description:"对齐方式：left|center|right" json:"align"`
+	FontSize        string      `description:"字号大小" json:"font-size"`
 }
 
 type DateDataBeforeAfterReq struct {