修复#开头表名的表未能被正确跳过的问题
This commit is contained in:
@@ -13,10 +13,10 @@ namespace ExcelTool
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
List<TableExcelHeader> headers = new();
|
List<TableExcelHeader> headers = [];
|
||||||
|
|
||||||
using FileStream fs = File.OpenRead(fileName);
|
using FileStream fs = File.OpenRead(fileName);
|
||||||
IWorkbook wk = new XSSFWorkbook(fs);
|
XSSFWorkbook wk = new(fs);
|
||||||
|
|
||||||
sheetCount = wk.NumberOfSheets;
|
sheetCount = wk.NumberOfSheets;
|
||||||
if (sheetNum >= sheetCount)
|
if (sheetNum >= sheetCount)
|
||||||
@@ -27,6 +27,10 @@ namespace ExcelTool
|
|||||||
|
|
||||||
ISheet sheet = wk.GetSheetAt(sheetNum);
|
ISheet sheet = wk.GetSheetAt(sheetNum);
|
||||||
sheetName = sheet.SheetName;
|
sheetName = sheet.SheetName;
|
||||||
|
if (sheetName.StartsWith('#'))
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
IRow nameRow = sheet.GetRow(0); // 字段名
|
IRow nameRow = sheet.GetRow(0); // 字段名
|
||||||
IRow typeRow = sheet.GetRow(1); // 类型
|
IRow typeRow = sheet.GetRow(1); // 类型
|
||||||
@@ -73,10 +77,11 @@ namespace ExcelTool
|
|||||||
using FileStream fs = File.OpenRead(fileName);
|
using FileStream fs = File.OpenRead(fileName);
|
||||||
IWorkbook wk = new XSSFWorkbook(fs);
|
IWorkbook wk = new XSSFWorkbook(fs);
|
||||||
|
|
||||||
if (sheetNum >= sheetCount)
|
if (sheetNum >= sheetCount || sheetName.StartsWith('#'))
|
||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
ISheet sheet = wk.GetSheetAt(sheetNum);
|
ISheet sheet = wk.GetSheetAt(sheetNum);
|
||||||
|
|
||||||
for (int i = 5; i <= sheet.LastRowNum; i++)
|
for (int i = 5; i <= sheet.LastRowNum; i++)
|
||||||
|
|||||||
@@ -5,8 +5,8 @@ namespace ExcelTool.Parser
|
|||||||
{
|
{
|
||||||
public class TableExcelData
|
public class TableExcelData
|
||||||
{
|
{
|
||||||
private List<TableExcelHeader> headers = new List<TableExcelHeader>();
|
List<TableExcelHeader> headers = new();
|
||||||
private List<TableExcelRow> rows = new List<TableExcelRow>();
|
List<TableExcelRow> rows = new();
|
||||||
public int CollonCount = 0;
|
public int CollonCount = 0;
|
||||||
public int RowCounts = 0;
|
public int RowCounts = 0;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user