浏览代码

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

xyxie 1 年之前
父节点
当前提交
78d879c738
共有 1 个文件被更改,包括 6 次插入2 次删除
  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
 				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
 			config[cellPosition.Column][cellPosition.Row] = cell
 		}
 		}
 	}
 	}