Merge branch 'mini-software:master' into master

Author: ping9719

README.md

@@ -1162,6 +1162,17 @@ MiniExcel.Query(path, configuration: config);
     }
 ```
 
+#### 5. FastMode
+
+System will not control memory, but you can get faster save speed.
+
+```csharp
+var config = new OpenXmlConfiguration() { FastMode = true };
+MiniExcel.SaveAs(path, reader,configuration:config);
+```
+
+
+
 
 
 

README.zh-CN.md

@@ -1159,6 +1159,15 @@ MiniExcel.Query(path, configuration: config);
     }
 ```
 
+#### 5. FastMode
+
+系统不会限制内存，达到更快的效率
+
+```csharp
+var config = new OpenXmlConfiguration() { FastMode = true };
+MiniExcel.SaveAs(path, reader,configuration:config);
+```
+
 
 
 ### 例子

README.zh-Hant.md

@@ -1159,6 +1159,15 @@ MiniExcel.Query(path,configuration: config);
     }
 ```
 
+#### 5. FastMode
+
+系統不會限制記憶體，達到更快的效率
+
+```csharp
+var config = new OpenXmlConfiguration() { FastMode = true };
+MiniExcel.SaveAs(path, reader,configuration:config);
+```
+
 
 
 ### 範例

docs/README.md

@@ -24,6 +24,11 @@
 
 
 
+### 1.29.0
+
+- [New] SaveAs support FastMode
+- [Bug] Fixed SaveAs OOM problem
+
 ### 1.28.2
 
 - [New] Support Assembly Strong Name Signature #450

docs/README.zh-CN.md

@@ -27,6 +27,11 @@
 
 
 
+### 1.29.0
+
+- [New] SaveAs 支持 FastMode
+- [Bug] 修正 SaveAs OOM 
+
 ### 1.28.2
 
 - [New] 支持 Assembly Strong Name Signature #450

docs/README.zh-Hant.md

@@ -26,7 +26,10 @@
 
 
 
+### 1.29.0
 
+- [New] SaveAs 支持 FastMode
+- [Bug] 修正 SaveAs OOM 
 
 ### 1.28.2
 

src/MiniExcel/IConfiguration.cs

@@ -9,5 +9,6 @@ public abstract class Configuration : IConfiguration
         public CultureInfo Culture { get; set; } = CultureInfo.InvariantCulture;
         public DynamicExcelColumn[] DynamicColumns { get; set; }
         public int BufferSize { get; set; } = 1024 * 512;
+        public bool FastMode { get; set; } = false;
     }
 }

src/MiniExcel/MiniExcelLibs.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<TargetFrameworks>net45;netstandard2.0;net5.0</TargetFrameworks>
-		<Version>1.28.5</Version>
+		<Version>1.29.0</Version>
 	</PropertyGroup>
 	<PropertyGroup>
 		<AssemblyName>MiniExcel</AssemblyName>
@@ -29,7 +29,7 @@ Todo : https://github.com/mini-software/MiniExcel/projects/1?fullscreen=true</De
 		<RepositoryType>Github</RepositoryType>
 		<AssemblyOriginatorKeyFile>miniexcel.snk</AssemblyOriginatorKeyFile>
 		<SignAssembly>True</SignAssembly>
-		<ProjectGuid>{70FA8638-157A-4380-A4F6-8E2C3EE92CAE}</ProjectGuid>
+		<ProjectGuid>{097903C9-1F81-4427-B4C8-530CB59687B8}</ProjectGuid>
 		<PublishRepositoryUrl>true</PublishRepositoryUrl>
 		<IncludeSymbols>true</IncludeSymbols>
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
@@ -51,4 +51,7 @@ Todo : https://github.com/mini-software/MiniExcel/projects/1?fullscreen=true</De
 	<ItemGroup>
 		<None Include="icon.png" Pack="true" PackagePath="\" />
 	</ItemGroup>
+	<ItemGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
+		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+	</ItemGroup>
 </Project>

src/MiniExcel/OpenXml/ExcelOpenXmlSheetWriter.cs

@@ -56,8 +56,11 @@ public ExcelOpenXmlSheetWriter(Stream stream, object value, string sheetName, IC
             this._stream = stream;
             // Why ZipArchiveMode.Update not ZipArchiveMode.Create?
             // R : Mode create - ZipArchiveEntry does not support seeking.'
-            this._archive = new MiniExcelZipArchive(_stream, ZipArchiveMode.Update, true, _utf8WithBom);
             this._configuration = configuration as OpenXmlConfiguration ?? OpenXmlConfiguration.DefaultConfig;
+            if (_configuration.FastMode)
+                this._archive = new MiniExcelZipArchive(_stream, ZipArchiveMode.Update, true, _utf8WithBom);
+            else
+                this._archive = new MiniExcelZipArchive(_stream, ZipArchiveMode.Create, true, _utf8WithBom);
             this._printHeader = printHeader;
             this._value = value;
             _sheets.Add(new SheetDto { Name = sheetName, SheetIdx = 1 }); //TODO:remove
@@ -120,7 +123,7 @@ private void CreateSheetXml(object value, string sheetPath)
         {
             ZipArchiveEntry entry = _archive.CreateEntry(sheetPath, CompressionLevel.Fastest);
             using (var zipStream = entry.Open())
-            using (MiniExcelStreamWriter writer = new MiniExcelStreamWriter(zipStream, _utf8WithBom,_configuration.BufferSize))
+            using (MiniExcelStreamWriter writer = new MiniExcelStreamWriter(zipStream, _utf8WithBom, _configuration.BufferSize))
             {
                 if (value == null)
                 {
@@ -166,14 +169,14 @@ private void CreateSheetXml(object value, string sheetPath)
                                 {
                                     mode = "IDictionary<string, object>";
                                     var dic = item as IDictionary<string, object>;
-                                    props = GetDictionaryColumnInfo(dic,null);
+                                    props = GetDictionaryColumnInfo(dic, null);
                                     maxColumnIndex = props.Count;
                                 }
                                 else if (item is IDictionary)
                                 {
                                     var dic = item as IDictionary;
                                     mode = "IDictionary";
-                                    props = GetDictionaryColumnInfo(null,dic);
+                                    props = GetDictionaryColumnInfo(null, dic);
                                     //maxColumnIndex = dic.Keys.Count; 
                                     maxColumnIndex = props.Count; // why not using keys, because ignore attribute ![image](https://user-images.githubusercontent.com/12729184/163686902-286abb70-877b-4e84-bd3b-001ad339a84a.png)
                                 }
@@ -253,7 +256,7 @@ private void CreateSheetXml(object value, string sheetPath)
                             WriteC(writer, r, columnName: p.ExcelColumnName);
                             cellIndex++;
                         }
-                        
+
                         writer.Write($"</x:row>");
                         yIndex++;
                     }
@@ -353,7 +356,7 @@ private void WriteEmptySheet(MiniExcelStreamWriter writer)
         private void GenerateSheetByColumnInfo<T>(MiniExcelStreamWriter writer, IEnumerable value, List<ExcelColumnInfo> props, int xIndex = 1, int yIndex = 1)
         {
             var isDic = typeof(T) == typeof(IDictionary);
-            var isDapperRow = typeof(T) == typeof(IDictionary<string,object>);
+            var isDapperRow = typeof(T) == typeof(IDictionary<string, object>);
             foreach (T v in value)
             {
                 writer.Write($"<x:row r=\"{yIndex}\">");
@@ -375,14 +378,14 @@ private void GenerateSheetByColumnInfo<T>(MiniExcelStreamWriter writer, IEnumera
                     else if (isDapperRow)
                     {
                         cellValue = ((IDictionary<string, object>)v)[p.Key.ToString()];
-                    } 
+                    }
                     else
                     {
                         cellValue = p.Property.GetValue(v);
                     }
                     WriteCell(writer, yIndex, cellIndex, cellValue, p);
-                        
-                    
+
+
                     cellIndex++;
                 }
                 writer.Write($"</x:row>");
@@ -403,15 +406,15 @@ private void WriteCell(MiniExcelStreamWriter writer, int rowIndex, int cellIndex
             {
                 v = ExcelOpenXmlUtils.EncodeXML(str);
             }
-            else if(p?.ExcelFormat != null && value is IFormattable formattableValue)
+            else if (p?.ExcelFormat != null && value is IFormattable formattableValue)
             {
                 var formattedStr = formattableValue.ToString(p.ExcelFormat, _configuration.Culture);
                 v = ExcelOpenXmlUtils.EncodeXML(formattedStr);
             }
             else
             {
                 Type type = null;
-                if (p==null || p.Key != null)
+                if (p == null || p.Key != null)
                 {
                     // TODO: need to optimize 
                     // Dictionary need to check type every time, so it's slow..
@@ -503,7 +506,7 @@ private void WriteCell(MiniExcelStreamWriter writer, int rowIndex, int cellIndex
                 }
                 else if (type == typeof(DateTime))
                 {
-                    if(_configuration.Culture != CultureInfo.InvariantCulture)
+                    if (_configuration.Culture != CultureInfo.InvariantCulture)
                     {
                         t = "str";
                         v = ((DateTime)value).ToString(_configuration.Culture);
@@ -518,18 +521,18 @@ private void WriteCell(MiniExcelStreamWriter writer, int rowIndex, int cellIndex
                     {
                         // TODO: now it'll lose date type information
                         t = "str";
-                        v = ((DateTime)value).ToString(p.ExcelFormat,_configuration.Culture);
+                        v = ((DateTime)value).ToString(p.ExcelFormat, _configuration.Culture);
                     }
                 }
                 else
                 {
                     //TODO: _configuration.Culture
-                    v = ExcelOpenXmlUtils.EncodeXML(value.ToString());       
+                    v = ExcelOpenXmlUtils.EncodeXML(value.ToString());
                 }
             }
 
             var columname = ExcelOpenXmlUtils.ConvertXyToCell(cellIndex, rowIndex);
-            if (v != null && (v.StartsWith(" ",StringComparison.Ordinal) || v.EndsWith(" ",StringComparison.Ordinal))) /*Prefix and suffix blank space will lost after SaveAs #294*/
+            if (v != null && (v.StartsWith(" ", StringComparison.Ordinal) || v.EndsWith(" ", StringComparison.Ordinal))) /*Prefix and suffix blank space will lost after SaveAs #294*/
                 writer.Write($"<x:c r=\"{columname}\" {(t == null ? "" : $"t =\"{t}\"")} s=\"{s}\" xml:space=\"preserve\"><x:v>{v}</x:v></x:c>");
             else
                 //t check avoid format error ![image](https://user-images.githubusercontent.com/12729184/118770190-9eee3480-b8b3-11eb-9f5a-87a439f5e320.png)
@@ -590,8 +593,13 @@ private void GenerateSheetByIDataReader(MiniExcelStreamWriter writer, IDataReade
             var yIndex = xy.Item2;
             var xIndex = 0;
             {
-                dimensionWritePosition = writer.WriteAndFlush($@"<x:dimension ref=""");
-                writer.Write($@"                              />"); // end of code will be replaced
+
+                if (_configuration.FastMode)
+                {
+                    dimensionWritePosition = writer.WriteAndFlush($@"<x:dimension ref=""");
+                    writer.Write("                              />"); // end of code will be replaced
+                }
+
                 writer.Write("<x:sheetData>");
                 int fieldCount = reader.FieldCount;
                 if (_printHeader)
@@ -626,11 +634,14 @@ private void GenerateSheetByIDataReader(MiniExcelStreamWriter writer, IDataReade
             }
             writer.Write("</x:sheetData>");
             if (_configuration.AutoFilter)
-                writer.Write($"<x:autoFilter ref=\"A1:{ExcelOpenXmlUtils.ConvertXyToCell((xIndex-1)/*TODO:code smell*/, yIndex-1)}\" />");
+                writer.Write($"<x:autoFilter ref=\"A1:{ExcelOpenXmlUtils.ConvertXyToCell((xIndex - 1)/*TODO:code smell*/, yIndex - 1)}\" />");
             writer.WriteAndFlush("</x:worksheet>");
 
-            writer.SetPosition(dimensionWritePosition); 
-            writer.WriteAndFlush($@"A1:{ExcelOpenXmlUtils.ConvertXyToCell((xIndex - 1)/*TODO:code smell*/, yIndex - 1)}""");
+            if (_configuration.FastMode)
+            {
+                writer.SetPosition(dimensionWritePosition);
+                writer.WriteAndFlush($@"A1:{ExcelOpenXmlUtils.ConvertXyToCell((xIndex - 1)/*TODO:code smell*/, yIndex - 1)}""");
+            }
         }
 
         private static void WriteC(MiniExcelStreamWriter writer, string r, string columnName)
@@ -779,7 +790,7 @@ private string GetDimensionRef(int maxRowIndex, int maxColumnIndex)
 
         public async Task SaveAsAsync(CancellationToken cancellationToken = default(CancellationToken))
         {
-            await Task.Run(() => SaveAs(),cancellationToken).ConfigureAwait(false);
+            await Task.Run(() => SaveAs(), cancellationToken).ConfigureAwait(false);
         }
 
         public void Insert()

tests/MiniExcelTests/MiniExcelIssueTests.cs

@@ -34,6 +34,14 @@ public MiniExcelIssueTests(ITestOutputHelper output)
             this.output = output;
         }
 
+        //[Fact]
+        public void TestIssue()
+        {
+            var path = PathHelper.GetTempFilePath();
+            var value = Enumerable.Range(1, 10000000).Select(s => new { s, id = Guid.NewGuid() });
+            MiniExcel.SaveAs(path, value);
+        }
+
         /// <summary>
         /// https://gitee.com/dotnetchina/MiniExcel/issues/I4X92G
         /// </summary>
@@ -115,7 +123,8 @@ public void TestIssue_DataReaderSupportDimension()
                 }
                 var path = Path.GetTempPath() + Guid.NewGuid() + ".xlsx";
                 DataTableReader reader = table.CreateDataReader();
-                MiniExcel.SaveAs(path, reader);
+                var config = new OpenXmlConfiguration() { FastMode = true };
+                MiniExcel.SaveAs(path, reader,configuration:config);
                 var xml = Helpers.GetZipFileContent(path, "xl/worksheets/sheet1.xml");
                 Assert.Contains("<x:autoFilter ref=\"A1:B3\" />", xml);
                 Assert.Contains("<x:dimension ref=\"A1:B3\" />", xml);