From 9de96abba848f45116aee6181a05a530fcf3cb88 Mon Sep 17 00:00:00 2001
From: Jed Samok <49677180+xiaolipro@users.noreply.github.com>
Date: Fri, 19 Jul 2024 22:04:44 +0800
Subject: [PATCH 1/2] =?UTF-8?q?add=20QueryRange=20test=20and=20docs.?=
 =?UTF-8?q?=EF=BC=88#634=EF=BC=89=20(#635)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  4 ++++
 README.zh-CN.md                               |  4 ++++
 README.zh-Hant.md                             |  4 ++++
 src/MiniExcel/MiniExcel.cs                    | 15 +++++++++++++++
 tests/MiniExcelTests/MiniExcelOpenXmlTests.cs | 15 +++++++++++++++
 5 files changed, 42 insertions(+)

diff --git a/README.md b/README.md
index 0bdfedf..4fe6a63 100644
--- a/README.md
+++ b/README.md
@@ -259,6 +259,10 @@ foreach(IDictionary<string,object> row in MiniExcel.Query(path))
 
 // or
 var rows = MiniExcel.Query(path).Cast<IDictionary<string,object>>();
+// or Query specified ranges (capitalized)
+// A2 represents the second row of column A, C3 represents the third row of column C
+// If you don't want to restrict rows, just don't include numbers
+var rows = MiniExcel.QueryRange(path, startCell: "A2", endCell: "C3").Cast<IDictionary<string, object>>();
 ```
 
 
diff --git a/README.zh-CN.md b/README.zh-CN.md
index b82d906..354f0c7 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -267,6 +267,10 @@ foreach(IDictionary<string,object> row in MiniExcel.Query(path))
 
 // or
 var rows = MiniExcel.Query(path).Cast<IDictionary<string,object>>();
+// or 查询指定范围（要大写才生效哦）
+// A2（左上角）代表A列的第二行，C3（右下角）代表C列的第三行
+// 如果你不想限制行，就不要包含数字
+var rows = MiniExcel.QueryRange(path, startCell: "A2", endCell: "C3").Cast<IDictionary<string, object>>();
 ```
 
 #### 9. Query 读 Excel 返回 DataTable
diff --git a/README.zh-Hant.md b/README.zh-Hant.md
index f0eddf3..d0f043d 100644
--- a/README.zh-Hant.md
+++ b/README.zh-Hant.md
@@ -265,6 +265,10 @@ foreach(IDictionary<string,object> row in MiniExcel.Query(path))
 
 // or
 var rows = MiniExcel.Query(path).Cast<IDictionary<string,object>>();
