Browse Source

Merge branch 'feature/eta1.5.6_excel' into debug

xyxie 1 year ago
parent
commit
78d879c738
1 changed files with 6 additions and 2 deletions
  1. 6 2
      services/data/table/mixed_table.go

+ 6 - 2
services/data/table/mixed_table.go

@@ -1186,8 +1186,12 @@ func handleMixCellShowStyle(showStyleList []string, calculateCellMap map[string]
 				return
 			}
 
-			val = changePointDecimalPlaces(val, styleConf.Pn, styleConf.Nt, isPercent)
-			cell.ShowFormatValue = val
+			if styleConf.Pn != 0 || styleConf.Nt != "" {
+				val = changePointDecimalPlaces(val, styleConf.Pn, styleConf.Nt, isPercent)
+				cell.ShowFormatValue = val
+			} else {
+				cell.ShowFormatValue = cell.ShowStyle
+			}
 			config[cellPosition.Column][cellPosition.Row] = cell
 		}
 	}