[New] OpenXmlConfiguration add AutoFilter property.

mini-software · Oct 21, 2021 · f6d0d7c · f6d0d7c
1 parent c415e34
commit f6d0d7c
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -459,6 +459,17 @@ MiniExcel.SaveAs(path, value,configuration:config);
 ![image](https://user-images.githubusercontent.com/12729184/118784917-f3e57700-b8c2-11eb-8718-8d955b1bc197.png)
 
 
+#### 9. AutoFilter 
+
+Since v0.19.0  `OpenXmlConfiguration.AutoFilter` can en/unable AutoFilter , default value is `true`, and setting AutoFilter way:  
+
+```csharp
+MiniExcel.SaveAs(path, value, configuration: new OpenXmlConfiguration() { AutoFilter = false });
+```
+
+
+
+
 
 ### Fill Data To Excel Template <a name="getstart3"></a>
 

diff --git a/README.zh-CN.md b/README.zh-CN.md
@@ -463,6 +463,14 @@ MiniExcel.SaveAs(path, value,configuration:config);
 
 ![image](https://user-images.githubusercontent.com/12729184/118784917-f3e57700-b8c2-11eb-8718-8d955b1bc197.png)
 
+#### 9. AutoFilter 筛选
+
+从 0.19.0 支持，可藉由 OpenXmlConfiguration.AutoFilter 设定，预设为True。关闭 AutoFilter 方式 :  
+
+```csharp
+MiniExcel.SaveAs(path, value, configuration: new OpenXmlConfiguration() { AutoFilter = false });
+```
+
 
 
 

diff --git a/README.zh-Hant.md b/README.zh-Hant.md
@@ -469,7 +469,13 @@ MiniExcel.SaveAs(path, value,configuration:config);
 
 
 
+#### 9. AutoFilter 篩選
 
+從 0.19.0 支持，可藉由 OpenXmlConfiguration.AutoFilter 設定，預設為True。關閉 AutoFilter 方式 :  
+
+```csharp
+MiniExcel.SaveAs(path, value, configuration: new OpenXmlConfiguration() { AutoFilter = false });
+```
 
 
 

diff --git a/docs/README.md b/docs/README.md
@@ -19,6 +19,7 @@
 ### 0.19.0
 - [New] SaveAs default style with autoFilter mode. #190
 - [New] Add ConvertCsvToXlsx、ConvertXlsxToCsv method. #292
+- [New] OpenXmlConfiguration add AutoFilter property. 
 - [Bug] Fix after CSV Query then SaveAs system will throw "Stream was not readable." exception. #293
 
 ### 0.18.0

diff --git a/docs/README.zh-CN.md b/docs/README.zh-CN.md
@@ -26,6 +26,7 @@
 ### 0.19.0
 - [New] SaveAs 预设样式增加筛选功能. #190
 - [New] 新增 ConvertCsvToXlsx、ConvertXlsxToCsv 方法. #292
+- [New] OpenXmlConfiguration 新增 AutoFilter 属性. 
 - [Bug] 修正 CSV 读取后 SaveAs 会抛出 "Stream was not readable." 错误. #293
 
 ### 0.18.0

diff --git a/docs/README.zh-Hant.md b/docs/README.zh-Hant.md
@@ -20,6 +20,7 @@
 ### 0.19.0
 - [New] SaveAs 預設樣式增加篩選功能. #190
 - [New] 新增 ConvertCsvToXlsx、ConvertXlsxToCsv 方法. #292
+- [New] OpenXmlConfiguration 新增 AutoFilter 屬性.
 - [Bug] 修正 CSV 讀取後 SaveAs 會拋出 "Stream was not readable." 錯誤. #293
 
 ### 0.18.0

diff --git a/src/MiniExcel/OpenXml/ExcelOpenXmlSheetWriter.cs b/src/MiniExcel/OpenXml/ExcelOpenXmlSheetWriter.cs
@@ -36,7 +36,7 @@ public void SaveAs(object value, string sheetName, bool printHeader, IConfigurat
                     {
                         sheetId++;
                         var sheetPath = $"xl/worksheets/sheet{sheetId}.xml";
-                        CreateSheetXml(sheet.Value, printHeader, archive, packages, sheetPath);
+                        CreateSheetXml(sheet.Value, printHeader, archive, packages, sheetPath, config);
                     }
                     GenerateContentTypesXml(archive, packages);
                 }
@@ -54,21 +54,21 @@ public void SaveAs(object value, string sheetName, bool printHeader, IConfigurat
                     {
                         sheetId++;
                         var sheetPath = $"xl/worksheets/sheet{sheetId}.xml";
-                        CreateSheetXml(dt, printHeader, archive, packages, sheetPath);
+                        CreateSheetXml(dt, printHeader, archive, packages, sheetPath, config);
                     }
                     GenerateContentTypesXml(archive, packages);
                 }
                 else
                 {
                     var packages = DefualtOpenXml.GenerateDefaultOpenXml(archive, new[] { sheetName }, config);
                     var sheetPath = "xl/worksheets/sheet1.xml";
-                    CreateSheetXml(value, printHeader, archive, packages, sheetPath);
+                    CreateSheetXml(value, printHeader, archive, packages, sheetPath, config);
                     GenerateContentTypesXml(archive, packages);
                 }
             }
         }
 
