fix: 修复 获取真实错误位置

jianxuanbing · jianxuanbing · commit ff3c4c1d2138 · 2020-05-19T11:52:08.000+08:00
diff --git a/src/Bing.Offices.Abstractions/Bing/Offices/Metadata/Excels/ICell.cs b/src/Bing.Offices.Abstractions/Bing/Offices/Metadata/Excels/ICell.cs
@@ -35,6 +35,11 @@ public interface ICell
         /// </summary>
         int RowIndex { get; }
 
+        /// <summary>
+        /// 物理行索引
+        /// </summary>
+        int PhysicalRowIndex { get; }
+
         /// <summary>
         /// 结束列索引
         /// </summary>
diff --git a/src/Bing.Offices.Abstractions/Bing/Offices/Metadata/Excels/IRange.cs b/src/Bing.Offices.Abstractions/Bing/Offices/Metadata/Excels/IRange.cs
@@ -41,6 +41,14 @@ public interface IRange
         /// <param name="cells">单元格列表</param>
         void AddRow(int rowIndex, IEnumerable<ICell> cells);
 
+        /// <summary>
+        /// 添加单元行
+        /// </summary>
+        /// <param name="rowIndex">行索引</param>
+        /// <param name="physicalRowIndex">物理行索引</param>
+        /// <param name="cells">单元格列表</param>
+        void AddRow(int rowIndex, int physicalRowIndex, IEnumerable<ICell> cells);
+
         /// <summary>
         /// 清空单元行
         /// </summary>
diff --git a/src/Bing.Offices.Abstractions/Bing/Offices/Metadata/Excels/IRow.cs b/src/Bing.Offices.Abstractions/Bing/Offices/Metadata/Excels/IRow.cs
@@ -12,6 +12,11 @@ public interface IRow
         /// </summary>
         int RowIndex { get; set; }
 
+        /// <summary>
+        /// 物理行索引
+        /// </summary>
+        int PhysicalRowIndex { get; set; }
+
         /// <summary>
         /// 是否有效
         /// </summary>
diff --git a/src/Bing.Offices.Abstractions/Bing/Offices/Metadata/Excels/IWorkSheet.cs b/src/Bing.Offices.Abstractions/Bing/Offices/Metadata/Excels/IWorkSheet.cs
@@ -81,6 +81,13 @@ public interface IWorkSheet
         /// <param name="cells">单元格集合</param>
         void AddBodyRow(IEnumerable<ICell> cells);
 
+        /// <summary>
+        /// 添加正文
+        /// </summary>
+        /// <param name="cells">单元格集合</param>
+        /// <param name="physicalRowIndex">物理行索引</param>
+        void AddBodyRow(IEnumerable<ICell> cells, int physicalRowIndex);
+
         /// <summary>
         /// 添加页脚
         /// </summary>
diff --git a/src/Bing.Offices.Core/Bing/Offices/Extensions/WorkbookExtensions.cs b/src/Bing.Offices.Core/Bing/Offices/Extensions/WorkbookExtensions.cs
@@ -44,9 +44,7 @@ public static IEnumerable<ValidateResult> Validate(this IWorkbook workbook)
             var list = new List<ValidateResult>();
             foreach (var sheet in workbook.Sheets)
             {
-                // 由于需要真实行数，因此需要增加1
-                list.AddRange(sheet.GetBody().Where(x => !x.Valid).Select(row => new ValidateResult()
-                    {RowIndex = row.RowIndex + 1, ErrorMsg = row.ErrorMsg, SheetName = sheet.Name}));
+                list.AddRange(sheet.GetBody().Where(x => !x.Valid).Select(row => new ValidateResult {RowIndex = row.PhysicalRowIndex + 1, ErrorMsg = row.ErrorMsg, SheetName = sheet.Name}));
             }
             return list;
         }
diff --git a/src/Bing.Offices.Core/Bing/Offices/Helpers/ExpressionMapper.cs b/src/Bing.Offices.Core/Bing/Offices/Helpers/ExpressionMapper.cs
@@ -114,40 +114,6 @@ private static MemberBinding GetMapperBinding(PropertyInfo prop, MethodInfo firs
             return Expression.Bind(prop, expr);
         }
 
