固定行高，优化显示

luxuia · luxuia · commit 0e81680e559c · 2020-09-17T22:54:11.000+08:00
diff --git a/ExcelMerge.sln b/ExcelMerge.sln
@@ -1,11 +1,14 @@
 ﻿
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.28010.2003
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExcelMerge", "ExcelMerge\ExcelMerge.csproj", "{09AA7F86-7EF6-44D4-98D9-916D4E2FC258}"
 EndProject
 Global
+	GlobalSection(Performance) = preSolution
+		HasPerformanceSessions = true
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
@@ -19,4 +22,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {F2077F71-FEEB-4300-92BD-022CE4466E31}
+	EndGlobalSection
 EndGlobal
diff --git a/ExcelMerge/CellTemplateSelector.cs b/ExcelMerge/CellTemplateSelector.cs
@@ -109,7 +109,9 @@ public override System.Windows.DataTemplate SelectTemplate(object item, System.W
 
                 } else {
                     FrameworkElementFactory textBlock = new FrameworkElementFactory(typeof(TextBox));
-                    textBlock.SetValue(TextBox.TextProperty, rowdata.data[Binder].value);
+                    if (rowdata.data.ContainsKey(Binder)) {
+                        textBlock.SetValue(TextBox.TextProperty, rowdata.data[Binder].value);
+                    }
                     return new DataTemplate() { VisualTree = textBlock };
                 }
 
diff --git a/ExcelMerge/ExcelGridControl.xaml b/ExcelMerge/ExcelGridControl.xaml
@@ -22,6 +22,7 @@
                         BeginningEdit="ExcelGrid_BeginningEdit"
                         EnableColumnVirtualization="True" EnableRowVirtualization="True"
                         VirtualizingPanel.VirtualizationMode="Recycling"
+					  VirtualizingPanel.IsVirtualizing="True"
                         ScrollViewer.ScrollChanged ="ExcelGrid_ScrollChanged" SelectionChanged="ExcelGrid_SelectionChanged" SelectedCellsChanged="ExcelGrid_SelectedCellsChanged">
                 <DataGrid.ContextMenu>
                     <ContextMenu Name="CtxMenu">
