。。

services/data/table/mixed_table.go

@@ -229,15 +229,16 @@ func GetMixedTableCellData(mixedTableReq request.MixedTableReq) (newMixedTableCe
 								if err != nil {
 									return
 								}
-								var finalVal float64
+								var finalVal string
 								for _, v := range dateValList {
 									if v.DataTime == newDate {
-										finalVal = v.Value
+										finalVal = utils.FormatMixTableDataShowValue(v.Value)
+										cellKeyVal[cell.Uid] = v.Value
 										break
 									}
 								}
-								cellKeyVal[cell.Uid] = finalVal
-								cell.ShowValue = utils.FormatMixTableDataShowValue(finalVal)
+
+								cell.ShowValue = finalVal
 							}
 						}
 					} else {
@@ -386,9 +387,13 @@ func GetMixedTableCellData(mixedTableReq request.MixedTableReq) (newMixedTableCe
 					utils.FileLog.Error(fmt.Sprintf("日期变换失败，配置信息;%s， 日期：%s", cell.Value, cellDateTime))
 					continue
 				}
-				val := tmpDataMap[cellDateTime]
-				cellKeyVal[cell.Uid] = val
-				cell.ShowValue = utils.FormatMixTableDataShowValue(val)
+				val, ok := tmpDataMap[cellDateTime]
+				if ok {
+					cellKeyVal[cell.Uid] = val
+					cell.ShowValue = utils.FormatMixTableDataShowValue(val)
+				} else {
+					cell.ShowValue = ""
+				}
 			case request.DateCalculateDataDT: //日期计算
 				dateCalculateList = append(dateCalculateList, cell.Uid)
 				// 遍历数组，根据公式进行计算，并将得到的结果放到对应的单元格中