Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
Original file line number Diff line number Diff line change
Expand Up @@ -364,9 +364,14 @@ protected override async Task GenerateCellXfAsync()
};

/* Empty style is required because Excel always considers the first one to be the default and ignores all its properties
* <x:xf />
* <x:xf numFmtId="0" fontId="0" fillId="0" borderId="0" xfId="0" />
* */
await NewWriter.WriteStartElementAsync(OldReader.Prefix, "xf", OldReader.NamespaceURI).ConfigureAwait(false);
await NewWriter.WriteAttributeStringAsync(null, "numFmtId", null, "0").ConfigureAwait(false);
await NewWriter.WriteAttributeStringAsync(null, "fontId", null, "0").ConfigureAwait(false);
await NewWriter.WriteAttributeStringAsync(null, "fillId", null, "0").ConfigureAwait(false);
await NewWriter.WriteAttributeStringAsync(null, "borderId", null, "0").ConfigureAwait(false);
await NewWriter.WriteAttributeStringAsync(null, "xfId", null, "0").ConfigureAwait(false);
await NewWriter.WriteEndElementAsync().ConfigureAwait(false);

/*
Expand Down
45 changes: 32 additions & 13 deletions src/MiniExcel.OpenXml/Styles/Builder/MinimalSheetStyleBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -85,24 +85,39 @@ protected override async Task GenerateCellStyleXfAsync()
protected override async Task GenerateCellXfAsync()
{
/*
* <x:xf />
* <x:xf />
* <x:xf />
* <x:xf numFmtId="14" applyNumberFormat="1" />
* <x:xf />
* <x:xf numFmtId="21" applyNumberFormat="1" />
*/
await NewWriter.WriteStartElementAsync(OldReader.Prefix, "xf", OldReader.NamespaceURI).ConfigureAwait(false);
await NewWriter.WriteEndElementAsync().ConfigureAwait(false);
await NewWriter.WriteStartElementAsync(OldReader.Prefix, "xf", OldReader.NamespaceURI).ConfigureAwait(false);
await NewWriter.WriteEndElementAsync().ConfigureAwait(false);
await NewWriter.WriteStartElementAsync(OldReader.Prefix, "xf", OldReader.NamespaceURI).ConfigureAwait(false);
await NewWriter.WriteEndElementAsync().ConfigureAwait(false);
* <x:xf numFmtId="0" fontId="0" fillId="0" borderId="0" xfId="0" />
* <x:xf numFmtId="0" fontId="0" fillId="0" borderId="0" xfId="0" />
* <x:xf numFmtId="0" fontId="0" fillId="0" borderId="0" xfId="0" />
* <x:xf numFmtId="14" fontId="0" fillId="0" borderId="0" xfId="0" applyNumberFormat="1" />
* <x:xf numFmtId="0" fontId="0" fillId="0" borderId="0" xfId="0" />
* <x:xf numFmtId="21" fontId="0" fillId="0" borderId="0" xfId="0" applyNumberFormat="1" />
* */

for (int i = 0; i < 3; i++)
{
await NewWriter.WriteStartElementAsync(OldReader.Prefix, "xf", OldReader.NamespaceURI).ConfigureAwait(false);
await NewWriter.WriteAttributeStringAsync(null, "numFmtId", null, "0").ConfigureAwait(false);
await NewWriter.WriteAttributeStringAsync(null, "fontId", null, "0").ConfigureAwait(false);
await NewWriter.WriteAttributeStringAsync(null, "fillId", null, "0").ConfigureAwait(false);
await NewWriter.WriteAttributeStringAsync(null, "borderId", null, "0").ConfigureAwait(false);
await NewWriter.WriteAttributeStringAsync(null, "xfId", null, "0").ConfigureAwait(false);
await NewWriter.WriteEndElementAsync().ConfigureAwait(false);
}

