Merge branch 'master' of https://github.com/shps951023/MiniExcel

shps951023 · shps951023 · commit 5e245820e80f · 2022-05-26T22:52:50.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -262,3 +262,4 @@ __pycache__/
 
 /BenchmarkDotNet.Artifacts
 /tests/MiniExcel.Tests.AspNetMvc/packages
+/TestTemplate
diff --git a/docs/README.zh-CN.md b/docs/README.zh-CN.md
@@ -23,13 +23,6 @@
 <p> 您的 <a href="https://github.com/shps951023/miniexcel">Star</a> 和 <a href="https://miniexcel.github.io">赞助</a> 能帮助 MiniExcel 成长 </p>
 </div>
 
----
-
-<div align="center">
-<p> 您的 <a href="https://github.com/shps951023/miniexcel">Star</a> 和 <a href="https://miniexcel.github.io">赞助</a> 能帮助 MiniExcel 成长 </p>
-</div>
-
-
 ---
 
 ### 1.26.2
diff --git a/src/MiniExcel/OpenXml/ExcelOpenXmlTemplate.Impl.cs b/src/MiniExcel/OpenXml/ExcelOpenXmlTemplate.Impl.cs
@@ -267,6 +267,11 @@ private void WriteSheetXml(Stream stream, XmlDocument doc, XmlNode sheetData)
                                     {
                                         cellValueStr = ConvertToDateTimeString(propInfo, cellValue);
                                     }
+                                    else if (TypeHelper.IsNumericType(type))
+                                    {
+                                        if (decimal.TryParse(cellValueStr, out var decimalValue))
+                                            cellValueStr = decimalValue.ToString(System.Globalization.CultureInfo.InvariantCulture);
+                                    }
 
                                     //TODO: ![image](https://user-images.githubusercontent.com/12729184/114848248-17735880-9e11-11eb-8258-63266bda0a1a.png)
                                     newRow.InnerXml = newRow.InnerXml.Replace(key, cellValueStr);
@@ -614,6 +619,7 @@ private void UpdateDimensionAndGetRowsInfo(Dictionary<string, object> inputMaps,
                             else if (decimal.TryParse(cellValueStr, out var outV))
                             {
                                 c.SetAttribute("t", "n");
+                                cellValueStr = outV.ToString(System.Globalization.CultureInfo.InvariantCulture);
                             }
                             else if (cellValue is bool)
                             {

Original file line number	Diff line number	Diff line change
`@@ -262,3 +262,4 @@ __pycache__/`
`262`	`262`
`263`	`263`	`/BenchmarkDotNet.Artifacts`
`264`	`264`	`/tests/MiniExcel.Tests.AspNetMvc/packages`
	`265`	`+/TestTemplate`
Original file line number	Diff line number	Diff line change
`@@ -267,6 +267,11 @@ private void WriteSheetXml(Stream stream, XmlDocument doc, XmlNode sheetData)`
`267`	`267`	`{`
`268`	`268`	`cellValueStr = ConvertToDateTimeString(propInfo, cellValue);`
`269`	`269`	`}`
	`270`	`+ else if (TypeHelper.IsNumericType(type))`
	`271`	`+ {`
	`272`	`+ if (decimal.TryParse(cellValueStr, out var decimalValue))`
	`273`	`+ cellValueStr = decimalValue.ToString(System.Globalization.CultureInfo.InvariantCulture);`
	`274`	`+ }`
`270`	`275`
`271`	`276`	`//TODO: ![image](https://user-images.githubusercontent.com/12729184/114848248-17735880-9e11-11eb-8258-63266bda0a1a.png)`
`272`	`277`	`newRow.InnerXml = newRow.InnerXml.Replace(key, cellValueStr);`
`@@ -614,6 +619,7 @@ private void UpdateDimensionAndGetRowsInfo(Dictionary<string, object> inputMaps,`
`614`	`619`	`else if (decimal.TryParse(cellValueStr, out var outV))`
`615`	`620`	`{`
`616`	`621`	`c.SetAttribute("t", "n");`
	`622`	`+ cellValueStr = outV.ToString(System.Globalization.CultureInfo.InvariantCulture);`
`617`	`623`	`}`
`618`	`624`	`else if (cellValue is bool)`
`619`	`625`	`{`