Browse Source

Merge branch 'bzq1/fix_excel_history_data' of eta_server/eta_api into debug

baoziqiang 4 months ago
parent
commit
408e8d8664
1 changed files with 4 additions and 1 deletions
  1. 4 1
      services/excel/lucky_sheet.go

+ 4 - 1
services/excel/lucky_sheet.go

@@ -1802,8 +1802,11 @@ func GetTableDataByMixedTableData(config [][]request.MixedTableCellDataReq, hide
 								tmp.Monitor = cell.ShowValue
 							}
 						}
+					} else {
+						if cell.DataType == request.CustomTextDT {
+							tmp.Monitor = cell.Value
+						}
 					}
-
 					// 	switch styleConfig.Last {
 					// 	case "nt":
 					// 		// 先进行数字的百分比计算,然后保留小数点位数