-        ///// <summary>
-        ///// 变更类型
-        ///// </summary>
-        ///// <param name="value">值</param>
-        ///// <param name="type">类型</param>
-        //public static object ChangeType(string value, Type type)
-        //{
-        //    object obj = null;
-        //    var nullableType = Nullable.GetUnderlyingType(type);
-        //    try
-        //    {
-        //        if (nullableType != null)
-        //        {
-        //            if (value == null)
-        //                obj = null;
-        //            else
-        //                obj = OtherChangeType(value, type);
-        //        }
-        //        else if (typeof(Enum).IsAssignableFrom(type))
-        //        {
-        //            obj = Enum.Parse(type, value);
-        //        }
-        //        else
-        //        {
-        //            obj = Convert.ChangeType(value, type);
-        //        }
-        //        return obj;
-        //    }
-        //    catch
-        //    {
-        //        return default;
-        //    }
-        //}
-
         /// <summary>
         /// 变更类型
         /// </summary>
diff --git a/src/Bing.Offices.Core/Bing/Offices/Metadata/Excels/Cell.cs b/src/Bing.Offices.Core/Bing/Offices/Metadata/Excels/Cell.cs
@@ -78,6 +78,17 @@ public int RowIndex
             }
         }
 
+        /// <summary>
+        /// 物理行索引
+        /// </summary>
+        public int PhysicalRowIndex {
+            get
+            {
+                Row.CheckNull(nameof(Row));
+                return Row.PhysicalRowIndex;
+            }
+        }
+
         /// <summary>
         /// 结束列索引
         /// </summary>
diff --git a/src/Bing.Offices.Core/Bing/Offices/Metadata/Excels/Range.cs b/src/Bing.Offices.Core/Bing/Offices/Metadata/Excels/Range.cs
@@ -99,6 +99,22 @@ public void AddRow(int rowIndex, IEnumerable<ICell> cells)
                 AddCell(row, cell, rowIndex);
         }
 
+        /// <summary>
+        /// 添加单元行
+        /// </summary>
+        /// <param name="rowIndex">行索引</param>
+        /// <param name="physicalRowIndex">物理行索引</param>
+        /// <param name="cells">单元格列表</param>
+        public void AddRow(int rowIndex, int physicalRowIndex, IEnumerable<ICell> cells)
+        {
+            if (cells == null)
+                return;
+            var row = CreateRow(rowIndex);
+            row.PhysicalRowIndex = physicalRowIndex;
+            foreach (var cell in cells)
+                AddCell(row, cell, rowIndex);
+        }
+
         /// <summary>
         /// 创建单元行
         /// </summary>
diff --git a/src/Bing.Offices.Core/Bing/Offices/Metadata/Excels/Row.cs b/src/Bing.Offices.Core/Bing/Offices/Metadata/Excels/Row.cs
@@ -25,6 +25,11 @@ public class Row : IRow
         /// </summary>
         public int RowIndex { get; set; }
 
+        /// <summary>
+        /// 物理行索引
+        /// </summary>
+        public int PhysicalRowIndex { get; set; }
+
         /// <summary>
         /// 是否有效
         /// </summary>
diff --git a/src/Bing.Offices.Core/Bing/Offices/Metadata/Excels/WorkSheet.cs b/src/Bing.Offices.Core/Bing/Offices/Metadata/Excels/WorkSheet.cs
@@ -220,6 +220,20 @@ public void AddBodyRow(IEnumerable<ICell> cells)
             ResetFirstColumnSpan();
         }
 
+        /// <summary>
+        /// 添加正文
+        /// </summary>
+        /// <param name="cells">单元格集合</param>
+        /// <param name="physicalRowIndex">物理行索引</param>
+        public void AddBodyRow(IEnumerable<ICell> cells, int physicalRowIndex)
+        {
+            if (cells == null)
+                return;
+            GetBodyRange().AddRow(_rowIndex, physicalRowIndex, cells);
+            _rowIndex++;
+            ResetFirstColumnSpan();
+        }
+
         /// <summary>
         /// 获取正文单元范围
         /// </summary>