await NewWriter.WriteStartElementAsync(OldReader.Prefix, "xf", OldReader.NamespaceURI).ConfigureAwait(false);
await NewWriter.WriteAttributeStringAsync(null, "numFmtId", null, "14").ConfigureAwait(false);
await NewWriter.WriteAttributeStringAsync(null, "fontId", null, "0").ConfigureAwait(false);
await NewWriter.WriteAttributeStringAsync(null, "fillId", null, "0").ConfigureAwait(false);
await NewWriter.WriteAttributeStringAsync(null, "borderId", null, "0").ConfigureAwait(false);
await NewWriter.WriteAttributeStringAsync(null, "xfId", null, "0").ConfigureAwait(false);
await NewWriter.WriteAttributeStringAsync(null, "applyNumberFormat", null, "1").ConfigureAwait(false);
await NewWriter.WriteEndElementAsync().ConfigureAwait(false);
await NewWriter.WriteStartElementAsync(OldReader.Prefix, "xf", OldReader.NamespaceURI).ConfigureAwait(false);
await NewWriter.WriteAttributeStringAsync(null, "numFmtId", null, "0").ConfigureAwait(false);
await NewWriter.WriteAttributeStringAsync(null, "fontId", null, "0").ConfigureAwait(false);
await NewWriter.WriteAttributeStringAsync(null, "fillId", null, "0").ConfigureAwait(false);
await NewWriter.WriteAttributeStringAsync(null, "borderId", null, "0").ConfigureAwait(false);
await NewWriter.WriteAttributeStringAsync(null, "xfId", null, "0").ConfigureAwait(false);
await NewWriter.WriteEndElementAsync().ConfigureAwait(false);
await NewWriter.WriteStartElementAsync(OldReader.Prefix, "xf", OldReader.NamespaceURI).ConfigureAwait(false);
await NewWriter.WriteAttributeStringAsync(null, "numFmtId", null, "21").ConfigureAwait(false);
Expand All @@ -117,6 +132,10 @@ protected override async Task GenerateCellXfAsync()
*/
await NewWriter.WriteStartElementAsync(OldReader.Prefix, "xf", OldReader.NamespaceURI).ConfigureAwait(false);
await NewWriter.WriteAttributeStringAsync(null, "numFmtId", null, (numFmtIndex + i).ToString()).ConfigureAwait(false);
await NewWriter.WriteAttributeStringAsync(null, "fontId", null, "0").ConfigureAwait(false);
await NewWriter.WriteAttributeStringAsync(null, "fillId", null, "0").ConfigureAwait(false);
await NewWriter.WriteAttributeStringAsync(null, "borderId", null, "0").ConfigureAwait(false);
await NewWriter.WriteAttributeStringAsync(null, "xfId", null, "0").ConfigureAwait(false);
await NewWriter.WriteAttributeStringAsync(null, "applyNumberFormat", null, "1").ConfigureAwait(false);
await NewWriter.WriteEndElementAsync().ConfigureAwait(false);
}
Expand Down
48 changes: 24 additions & 24 deletions tests/MiniExcel.OpenXml.Tests/MiniExcelIssueAsyncTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1507,6 +1507,30 @@ class Issue520Dto(long l1, DateTime dt, long l2)
public long ValueToSettle { get; set; } = l2;
}

[Fact]
public async Task TestIssue627()
{
var data = new[] { new { LongNumber = "1550432695793487872" } };

var config = new OpenXmlConfiguration
{
DynamicColumns =
[
new DynamicExcelColumn("LongNumber") { Format = "@" }
]
};

await using var ms = new MemoryStream();
await _excelExporter.ExportAsync(ms, data, configuration: config);
ms.Seek(0, SeekOrigin.Begin);

using var package = new ExcelPackage(ms);
var cell = package.Workbook.Worksheets[0].Cells["A2"];

Assert.Equal("1550432695793487872", cell.GetValue<string>());
Assert.Equal("@", cell.Style.Numberformat.Format);
}

[Fact]
public async Task TestIssue951()
{
Expand Down Expand Up @@ -1534,28 +1558,4 @@ class Issue951

public object this[string test] => new();
}

[Fact]
public async Task TestIssue627()
{
var data = new[] { new { LongNumber = "1550432695793487872" } };

var config = new OpenXmlConfiguration
{
DynamicColumns =
[
new DynamicExcelColumn("LongNumber") { Format = "@" }
]
};

await using var ms = new MemoryStream();
await _excelExporter.ExportAsync(ms, data, configuration: config);
ms.Seek(0, SeekOrigin.Begin);

using var package = new ExcelPackage(ms);
var cell = package.Workbook.Worksheets[0].Cells["A2"];

Assert.Equal("1550432695793487872", cell.GetValue<string>());
Assert.Equal("@", cell.Style.Numberformat.Format);
}
}
Loading
Loading