Skip to content

feat(ExcelOpenXmlSheetWriter): adjust the location of the CustomFormatter execution #722

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shps951023 merged 2 commits into from
Feb 7, 2025
Merged

feat(ExcelOpenXmlSheetWriter): adjust the location of the CustomFormatter execution #722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8a4d1f
adjust the location of the `CustomFormatter` execution
izanhzh Feb 6, 2025
0b2e275
fix bug
izanhzh Feb 6, 2025
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
20 changes: 10 additions & 10 deletions src/MiniExcel/OpenXml/ExcelOpenXmlSheetWriter.Async.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,16 +325,7 @@ private async Task WriteCellAsync(MiniExcelAsyncStreamWriter writer, string cell

private async Task WriteCellAsync(MiniExcelAsyncStreamWriter writer, int rowIndex, int cellIndex, object value, ExcelColumnInfo p, ExcelWidthCollection widthCollection)
{
var columnReference = ExcelOpenXmlUtils.ConvertXyToCell(cellIndex, rowIndex);
var valueIsNull = value is null || value is DBNull;

if (_configuration.EnableWriteNullValueCell && valueIsNull)
{
await writer.WriteAsync(WorksheetXml.EmptyCell(columnReference, GetCellXfId("2")));
return;
}

if (p.CustomFormatter != null)
if (p?.CustomFormatter != null)
{
try
{
Expand All @@ -346,6 +337,15 @@ private async Task WriteCellAsync(MiniExcelAsyncStreamWriter writer, int rowInde
}
}

var columnReference = ExcelOpenXmlUtils.ConvertXyToCell(cellIndex, rowIndex);
var valueIsNull = value is null || value is DBNull;

if (_configuration.EnableWriteNullValueCell && valueIsNull)
{
await writer.WriteAsync(WorksheetXml.EmptyCell(columnReference, GetCellXfId("2")));
return;
}

var tuple = GetCellValue(rowIndex, cellIndex, value, p, valueIsNull);

var styleIndex = tuple.Item1;
Expand Down
18 changes: 9 additions & 9 deletions src/MiniExcel/OpenXml/ExcelOpenXmlSheetWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,15 +325,6 @@ private void PrintHeader(MiniExcelStreamWriter writer, List<ExcelColumnInfo> pro

private void WriteCell(MiniExcelStreamWriter writer, int rowIndex, int cellIndex, object value, ExcelColumnInfo columnInfo, ExcelWidthCollection widthCollection)
{
var columnReference = ExcelOpenXmlUtils.ConvertXyToCell(cellIndex, rowIndex);
var valueIsNull = value is null || value is DBNull;

if (_configuration.EnableWriteNullValueCell && valueIsNull)
{
writer.Write(WorksheetXml.EmptyCell(columnReference, GetCellXfId("2")));
return;
}

if (columnInfo?.CustomFormatter != null)
{
try
Expand All @@ -346,6 +337,15 @@ private void WriteCell(MiniExcelStreamWriter writer, int rowIndex, int cellIndex
}
}

var columnReference = ExcelOpenXmlUtils.ConvertXyToCell(cellIndex, rowIndex);
var valueIsNull = value is null || value is DBNull;

if (_configuration.EnableWriteNullValueCell && valueIsNull)
{
writer.Write(WorksheetXml.EmptyCell(columnReference, GetCellXfId("2")));
return;
}

var tuple = GetCellValue(rowIndex, cellIndex, value, columnInfo, valueIsNull);

var styleIndex = tuple.Item1; // https://learn.microsoft.com/en-us/dotnet/api/documentformat.openxml.spreadsheet.cell?view=openxml-3.0.1
Expand Down
Loading