From ee2b198aff960af171be2a7add7849a838af9b43 Mon Sep 17 00:00:00 2001
From: eynarhaji <38832863+eynarhaji@users.noreply.github.com>
Date: Wed, 9 Aug 2023 08:18:57 +0200
Subject: [PATCH] Add support for merge limit (#521)

* add support for grouped cells

* fix for rows after endgroup

* minor fix for text after grouping

* fix unit tests

* fix unit tests and docs

* minor fix

* Add support to vertical merge cells

* minor fixes in merge cells

* minor fix

* fix complex scenario

* finalize changes

* Add support for if/elseif/else statements

* add merge tag

* add merge-tag

* update readme

* minor fix

* minor fix

* minor fix

* Update MiniExcelLibs.csproj

* Add support for merge limit

* update test cases

* rollback

---------

Co-authored-by: Wei Lin <shps951002@gmail.com>
---
 README.md                                     |   9 +++++
 docs/README.md                                |   5 +--
 samples/xlsx/TestMergeWithLimitTag.xlsx       | Bin 0 -> 9401 bytes
 src/MiniExcel/MiniExcelLibs.csproj            |   2 +-
 .../OpenXml/ExcelOpenXmlTemplate.Impl.cs      |  31 ++++++++++++------
 .../MiniExcelTests/MiniExcelTemplateTests.cs  |  17 ++++++++++
 tests/MiniExcelTests/MiniExcelTests.csproj    |   2 +-
 7 files changed, 52 insertions(+), 14 deletions(-)
 create mode 100644 samples/xlsx/TestMergeWithLimitTag.xlsx

diff --git a/README.md b/README.md
index 5b6ed4d8..f05055dc 100644
--- a/README.md
+++ b/README.md
@@ -529,6 +529,7 @@ Since 1.22.0, when value type is `byte[]` then system will save file path at cel
 #### 12. Merge same cells vertically
 
 This functionality is only supported in `xlsx` format and merges cells vertically between @merge and @endmerge tags.
+You can use @mergelimit to limit boundaries of merging cells vertically.
 
 ```csharp
 var mergedFilePath = Path.Combine(Path.GetTempPath(), $"{Guid.NewGuid().ToString()}.xlsx");
@@ -548,10 +549,18 @@ memoryStream.MergeSameCells(path);
 
 File content before and after merge:
 
+Without merge limit:
+
 <img width="318" alt="Screenshot 2023-08-07 at 11 59 24" src="https://github.com/mini-software/MiniExcel/assets/38832863/49cc96b9-6c35-4bf3-8d43-a9752a15b22e">
 
 <img width="318" alt="Screenshot 2023-08-07 at 11 59 57" src="https://github.com/mini-software/MiniExcel/assets/38832863/3fbd529b-3ae6-4bbe-b4d8-2793a5a58010">
 
+With merge limit:
+
+<img width="346" alt="Screenshot 2023-08-08 at 18 21 00" src="https://github.com/mini-software/MiniExcel/assets/38832863/04049d28-84d5-4c2a-bcff-5847547df5e1">
+
+<img width="346" alt="Screenshot 2023-08-08 at 18 21 40" src="https://github.com/mini-software/MiniExcel/assets/38832863/f5cf8957-b0b0-4831-b8fc-8556299235c2">
+
 #### 13. Skip null values
 
 New explicit option to write empty cells for null values:
diff --git a/docs/README.md b/docs/README.md
index d9af5553..cd36e1cb 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -22,8 +22,9 @@
 
 ---
 
-### 1.31.1
-- [New] support automatic merge for same vertical cells between @merge and @endmerge tags (via @eynarhaji)
+### 1.31.2
+- [New] Support automatic merge for same vertical cells between @merge and @endmerge tags (via @eynarhaji)
+- [New] Limit merge tagged columns with @mergelimit column. First merge limited column and then merge other columns accordingly. (via @eynarhaji)
 
 ### 1.31.1
 - [OPT] Support property cache #23 (via @RRQM_Home)
diff --git a/samples/xlsx/TestMergeWithLimitTag.xlsx b/samples/xlsx/TestMergeWithLimitTag.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..855493f21ae571bd26f7a5ab4035814426391474
GIT binary patch
literal 9401
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
U4zjuc021UE014paWIzA?AB2ZvZ~y=R

literal 0
HcmV?d00001

diff --git a/src/MiniExcel/MiniExcelLibs.csproj b/src/MiniExcel/MiniExcelLibs.csproj
index 9989f014..4cb83861 100644
--- a/src/MiniExcel/MiniExcelLibs.csproj
+++ b/src/MiniExcel/MiniExcelLibs.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
-		<Version>1.31.1</Version>
+		<Version>1.31.2</Version>
 	</PropertyGroup>
 	<PropertyGroup>
 		<AssemblyName>MiniExcel</AssemblyName>
diff --git a/src/MiniExcel/OpenXml/ExcelOpenXmlTemplate.Impl.cs b/src/MiniExcel/OpenXml/ExcelOpenXmlTemplate.Impl.cs
index 462c4483..6d03b610 100644
--- a/src/MiniExcel/OpenXml/ExcelOpenXmlTemplate.Impl.cs
+++ b/src/MiniExcel/OpenXml/ExcelOpenXmlTemplate.Impl.cs
@@ -199,12 +199,11 @@ private void WriteSheetXml(Stream stream, XmlDocument doc, XmlNode sheetData, bo
                                 ColIndex = StringHelper.GetLetter(att),
                                 RowIndex = StringHelper.GetNumber(att)
                             };
-                        }).ToList();
+                        }).OrderBy(x=>x.RowIndex).ToList();
 
-                    var mergeColumns = columns.Where(s => s.InnerText.Contains("@merge")).OrderBy(s => s.RowIndex)
-                        .ToList();
-                    var endMergeColumns = columns.Where(s => s.InnerText.Contains("@endmerge")).OrderBy(s => s.RowIndex)
-                        .ToList();
+                    var mergeColumns = columns.Where(s => s.InnerText.Contains("@merge")).ToList();
+                    var endMergeColumns = columns.Where(s => s.InnerText.Contains("@endmerge")).ToList();
+                    var mergeLimitColumn = mergeColumns.FirstOrDefault(x=>x.InnerText.Contains("@mergelimit"));
 
                     foreach (var mergeColumn in mergeColumns)
                     {
@@ -227,8 +226,7 @@ private void WriteSheetXml(Stream stream, XmlDocument doc, XmlNode sheetData, bo
                                 x.ColIndex == taggedColumn.Key.ColIndex && x.RowIndex > taggedColumn.Key.RowIndex &&
                                 x.RowIndex < taggedColumn.Value.RowIndex));
                         }
-
-
+                        
                         Dictionary<int, MergeCellIndex>
                             lastMergeCellIndexes = new Dictionary<int, MergeCellIndex>();
 
@@ -240,16 +238,29 @@ private void WriteSheetXml(Stream stream, XmlDocument doc, XmlNode sheetData, bo
 
                             foreach (var childNode in childNodes)
                             {
-                                var childNodeAtt = StringHelper.GetLetter(childNode.GetAttribute("r"));
+                                var att = childNode.GetAttribute("r");
+                                var childNodeLetter = StringHelper.GetLetter(att);
+                                var childNodeNumber = StringHelper.GetNumber(att);
 
                                 if(!string.IsNullOrEmpty(childNode.InnerText))
                                 {
                                     var xmlNodes = calculatedColumns
-                                        .Where(j => j.InnerText == childNode.InnerText && j.ColIndex == childNodeAtt)
+                                        .Where(j => j.InnerText == childNode.InnerText && j.ColIndex == childNodeLetter)
                                         .OrderBy(s => s.RowIndex).ToList();
 
                                     if (xmlNodes.Count > 1)
                                     {
+                                        if (mergeLimitColumn != null)
+                                        {
+                                            var limitedNode = calculatedColumns.First(j =>
+                                                j.ColIndex == mergeLimitColumn.ColIndex && j.RowIndex == childNodeNumber);
+
+                                            var limitedMaxNode = calculatedColumns.Last(j =>
+                                                j.ColIndex == mergeLimitColumn.ColIndex && j.InnerText == limitedNode.InnerText);
+
+                                            xmlNodes = xmlNodes.Where(j => j.RowIndex >= limitedNode.RowIndex && j.RowIndex <= limitedMaxNode.RowIndex).ToList();
+                                        }
+                                        
                                         var firstRow = xmlNodes.FirstOrDefault();
                                         var lastRow = xmlNodes.LastOrDefault(s =>
                                             s.RowIndex <= firstRow?.RowIndex + xmlNodes.Count &&
@@ -280,7 +291,7 @@ private void WriteSheetXml(Stream stream, XmlDocument doc, XmlNode sheetData, bo
                                     }
                                 }
 
-                                childNode.SetAttribute("r", $"{childNodeAtt}{{{{$rowindex}}}}"); //TODO:
+                                childNode.SetAttribute("r", $"{childNodeLetter}{{{{$rowindex}}}}"); //TODO:
                             }
                         }
                     }
diff --git a/tests/MiniExcelTests/MiniExcelTemplateTests.cs b/tests/MiniExcelTests/MiniExcelTemplateTests.cs
index fb7fef0c..da514193 100644
--- a/tests/MiniExcelTests/MiniExcelTemplateTests.cs
+++ b/tests/MiniExcelTests/MiniExcelTemplateTests.cs
@@ -857,5 +857,22 @@ public void MergeSameCellsWithTagTest()
                 Assert.Equal("A7:A8", mergedCells[2]);
             }
         }
+        
+        [Fact]
+        public void MergeSameCellsWithLimitTagTest()
+        {
+            var mergedFilePath = Path.Combine(Path.GetTempPath(), $"{Guid.NewGuid().ToString()}.xlsx");
+            
+            var path = @"../../../../../samples/xlsx/TestMergeWithLimitTag.xlsx";
+            
+            MiniExcel.MergeSameCells(mergedFilePath, path);
+            {
+                var mergedCells = Helpers.GetFirstSheetMergedCells(mergedFilePath);
+                
+                Assert.Equal("A3:A4", mergedCells[0]);
+                Assert.Equal("C3:C6", mergedCells[1]);
+                Assert.Equal("A5:A6", mergedCells[2]);
+            }
+        }
     }
 }
diff --git a/tests/MiniExcelTests/MiniExcelTests.csproj b/tests/MiniExcelTests/MiniExcelTests.csproj
index 587cb82d..44d607ab 100644
--- a/tests/MiniExcelTests/MiniExcelTests.csproj
+++ b/tests/MiniExcelTests/MiniExcelTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net5.0</TargetFrameworks>
+		<TargetFrameworks>net5.0;</TargetFrameworks>
 
 		<IsPackable>false</IsPackable>
 		<AssemblyOriginatorKeyFile>miniexcel.snk</AssemblyOriginatorKeyFile>