修正头行有空的情况

luxuia · Jun 15, 2024 · 31d06fe · 31d06fe
1 parent 5fcb33a
commit 31d06fe
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/ExcelMerge/MainWindow.xaml.cs b/ExcelMerge/MainWindow.xaml.cs
@@ -165,6 +165,7 @@ int[] getColumn2Diff(List<DiffResult<string>> diff, bool from) {
             return ret;
         }
 
+        // 对比两个sheet
         SheetDiffStatus DiffSheet(ISheet src, ISheet dst, SheetDiffStatus status = null) {
             status = status??new SheetDiffStatus() { sortKey = config.DefaultKeyID };
 
@@ -313,6 +314,9 @@ public void Refresh() {
                             dstSheetID = sheetidx;
                         }
                     }
+                } else
+                {
+                    // 新增sheet，直接完整显示
                 }
             }
 
@@ -504,12 +508,13 @@ List<string> GetHeaderStrList(WorkBookWrap wrap, ISheet sheet) {
                     var str = "";
                     for (int j = 0; j < list.Count; ++j) {
                         var cell_s = Util.GetCellValue(list[j].GetCell(i));
-                        if (j == 0 && string.IsNullOrWhiteSpace(cell_s)) {
-                            return header;
-                        }
+
                         str = str + (j > 0 ? ":" + cell_s : cell_s);
                     }
-
+                    if (string.IsNullOrWhiteSpace(str))
+                    {
+                        return header;
+                    }
                     header.Add(str);
                 }
             } else {