diff --git a/src/Bing.Offices.Npoi/Extensions/RowExtensions.cs b/src/Bing.Offices.Npoi/Extensions/RowExtensions.cs
@@ -44,11 +44,6 @@ public static IRow ClearContent(this IRow row)
         /// 是否空行
         /// </summary>
         /// <param name="row">行</param>
-        public static bool IsEmptyRow(this IRow row)
-        {
-            if (row == null)
-                return true;
-            return row.Cells.All(x => string.IsNullOrWhiteSpace(x?.GetStringValue()));
-        }
+        public static bool IsEmptyRow(this IRow row) => row == null || row.Cells.All(x => string.IsNullOrWhiteSpace(x?.GetStringValue()));
     }
 }
diff --git a/src/Bing.Offices.Npoi/Imports/ExcelImportProvider.cs b/src/Bing.Offices.Npoi/Imports/ExcelImportProvider.cs
@@ -149,12 +149,11 @@ private void VerifyHeader<TTemplate>(IWorkSheet sheet, IImportOptions options)
             if (!options.HeaderMatch) return;
             var header = sheet.GetHeader().LastOrDefault();
             if (header == null)
-            {
                 throw new OfficeException($"导入的模板不正确，未匹配表头");
-            }
             List<PropertyInfo> properties = typeof(TTemplate).GetProperties().ToList();
             var props = properties
                 .Where(x => x.GetCustomAttribute<DynamicColumnAttribute>() == null)
+                .Where(x => x.GetCustomAttribute<ExcelIgnoreAttribute>() == null)
                 .Select(p => new
                 {
                     Name = p.GetCustomAttribute<ColumnNameAttribute>()?.Name,
@@ -165,17 +164,15 @@ private void VerifyHeader<TTemplate>(IWorkSheet sheet, IImportOptions options)
             var list = props.Where(p => !cellName.Contains(p.Name)).ToList();
             if (list.Any())
             {
-                list = list.Where(p =>!(string.IsNullOrWhiteSpace(p.Name) && cellName.Contains(p.Code))).ToList();
+                list = list.Where(p => !(string.IsNullOrWhiteSpace(p.Name) && cellName.Contains(p.Code))).ToList();
                 if (list.Any())
                     throw new OfficeHeaderException($"导入的表格不存在列：{ list.Select(x => string.IsNullOrWhiteSpace(x.Name) ? x.Code : x.Name).ExpandAndToString()}");
             }
-            else if (options.MappingDictionary.Count > 0)
+            else if (options.MappingDictionary != null && options.MappingDictionary.Any())
             {
                 var dic = options.MappingDictionary.ToList().Where(x => !cellName.Contains(x.Value)).ToList();
                 if (dic.Count > 0)
-                {
                     throw new OfficeHeaderException($"导入的表格不存在列：{dic.Select(x => x.Value).ExpandAndToString()}");
-                }
             }
         }
 
@@ -196,7 +193,7 @@ private void HandleBody<TTemplate>(IWorkSheet sheet, ISheet innerSheet, int data
                 var innerRow = innerSheet.GetRow(i);
                 if (CheckEmptyLine(innerRow.IsEmptyRow(), enabledEmptyLine))
                     continue;
-                sheet.AddBodyRow(Convert<TTemplate>(innerRow, header));
+                sheet.AddBodyRow(Convert<TTemplate>(innerRow, header), innerRow.RowNum);
             }
         }
 