-        private void CreateSheetXml(object value, bool printHeader, MiniExcelZipArchive archive, Dictionary<string, ZipPackageInfo> packages, string sheetPath)
+        private void CreateSheetXml(object value, bool printHeader, MiniExcelZipArchive archive, Dictionary<string, ZipPackageInfo> packages, string sheetPath, OpenXmlConfiguration configuration)
         {
             ZipArchiveEntry entry = archive.CreateEntry(sheetPath);
             using (var zipStream = entry.Open())
@@ -231,7 +231,8 @@ private void CreateSheetXml(object value, bool printHeader, MiniExcelZipArchive
                     else
                         throw new NotImplementedException($"Type {type.Name} & genericType {genericType.Name} not Implemented. please issue for me.");
                     writer.Write("</x:sheetData>");
-                    writer.Write($"<x:autoFilter ref=\"A1:{ExcelOpenXmlUtils.ConvertXyToCell(maxColumnIndex, maxRowIndex==0?1: maxRowIndex)}\" />");
+                    if(configuration.AutoFilter)
+                        writer.Write($"<x:autoFilter ref=\"A1:{ExcelOpenXmlUtils.ConvertXyToCell(maxColumnIndex, maxRowIndex==0?1: maxRowIndex)}\" />");
                     writer.Write("</x:worksheet>");
                 }
                 else if (value is DataTable)

diff --git a/src/MiniExcel/OpenXml/OpenXmlConfiguration.cs b/src/MiniExcel/OpenXml/OpenXmlConfiguration.cs
@@ -8,5 +8,6 @@ public class OpenXmlConfiguration : IConfiguration
         internal static readonly OpenXmlConfiguration DefaultConfig = new OpenXmlConfiguration();
         public bool FillMergedCells { get; set; }
         public TableStyles TableStyles { get; set; } = TableStyles.Default;
+        public bool AutoFilter { get; set; } = true;
     }
 }
diff --git a/tests/MiniExcelTests/MiniExcelIssueTests.cs b/tests/MiniExcelTests/MiniExcelIssueTests.cs
@@ -33,6 +33,14 @@ public MiniExcelIssueTests(ITestOutputHelper output)
         [Fact]
         public void TestIssue190()
         {
+            {
+                var path = PathHelper.GetTempPath();
+                var value = new TestIssue190Dto[] { };
+                MiniExcel.SaveAs(path, value, configuration: new OpenXmlConfiguration() { AutoFilter = false });
+
+                var sheetXml = Helpers.GetZipFileContent(path, "xl/worksheets/sheet1.xml");
+                Assert.DoesNotContain("<x:autoFilter ref=\"A1:C1\" />", sheetXml);
+            }
             {
                 var path = PathHelper.GetTempPath();
                 var value = new TestIssue190Dto[] { };