add common excel diff

luxuia · Jun 16, 2024 · 8bc8b4f · 8bc8b4f
1 parent 31d06fe
commit 8bc8b4f
Show file tree

Hide file tree

Showing 8 changed files with 331 additions and 84 deletions.
diff --git a/ExcelMerge/ExcelGridControl.xaml.cs b/ExcelMerge/ExcelGridControl.xaml.cs
@@ -186,7 +186,7 @@ public void RefreshData() {
 
                 var headerStr = new string[columnCount];
 
-                var needChangeHead = MainWindow.instance.ProcessHeader.IsChecked == true;
+                var needChangeHead = status.isConfigDiff;
                 if (needChangeHead) {
                     var headershow = sheet.GetRow(MainWindow.instance.config.ShowLineID-1 + startrow);
                     var headerkey = sheet.GetRow(MainWindow.instance.config.KeyLineID-1 +startrow);
@@ -230,7 +230,7 @@ public void RefreshData() {
                         var str = (i + 1).ToString();
 
                         var tc = new DataGridTemplateColumn();
-                        tc.Header = str;
+                        tc.Header = Util.NumberToExcelColumnId(i+1);
                         tc.CellTemplateSelector = new CellTemplateSelector(str, i, tag);
                         tc.CellEditingTemplateSelector = new CellTemplateSelector(str, i, tag);