+// or 査詢指定範圍（要大寫才生效哦）
+// A2（左上角）代表A列的第二行，C3（右下角）代表C列的第三行
+// 如果你不想限制行，就不要包含數位
+var rows = MiniExcel.QueryRange(path, startCell: "A2", endCell: "C3").Cast<IDictionary<string, object>>();
 ```
 
 
diff --git a/src/MiniExcel/MiniExcel.cs b/src/MiniExcel/MiniExcel.cs
index abf5649..c508f65 100644
--- a/src/MiniExcel/MiniExcel.cs
+++ b/src/MiniExcel/MiniExcel.cs
@@ -91,6 +91,21 @@
 
         #region range
 
+        /// <summary>
+        /// Extract the given range。 Only uppercase letters are effective。
+        /// e.g.
+        ///     MiniExcel.QueryRange(path, startCell: "A2", endCell: "C3")
+        ///     A2 represents the second row of column A, C3 represents the third row of column C
+        ///     If you don't want to restrict rows, just don't include numbers
+        /// </summary>
+        /// <param name="path"></param>
+        /// <param name="useHeaderRow"></param>
+        /// <param name="sheetName"></param>
+        /// <param name="excelType"></param>
+        /// <param name="startCell">top left corner</param>
+        /// <param name="endCell">lower right corner</param>
+        /// <param name="configuration"></param>
+        /// <returns></returns>
         public static IEnumerable<dynamic> QueryRange(string path, bool useHeaderRow = false, string sheetName = null, ExcelType excelType = ExcelType.UNKNOWN, string startCell = "a1", string endCell = "", IConfiguration configuration = null)
         {
             using (var stream = FileHelper.OpenSharedRead(path))
diff --git a/tests/MiniExcelTests/MiniExcelOpenXmlTests.cs b/tests/MiniExcelTests/MiniExcelOpenXmlTests.cs
index 5155b3c..6afa983 100644
--- a/tests/MiniExcelTests/MiniExcelOpenXmlTests.cs
+++ b/tests/MiniExcelTests/MiniExcelOpenXmlTests.cs
@@ -166,6 +166,21 @@ namespace MiniExcelLibs.Tests
 
             }
         }
+        
+        [Fact]
+        public void QueryRangeToIDictionary()
+        {
+            var path = @"../../../../../samples/xlsx/TestCenterEmptyRow/TestCenterEmptyRow.xlsx";
+            // tips：Only uppercase letters are effective
+            var rows = MiniExcel.QueryRange(path, startCell: "A2", endCell: "C")
+                .Cast<IDictionary<string, object>>()
+                .ToList();
+            Assert.Equal(5, rows.Count);
+            Assert.Equal(3, rows[0].Count);
+            Assert.Equal(2d, rows[1]["B"]);
+            Assert.Equal(null!, rows[2]["A"]);
+        }
+        
         [Fact()]
         public void CenterEmptyRowsQueryTest()
         {

From 92170f1fc2a684a4926f7b59af1bfa284e49a964 Mon Sep 17 00:00:00 2001
From: meld-cp <18450687+meld-cp@users.noreply.github.com>
Date: Sun, 21 Jul 2024 00:27:13 +1200
Subject: [PATCH 2/2] Reduce memory requirements when processing templates +
 template formulas (#638)

* fix for issue 606

* fix formatting
---
 samples/xlsx/TestIssue606_Template.xlsx       | Bin 0 -> 9426 bytes
 src/MiniExcel/OpenXml/Config.cs               |   1 +
 .../OpenXml/ExcelOpenXmlTemplate.Impl.cs      |  91 ++++++++++++------
 src/MiniExcel/OpenXml/ExcelOpenXmlTemplate.cs |   8 +-
 src/MiniExcel/Utils/calChainHelper.cs         |  24 ++---
 tests/MiniExcelTests/MiniExcelIssueTests.cs   |  53 +++++++++-
 6 files changed, 130 insertions(+), 47 deletions(-)
 create mode 100644 samples/xlsx/TestIssue606_Template.xlsx

diff --git a/samples/xlsx/TestIssue606_Template.xlsx b/samples/xlsx/TestIssue606_Template.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..bc3c78710e721020da4693fe727f3c6cec846a45
GIT binary patch
literal 9426
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

literal 0
HcmV?d00001

diff --git a/src/MiniExcel/OpenXml/Config.cs b/src/MiniExcel/OpenXml/Config.cs
index fed5318..fd0102b 100644
--- a/src/MiniExcel/OpenXml/Config.cs
+++ b/src/MiniExcel/OpenXml/Config.cs
@@ -6,5 +6,6 @@
         public const string SpreadsheetmlXmlStrictns = "http://purl.oclc.org/ooxml/spreadsheetml/main";
         public const string SpreadsheetmlXmlRelationshipns = "http://schemas.openxmlformats.org/officeDocument/2006/relationships";
         public const string SpreadsheetmlXmlStrictRelationshipns = "http://purl.oclc.org/ooxml/officeDocument/relationships";
+		public const string SpreadsheetmlXml_x14ac = "http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac";
     }
 }
\ No newline at end of file
diff --git a/src/MiniExcel/OpenXml/ExcelOpenXmlTemplate.Impl.cs b/src/MiniExcel/OpenXml/ExcelOpenXmlTemplate.Impl.cs
index d3a355d..187382a 100644
--- a/src/MiniExcel/OpenXml/ExcelOpenXmlTemplate.Impl.cs
+++ b/src/MiniExcel/OpenXml/ExcelOpenXmlTemplate.Impl.cs
@@ -105,7 +105,9 @@ namespace MiniExcelLibs.OpenXml
             }
         }
 
-        private List<XRowInfo> XRowInfos { get; set; }
+		private List<XRowInfo> XRowInfos { get; set; }
+
+        private readonly List<string> CalcChainCellRefs = new List<string>();
 
         private Dictionary<string, XMergeCell> XMergeCellInfos { get; set; }
         public List<XMergeCell> NewXMergeCellInfos { get; private set; }
@@ -688,7 +690,10 @@ namespace MiniExcelLibs.OpenXml
 
                             var mergeBaseRowIndex = newRowIndex;
                             newRowIndex += rowInfo.IEnumerableMercell?.Height ?? 1;
-                            writer.Write(CleanXml(rowXml, endPrefix)); // pass StringBuilder for netcoreapp3.0 or above
+
+							// replace formulas
+							ProcessFormulas( rowXml, newRowIndex );
+							writer.Write(CleanXml( rowXml, endPrefix)); // pass StringBuilder for netcoreapp3.0 or above
 
                             //mergecells
                             if (rowInfo.RowMercells != null)
@@ -743,30 +748,6 @@ namespace MiniExcelLibs.OpenXml
                     else
                     {
 
-                        // convert cells starting with '$=' into formulas
-                        var cs = row.SelectNodes($"x:c", _ns);
-                        foreach (XmlElement c in cs)
-                        {
-                            /* Target:
-                             <c r="C8" s="3">
-                                <f>SUM(C2:C7)</f>
-                            </c>
-                             */
-                            var vs = c.SelectNodes($"x:v", _ns);
-                            foreach (XmlElement v in vs)
-                            {
-                                if (!v.InnerText.StartsWith("$="))
-                                {
-                                    continue;
-                                }
-                                var fNode = c.OwnerDocument.CreateElement("f", Config.SpreadsheetmlXmlns);
-                                fNode.InnerText = v.InnerText.Substring(2);
-                                c.InsertBefore(fNode, v);
-                                c.RemoveChild(v);
-                            }
-                        }
-                        innerXml = row.InnerXml;
-
                         rowXml.Clear()
                               .Append(outerXmlOpen)
                               .AppendFormat(@" r=""{0}"">", newRowIndex)
@@ -775,7 +756,10 @@ namespace MiniExcelLibs.OpenXml
                               .Replace($"{{{{$enumrowstart}}}}", enumrowstart.ToString())
                               .Replace($"{{{{$enumrowend}}}}", enumrowend.ToString())
                               .AppendFormat("</{0}>", row.Name);
-                        writer.Write(CleanXml(rowXml, endPrefix)); // pass StringBuilder for netcoreapp3.0 or above
+
+						ProcessFormulas( rowXml, newRowIndex );
+
+						writer.Write(CleanXml( rowXml, endPrefix)); // pass StringBuilder for netcoreapp3.0 or above
 
                         //mergecells
                         if (rowInfo.RowMercells != null)
@@ -810,6 +794,59 @@ namespace MiniExcelLibs.OpenXml
                 writer.Write(contents[1]);
             }
         }
+        
+        private void ProcessFormulas( StringBuilder rowXml, int rowIndex )
+        {
+
+            var rowXmlString = rowXml.ToString();
+
+            // exit early if possible
+            if ( !rowXmlString.Contains( "$=" ) ) {
+                return;
+            }
+
+			XmlReaderSettings settings = new XmlReaderSettings { NameTable = _ns.NameTable };
+			XmlParserContext context = new XmlParserContext( null, _ns, "", XmlSpace.Default );
+			XmlReader reader = XmlReader.Create( new StringReader( rowXmlString ), settings, context );
+            
+            XmlDocument d = new XmlDocument();
+            d.Load( reader );
+
+            var row = d.FirstChild as XmlElement;
+
+			// convert cells starting with '$=' into formulas
+			var cs = row.SelectNodes( $"x:c", _ns );
+			for ( var ci = 0; ci < cs.Count; ci++ )
+            {
+				var c = cs.Item( ci ) as XmlElement;
+				if ( c == null ) {
+					continue;
+				}
+				/* Target:
+				 <c r="C8" s="3">
+					<f>SUM(C2:C7)</f>
+				</c>
+				 */
+				var vs = c.SelectNodes( $"x:v", _ns );
+				foreach ( XmlElement v in vs )
+                {
+					if ( !v.InnerText.StartsWith( "$=" ) )
+                    {
+						continue;
+					}
+					var fNode = c.OwnerDocument.CreateElement( "f", Config.SpreadsheetmlXmlns );
+					fNode.InnerText = v.InnerText.Substring( 2 );
+					c.InsertBefore( fNode, v );
+					c.RemoveChild( v );
+
+					var celRef = ExcelOpenXmlUtils.ConvertXyToCell( ci + 1, rowIndex );
+					CalcChainCellRefs.Add( celRef );
+
+				}
+			}
+            rowXml.Clear();
+			rowXml.Append( row.OuterXml );
+		}
 
         private static string ConvertToDateTimeString(KeyValuePair<string, PropInfo> propInfo, object cellValue)
         {
diff --git a/src/MiniExcel/OpenXml/ExcelOpenXmlTemplate.cs b/src/MiniExcel/OpenXml/ExcelOpenXmlTemplate.cs
index c2a38ea..d290695 100644
--- a/src/MiniExcel/OpenXml/ExcelOpenXmlTemplate.cs
+++ b/src/MiniExcel/OpenXml/ExcelOpenXmlTemplate.cs
@@ -25,7 +25,8 @@ namespace MiniExcelLibs.OpenXml
             _isExpressionRegex = new Regex("(?<={{).*?(?=}})");
             _ns = new XmlNamespaceManager(new NameTable());
             _ns.AddNamespace("x", Config.SpreadsheetmlXmlns);
-        }
+            _ns.AddNamespace( "x14ac", Config.SpreadsheetmlXml_x14ac );
+		}
 
         private readonly Stream _stream;
         private readonly OpenXmlConfiguration _configuration;
@@ -118,10 +119,7 @@ namespace MiniExcelLibs.OpenXml
                         using (var filledStream = entry.Open())
                         {
                             sheetIdx++;
-                            var filledDoc = new XmlDocument();
-                            filledDoc.Load(filledStream);
-                            var filledSheetData = filledDoc.SelectSingleNode("/x:worksheet/x:sheetData", _ns);
-                            _calcChainContent.Append(CalcChainHelper.GetCalcChainContentFromSheet(filledSheetData, _ns, sheetIdx));
+                            _calcChainContent.Append( CalcChainHelper.GetCalcChainContent( CalcChainCellRefs, sheetIdx ) );
                         }
                     }
 
diff --git a/src/MiniExcel/Utils/calChainHelper.cs b/src/MiniExcel/Utils/calChainHelper.cs
index 6747c7a..1d40c30 100644
--- a/src/MiniExcel/Utils/calChainHelper.cs
+++ b/src/MiniExcel/Utils/calChainHelper.cs
@@ -1,6 +1,6 @@
-using System.IO;
+using System.Collections.Generic;
+using System.IO;
 using System.Text;
-using System.Xml;
 
 namespace MiniExcelLibs.Utils
 {
@@ -13,22 +13,18 @@ namespace MiniExcelLibs.Utils
         //      Each <c> element should have a r attribute that specifies the cell's address (e.g., "A1" or "B2").
         //      The  <c> element should also have a i attribute that specifies the index of the formula in the formulas collection (in the workbook's sheet data file).
         // https://learn.microsoft.com/en-us/dotnet/api/documentformat.openxml.spreadsheet.calculationchain?view=openxml-2.8.1
-        public static string GetCalcChainContentFromSheet(in XmlNode sheetData, XmlNamespaceManager ns, int sheetIndex)
-        {
+		public static string GetCalcChainContent( List<string> cellRefs, int sheetIndex ) {
 
-            StringBuilder calcChainContent = new StringBuilder();
+			StringBuilder calcChainContent = new StringBuilder();
 
-            // each c having f nodes
-            var cs = sheetData.SelectNodes($"x:row/x:c[./x:f]", ns);
-            foreach (XmlElement c in cs)
-            {
-                calcChainContent.Append($@"<c r=""{c.GetAttribute("r")}"" i=""{sheetIndex}""/>");
-            }
+			foreach ( string cr in cellRefs ) {
+				calcChainContent.Append( $@"<c r=""{cr}"" i=""{sheetIndex}""/>" );
+			}
 
-            return calcChainContent.ToString();
-        }
+			return calcChainContent.ToString();
+		}
 
-        public static void GenerateCalcChainSheet(Stream calcChainStream, string calcChainContent)
+		public static void GenerateCalcChainSheet(Stream calcChainStream, string calcChainContent)
         {
             using (var writer = new StreamWriter(calcChainStream, Encoding.UTF8))
             {
diff --git a/tests/MiniExcelTests/MiniExcelIssueTests.cs b/tests/MiniExcelTests/MiniExcelIssueTests.cs
index 8d16a7b..e849293 100644
--- a/tests/MiniExcelTests/MiniExcelIssueTests.cs
+++ b/tests/MiniExcelTests/MiniExcelIssueTests.cs
@@ -1,4 +1,4 @@
-using Dapper;
+using Dapper;
 using MiniExcelLibs.Attributes;
 using MiniExcelLibs.Csv;
 using MiniExcelLibs.Exceptions;
@@ -3641,5 +3641,56 @@ MyProperty4,MyProperty1,MyProperty5,MyProperty2,MyProperty6,,MyProperty3
             Assert.Equal(2, getRowsInfo.Length );
 
         }
+
+
+        [Fact]
+        public void Issue606_1()
+        {
+            // excel max rows: 1,048,576
+            // before changes: 1999999 => 25.8 GB mem
+            //  after changes: 1999999 => peaks at 3.2 GB mem (10:20 min)
+            //  after changes:  100000 => peaks at 222 MB mem (34 sec)
+
+            var value = new
+            {
+                Title = "My Title",
+                OrderInfo = Enumerable
+                    .Range( 1, 100 )
+                    .Select( x => new
+                    {
+                        Standard = "standard",
+                        RegionName = "region",
+                        DealerName = "department",
+                        SalesPointName = "region",
+                        CustomerName = "customer",
+                        IdentityType = "aaaaaa",
+                        IdentitySeries = "ssssss",
+                        IdentityNumber = "nnnnn",
+                        BirthDate = "date",
+                        TariffPlanName = "plan",
+                        PhoneNumber = "num",
+                        SimCardIcc = "sss",
+                        BisContractNumber = "eee",
+                        CreatedAt = "dd.mm.yyyy",
+                        UserDescription = "fhtyrhthrthrt",
+                        UserName = "dfsfsdfds",
+                        PaymentsAmount = "dfhgdfgadfgdfg",
+                        OrderState = "agafgdafgadfgd",
+                    })
+            };
+
+            var path = Path.Combine
+            (
+                Path.GetTempPath(),
+                string.Concat( nameof( MiniExcelIssueTests ), "_", nameof( Issue606_1 ), ".xlsx" )
+            );
+
+            var templateFileName = @"../../../../../samples/xlsx/TestIssue606_Template.xlsx";
+
+
+            MiniExcel.SaveAsByTemplate( path, Path.GetFullPath( templateFileName ), value );
+
+        }
+
     }
 }
\ No newline at end of file