test/MiniExcel
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/MiniExcel.git synced 2024-11-29 18:38:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix QueryAsDataTable can't read Excel with only header rows (#647)

Browse Source 
* Fixed an issue with QueryAsDataTable that only header rows cannot be read correctly

* handling null value
This commit is contained in:
Amos 2024-08-13 22:27:47 +08:00 committed by GitHub
parent 6161e299fd
commit 4b7f1696db
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/MiniExcel/MiniExcel.cs
View File

@ -184,31 +184,35 @@
var dt = new DataTable(sheetName);
var first = true;
var rows = ExcelReaderFactory.GetProvider(stream, ExcelTypeHelper.GetExcelType(stream, excelType), configuration).Query(useHeaderRow, sheetName, startCell);
var rows = ExcelReaderFactory.GetProvider(stream, ExcelTypeHelper.GetExcelType(stream, excelType), configuration).Query(false, sheetName, startCell);
var keys = new List<string>();
var columnDict = new Dictionary<string, string>();
foreach (IDictionary<string, object> row in rows)
{
if (first)
{
foreach (var key in row.Keys)
foreach (var entry in row)
{
if (!string.IsNullOrEmpty(key)) // avoid #298 : Column '' does not belong to table
var columnName = useHeaderRow ? entry.Value?.ToString() : entry.Key;
if (!string.IsNullOrWhiteSpace(columnName)) // avoid #298 : Column '' does not belong to table
{
var column = new DataColumn(key, typeof(object)) { Caption = key };
var column = new DataColumn(columnName, typeof(object)) { Caption = columnName };
dt.Columns.Add(column);
keys.Add(key);
columnDict.Add(entry.Key, columnName);//same column name throw exception???
}
}
dt.BeginLoadData();
first = false;
if (useHeaderRow)
{
continue;
}
}
var newRow = dt.NewRow();
foreach (var key in keys)
foreach (var entry in columnDict)
{
newRow[key] = row[key]; //TODO: optimize not using string key
newRow[entry.Value] = row[entry.Key]; //TODO: optimize not using string key
}
dt.Rows.Add(newRow);