Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions src/MiniExcel/OpenXml/ExcelOpenXmlSheetWriter.DefaultOpenXml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -217,12 +217,17 @@ private Tuple<string, string, string> GetCellValue(int rowIndex, int cellIndex,

if (TypeHelper.IsNumericType(type))
{
var dataType = _configuration.Culture == CultureInfo.InvariantCulture ? "n" : "str";
string cellValue;
var cellValue = GetNumericValue(value, type);

cellValue = GetNumericValue(value, type);

return Tuple.Create("2", dataType, cellValue);
if (columnInfo == null || columnInfo.ExcelFormat == null)
{
var dataType = _configuration.Culture == CultureInfo.InvariantCulture ? "n" : "str";
return Tuple.Create("2", dataType, cellValue);
}
else
{
return Tuple.Create(columnInfo.ExcelFormatId.ToString(), (string)null, cellValue);
}
}

if (type == typeof(bool))
Expand Down
2 changes: 1 addition & 1 deletion src/MiniExcel/OpenXml/Styles/SheetStyleBuildContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ public async Task InitializeAsync(SheetStyleElementInfos generateElementInfos)
NewXmlWriter = XmlWriter.Create(newXmlWriterStream, new XmlWriterSettings() { Indent = true, Encoding = _encoding, Async = true });

GenerateElementInfos = generateElementInfos;
ColumnsToApply = SheetStyleBuilderHelper.GenerateStyleIds(OldElementInfos.CellXfCount + generateElementInfos.CellXfCount, _columns);
ColumnsToApply = SheetStyleBuilderHelper.GenerateStyleIds(OldElementInfos.CellXfCount + generateElementInfos.CellXfCount, _columns).ToArray();//这里暂时加ToArray,避免多次计算,如果有性能问题再考虑优化
CustomFormatCount = ColumnsToApply.Count();

initialized = true;
Expand Down
Loading
Loading