@@ -207,9 +204,11 @@ private void HandleBody<TTemplate>(IWorkSheet sheet, ISheet innerSheet, int data
         /// <param name="enabledEmptyLine">启用空行模式。启用时，行内遇到空行将抛出异常错误信息</param>
         private bool CheckEmptyLine(bool isEmptyRow, bool enabledEmptyLine)
         {
-            if (isEmptyRow && enabledEmptyLine)
+            if (!enabledEmptyLine) 
+                return isEmptyRow;
+            if(isEmptyRow)
                 throw new OfficeEmptyLineException($"导入数据存在空行");
-            return isEmptyRow;
+            return false;
         }
 
         /// <summary>
diff --git a/test/Bing.Offices.Tests/BugFixes/BugFixesTest.cs b/test/Bing.Offices.Tests/BugFixes/BugFixesTest.cs
@@ -173,7 +173,7 @@ public async Task Issue4_ValidateFail_ReturnRealLocation()
         public async Task Issue5_ValidateFail_ReturnRealLocation_With_HeaderRowIndex()
         {
             var fileUrl = Path.Combine(CurrentDir, "Resources/Bugs", "issue5.xlsx");
-            var workbook = await ImportService.ImportAsync<Issue5>(new ImportOptions()
+            var workbook = await ImportService.ImportAsync<Issue5>(new ImportOptions
             {
                 FileUrl = fileUrl,
                 SheetIndex = 0,
@@ -182,7 +182,7 @@ public async Task Issue5_ValidateFail_ReturnRealLocation_With_HeaderRowIndex()
             });
             var validateResult = workbook.Validate().ToList();
             Assert.True(validateResult.Any());
-            Assert.Equal(3, validateResult[0].RowIndex);
+            Assert.Equal(4, validateResult[0].RowIndex);
             Output.WriteLine(validateResult.ToJson());
         }
 
@@ -213,16 +213,25 @@ public async Task Issue7_Import_EmptyLine()
             var fileUrl = Path.Combine(CurrentDir, "Resources/Bugs", "issue7.xlsx");
             await Assert.ThrowsAsync<OfficeEmptyLineException>(async() =>
             {
-                var workbook = await ImportService.ImportAsync<Issue7>(new ImportOptions()
+                try
                 {
-                    FileUrl = fileUrl,
-                    SheetIndex = 1,
-                    DataRowIndex = 3,
-                    HeaderRowIndex = 2,
-                    EnabledEmptyLine = true
-                });
-                var result = workbook.GetResult<Issue7>();
-                Output.WriteLine(result.ToJson());
+                    var workbook = await ImportService.ImportAsync<Issue7>(new ImportOptions()
+                    {
+                        FileUrl = fileUrl,
+                        SheetIndex = 1,
+                        DataRowIndex = 3,
+                        HeaderRowIndex = 2,
+                        EnabledEmptyLine = true
+                    });
+                    var result = workbook.GetResult<Issue7>();
+                    Output.WriteLine(result.ToJson());
+                }
+                catch (OfficeEmptyLineException e)
+                {
+                    Output.WriteLine(e.ToJson());
+                    throw;
+                }
+                
             });
         }
 
diff --git a/test/Bing.Offices.Tests/Resources/Bugs/issue5.xlsx b/test/Bing.Offices.Tests/Resources/Bugs/issue5.xlsx

Original file line number	Diff line number	Diff line change
`@@ -44,9 +44,7 @@ public static IEnumerable<ValidateResult> Validate(this IWorkbook workbook)`
`44`	`44`	`var list = new List<ValidateResult>();`
`45`	`45`	`foreach (var sheet in workbook.Sheets)`
`46`	`46`	`{`
`47`		`- // 由于需要真实行数，因此需要增加1`
`48`		`- list.AddRange(sheet.GetBody().Where(x => !x.Valid).Select(row => new ValidateResult()`
`49`		`- {RowIndex = row.RowIndex + 1, ErrorMsg = row.ErrorMsg, SheetName = sheet.Name}));`
	`47`	`+ list.AddRange(sheet.GetBody().Where(x => !x.Valid).Select(row => new ValidateResult {RowIndex = row.PhysicalRowIndex + 1, ErrorMsg = row.ErrorMsg, SheetName = sheet.Name}));`
`50`	`48`	`}`
`51`	`49`	`return list;`
`52`	`50`	`}`