diff --git a/ExcelMerge/ExcelGridControl.xaml.cs b/ExcelMerge/ExcelGridControl.xaml.cs
@@ -163,6 +163,7 @@ public void RefreshData() {
 
                     if (headershow == null || headerkey == null) return;
 
+                    int linecount = 0;
                     for (int i = 0; i < columnCount; ++i) {
                         var cellshow = headershow.GetCell(i);
                         var cellkey = headerkey.GetCell(i);
@@ -179,6 +180,7 @@ public void RefreshData() {
                         }
                         // 第二行+第三行，合起来作为key
                         var encodestr = System.Uri.EscapeDataString(strkey) + "_" + i;// + System.Uri.EscapeDataString(str);
+                        linecount = Math.Max(linecount, strshow.Count((c) => { return c == '\n'; })+1);
 
                         var tc = new DataGridTemplateColumn();
                         tc.Header = strshow;
@@ -189,9 +191,9 @@ public void RefreshData() {
 
                         headerStr[i] = encodestr;
                     }
+                    ExcelGrid.ColumnHeaderHeight = linecount * 25;
                 }
                 else {
-
                     //AddPrefixRowID();
 
                     for (int i = 0; i < columnCount; ++i) {
@@ -206,6 +208,7 @@ public void RefreshData() {
 
                         headerStr[i] = str;
                     }
+                    ExcelGrid.ColumnHeaderHeight = 25;
                 }
 
                 if (needChangeHead) {
@@ -224,9 +227,10 @@ public void RefreshData() {
 
                         for (int i = 0; i < columnCount; ++i) {
                             var cell = row.GetCell(i);
-                            data.data[headerStr[i]] = new CellData() { value = Util.GetCellValue(cell), cell = cell };
+                            var value = Util.GetCellValue(cell);
+                            data.data[headerStr[i]] = new CellData() { value = value,  cell = cell };
                         }
-
+                        data.maxLineCount = status.DiffMaxLineCount[j];
                         datas.Add(data);
                         data_maps[data.rowId] = data;
                     }
@@ -253,16 +257,17 @@ public void RefreshData() {
                         data.data["rowid"] = new CellData() { value = (rowid+1).ToString() };
                         for (int i = 0; i < columnCount; ++i) {
                             var cell = row != null ? row.GetCell(i):null;
-                            data.data[headerStr[i]] = new CellData() { value = Util.GetCellValue(cell), cell = cell};
+                            var value = Util.GetCellValue(cell);
+                            data.data[headerStr[i]] = new CellData() { value = value, cell = cell};
                         }
+                        data.maxLineCount = status.DiffMaxLineCount[j];
 
                         datas.Add(data);
                         data_maps[data.rowId] = data;
                     }
                 }
             }
             ExcelGrid.ItemsSource = datas;
-            //ExcelGrid.DataContext = datas;
 
             CtxMenu.Items.Clear();
             var item = new MenuItem();
@@ -314,6 +319,7 @@ private void ExcelGrid_LoadingRow(object sender, DataGridRowEventArgs e) {
 
             if (item != null) { 
                 row.Header = (item.rowId+1).ToString();
+                row.Height = item.maxLineCount * 17;
             }
             //row.Header = ite
         }
diff --git a/ExcelMerge/MainWindow.xaml.cs b/ExcelMerge/MainWindow.xaml.cs
@@ -348,6 +348,7 @@ SheetDiffStatus DiffSheet(ISheet src, ISheet dst, SheetDiffStatus status = null)
             status.rowID2DiffMap2 = new Dictionary<int, int>();
             status.Diff2RowID1 = new Dictionary<int, int>();
             status.Diff2RowID2 = new Dictionary<int, int>();
+            status.DiffMaxLineCount = new Dictionary<int, int>();
             status.RowEdited1 = status.RowEdited1?? new Dictionary<int, Dictionary<int, CellEditMode>>();
             status.RowEdited2 = status.RowEdited2?? new Dictionary<int, Dictionary<int, CellEditMode>>();
 
@@ -361,7 +362,8 @@ SheetDiffStatus DiffSheet(ISheet src, ISheet dst, SheetDiffStatus status = null)
                 if (diffkv.Obj2.Key == null) {
                     rowid2 = -1;
                 }
-                var diffrow = DiffSheetRow(src, rowid1, dst, rowid2, status);
+                int maxLineCount = 0;
+                var diffrow = DiffSheetRow(src, rowid1, dst, rowid2, status, out maxLineCount);
 
                 if (diffkv.Obj1.Key == null) {
                     // 创建新行，方便比较,放在后面是为了保证diff的时候是new,delete的形式，而不是modify
@@ -376,6 +378,7 @@ SheetDiffStatus DiffSheet(ISheet src, ISheet dst, SheetDiffStatus status = null)
                 status.column2diff2[rowid2] = getColumn2Diff(diffrow, false);
 
                 int diffIdx = status.diffSheet.Count;
+                status.DiffMaxLineCount[diffIdx] = maxLineCount;
 
                 status.rowID2DiffMap1[rowid1] = diffIdx;
                 status.rowID2DiffMap2[rowid2] = diffIdx;
@@ -777,23 +780,29 @@ List<DiffResult<string2int>> GetIDDiffList(ISheet sheet1, ISheet sheet2, int che
             return result.ToList();
         }
 
-        List<DiffResult<string>> DiffSheetRow(ISheet sheet1, int row1, ISheet sheet2, int row2, SheetDiffStatus status) {
+        List<DiffResult<string>> DiffSheetRow(ISheet sheet1, int row1, ISheet sheet2, int row2, SheetDiffStatus status, out int maxLineCount) {
             var list1 = new List<string>();
             var list2 = new List<string>();
 
+            maxLineCount = 0;
             if (sheet1.GetRow(row1)!=null) {
                 var row = sheet1.GetRow(row1);
                 var columnCount = books["src"].SheetValideColumn[sheet1.SheetName];
-                for (int i =0; i < columnCount; ++i) { 
-                    list1.Add(Util.GetCellValue(row.GetCell(i)));
+                for (int i =0; i < columnCount; ++i) {
+                    var value = Util.GetCellValue(row.GetCell(i));
+                    maxLineCount = Math.Max(maxLineCount, value.Count((c) => { return c == '\n'; }) + 1);
+
+                    list1.Add(value);
                 }
             }
 
             if (sheet2.GetRow(row2) != null) {
                 var row = sheet2.GetRow(row2);
                 var columnCount = books["dst"].SheetValideColumn[sheet2.SheetName];
                 for (int i = 0; i < columnCount; ++i) {
-                    list2.Add(Util.GetCellValue(row.GetCell(i)));
+                    var value = Util.GetCellValue(row.GetCell(i));
+                    maxLineCount = Math.Max(maxLineCount, value.Count((c) => { return c == '\n'; }) + 1);
+                    list2.Add(value);
                 }
             }
             var diff = DiffUtil.Diff(list1, list2);
diff --git a/ExcelMerge/Util.cs b/ExcelMerge/Util.cs
@@ -228,6 +228,8 @@ public class SheetDiffStatus {
         public Dictionary<int, int> Diff2RowID1;
         public Dictionary<int, int> Diff2RowID2;
 
+        public Dictionary<int, int> DiffMaxLineCount;
+
         public Dictionary<int, Dictionary<int, CellEditMode>> RowEdited1;
         public Dictionary<int, Dictionary<int, CellEditMode>> RowEdited2;
 
@@ -291,6 +293,8 @@ public class ExcelData : DynamicObject {
         public int rowId;
         public string tag;
         public int diffIdx;
+        public int maxLineCount=1;
+
 
         public SheetRowDiff diffstatus;
         public Dictionary<int, int> RowID2DiffMap;
@@ -301,7 +305,8 @@ public class ExcelData : DynamicObject {
         public override bool TryGetMember(GetMemberBinder binder, out object result) {
             CellData ret;
             if (data.TryGetValue(binder.Name, out ret)) {
-                result = "<Bold> " + ret.value + "<Bold/>";
+                //result = "<Bold> " + ret.value + "<Bold/>";
+                result = ret.value;
                 //var block = new TextBlock();
                 //result = new Bold(new Run(ret.value));
                // result = block;

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,9 @@ public override System.Windows.DataTemplate SelectTemplate(object item, System.W`
`109`	`109`
`110`	`110`	`} else {`
`111`	`111`	`FrameworkElementFactory textBlock = new FrameworkElementFactory(typeof(TextBox));`
`112`		`- textBlock.SetValue(TextBox.TextProperty, rowdata.data[Binder].value);`
	`112`	`+ if (rowdata.data.ContainsKey(Binder)) {`
	`113`	`+ textBlock.SetValue(TextBox.TextProperty, rowdata.data[Binder].value);`
	`114`	`+ }`
`113`	`115`	`return new DataTemplate() { VisualTree = textBlock };`
`114`	`116`	`}`
`115`	`117`
Original file line number	Diff line number	Diff line change
`@@ -163,6 +163,7 @@ public void RefreshData() {`
`163`	`163`
`164`	`164`	`if (headershow == null \|\| headerkey == null) return;`
`165`	`165`
	`166`	`+ int linecount = 0;`
`166`	`167`	`for (int i = 0; i < columnCount; ++i) {`
`167`	`168`	`var cellshow = headershow.GetCell(i);`
`168`	`169`	`var cellkey = headerkey.GetCell(i);`
`@@ -179,6 +180,7 @@ public void RefreshData() {`
`179`	`180`	`}`
`180`	`181`	`// 第二行+第三行，合起来作为key`
`181`	`182`	`var encodestr = System.Uri.EscapeDataString(strkey) + "_" + i;// + System.Uri.EscapeDataString(str);`
	`183`	`+ linecount = Math.Max(linecount, strshow.Count((c) => { return c == '\n'; })+1);`
`182`	`184`
`183`	`185`	`var tc = new DataGridTemplateColumn();`
`184`	`186`	`tc.Header = strshow;`
`@@ -189,9 +191,9 @@ public void RefreshData() {`
`189`	`191`
`190`	`192`	`headerStr[i] = encodestr;`
`191`	`193`	`}`
	`194`	`+ ExcelGrid.ColumnHeaderHeight = linecount * 25;`
`192`	`195`	`}`
`193`	`196`	`else {`
`194`		`-`
`195`	`197`	`//AddPrefixRowID();`
`196`	`198`
`197`	`199`	`for (int i = 0; i < columnCount; ++i) {`
`@@ -206,6 +208,7 @@ public void RefreshData() {`
`206`	`208`
`207`	`209`	`headerStr[i] = str;`
`208`	`210`	`}`
	`211`	`+ ExcelGrid.ColumnHeaderHeight = 25;`
`209`	`212`	`}`
`210`	`213`
`211`	`214`	`if (needChangeHead) {`
`@@ -224,9 +227,10 @@ public void RefreshData() {`
`224`	`227`
`225`	`228`	`for (int i = 0; i < columnCount; ++i) {`
`226`	`229`	`var cell = row.GetCell(i);`
`227`		`- data.data[headerStr[i]] = new CellData() { value = Util.GetCellValue(cell), cell = cell };`
	`230`	`+ var value = Util.GetCellValue(cell);`
	`231`	`+ data.data[headerStr[i]] = new CellData() { value = value, cell = cell };`
`228`	`232`	`}`
`229`		`-`
	`233`	`+ data.maxLineCount = status.DiffMaxLineCount[j];`
`230`	`234`	`datas.Add(data);`
`231`	`235`	`data_maps[data.rowId] = data;`
`232`	`236`	`}`
`@@ -253,16 +257,17 @@ public void RefreshData() {`
`253`	`257`	`data.data["rowid"] = new CellData() { value = (rowid+1).ToString() };`
`254`	`258`	`for (int i = 0; i < columnCount; ++i) {`
`255`	`259`	`var cell = row != null ? row.GetCell(i):null;`
`256`		`- data.data[headerStr[i]] = new CellData() { value = Util.GetCellValue(cell), cell = cell};`
	`260`	`+ var value = Util.GetCellValue(cell);`
	`261`	`+ data.data[headerStr[i]] = new CellData() { value = value, cell = cell};`
`257`	`262`	`}`
	`263`	`+ data.maxLineCount = status.DiffMaxLineCount[j];`
`258`	`264`
`259`	`265`	`datas.Add(data);`
`260`	`266`	`data_maps[data.rowId] = data;`
`261`	`267`	`}`
`262`	`268`	`}`
`263`	`269`	`}`
`264`	`270`	`ExcelGrid.ItemsSource = datas;`
`265`		`- //ExcelGrid.DataContext = datas;`
`266`	`271`
`267`	`272`	`CtxMenu.Items.Clear();`
`268`	`273`	`var item = new MenuItem();`
`@@ -314,6 +319,7 @@ private void ExcelGrid_LoadingRow(object sender, DataGridRowEventArgs e) {`
`314`	`319`
`315`	`320`	`if (item != null) {`
`316`	`321`	`row.Header = (item.rowId+1).ToString();`
	`322`	`+ row.Height = item.maxLineCount * 17;`
`317`	`323`	`}`
`318`	`324`	`//row.Header = ite`
`319`	`325`	`}`