From a8e9ba3a019750b786c0e75b7b496f6b17459a94 Mon Sep 17 00:00:00 2001 From: Argo-AscioTech Date: Mon, 11 Dec 2023 00:18:07 +0800 Subject: [PATCH 01/35] =?UTF-8?q?doc:=20=E6=9B=B4=E6=96=B0=E7=A4=BA?= =?UTF-8?q?=E4=BE=8B=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Samples/Table/TablesExport.razor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor.Server/Components/Samples/Table/TablesExport.razor b/src/BootstrapBlazor.Server/Components/Samples/Table/TablesExport.razor index 9c5c4092e7d..2e72065d6bc 100644 --- a/src/BootstrapBlazor.Server/Components/Samples/Table/TablesExport.razor +++ b/src/BootstrapBlazor.Server/Components/Samples/Table/TablesExport.razor @@ -10,7 +10,7 @@ -

@Localizer["TablesExportTips"]：

+

@Localizer["TablesExportTips"]：

public void ConfigureServices(IServiceCollection services)
 {

From f758b3d34f95727304e911dc86b1795a4595f4d0 Mon Sep 17 00:00:00 2001
From: Argo-AscioTech 
Date: Mon, 11 Dec 2023 00:20:45 +0800
Subject: [PATCH 02/35] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=20Pdf=20?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BootstrapBlazor/Services/DefaultExcelExport.cs | 13 +++++++++++++
 src/BootstrapBlazor/Services/ITableExcelExport.cs  |  8 ++++++++
 2 files changed, 21 insertions(+)

diff --git a/src/BootstrapBlazor/Services/DefaultExcelExport.cs b/src/BootstrapBlazor/Services/DefaultExcelExport.cs
index 34fc31d63fb..0b35917ca83 100644
--- a/src/BootstrapBlazor/Services/DefaultExcelExport.cs
+++ b/src/BootstrapBlazor/Services/DefaultExcelExport.cs
@@ -27,4 +27,17 @@ public Task ExportCsvAsync(IEnumerable items, IEnumerable
+    /// 
+    /// 
+    /// 
+    /// 
+    /// 
+    /// 
+    /// 
+    public Task ExportPdfAsync(IEnumerable items, IEnumerable? cols, string? fileName = null)
+    {
+        return Task.FromResult(false);
+    }
 }
diff --git a/src/BootstrapBlazor/Services/ITableExcelExport.cs b/src/BootstrapBlazor/Services/ITableExcelExport.cs
index 662010c9421..14e386754d3 100644
--- a/src/BootstrapBlazor/Services/ITableExcelExport.cs
+++ b/src/BootstrapBlazor/Services/ITableExcelExport.cs
@@ -24,4 +24,12 @@ public interface ITableExcelExport
     /// 当前可见列数据集合 默认 null 导出全部列
     /// 文件名 默认 null ExportData_{DateTime.Now:yyyyMMddHHmmss}.xlsx
     Task ExportCsvAsync(IEnumerable items, IEnumerable? cols, string? fileName = null);
+
+    /// 
+    /// 导出 Pdf 方法
+    /// 
+    /// 导出数据集合
+    /// 当前可见列数据集合 默认 null 导出全部列
+    /// 文件名 默认 null ExportData_{DateTime.Now:yyyyMMddHHmmss}.xlsx
+    Task ExportPdfAsync(IEnumerable items, IEnumerable? cols, string? fileName = null);
 }

From e8ecc7a4bd0d6c50cebe266977f91dd129ae463a Mon Sep 17 00:00:00 2001
From: Argo-AscioTech 
Date: Mon, 11 Dec 2023 09:50:30 +0800
Subject: [PATCH 03/35] =?UTF-8?q?chore:=20=E5=A2=9E=E5=8A=A0=20Csv=20?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E8=B5=84=E6=BA=90=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 localization/de.json                | 1 +
 localization/es.json                | 1 +
 localization/pt.json                | 1 +
 localization/th-TH.json             | 3 ++-
 localization/zh-TW.json             | 1 +
 src/BootstrapBlazor/Locales/en.json | 1 +
 src/BootstrapBlazor/Locales/zh.json | 1 +
 7 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/localization/de.json b/localization/de.json
index b06a7dd6bc5..cbb22d2c10a 100644
--- a/localization/de.json
+++ b/localization/de.json
@@ -230,6 +230,7 @@
     "ExportToastTitle": "Daten exportieren",
     "ExportToastContent": "Daten exportieren {0}, automatisches Schließen in {1} Sekunden",
     "ExportToastInProgressContent": "Daten exportieren, automatisches Schließen in {0} Sekunden",
+    "ExportCsvDropdownItemText": "MS-Csv",
     "ExportExcelDropdownItemText": "MS-Excel",
     "ExportPdfDropdownItemText": "Pdf",
     "PageInfoText": "{0} - {1} Total {2}",
diff --git a/localization/es.json b/localization/es.json
index 99ebbec61db..ce6336ce572 100644
--- a/localization/es.json
+++ b/localization/es.json
@@ -230,6 +230,7 @@
     "ExportToastTitle": "Exportar datos",
     "ExportToastContent": "Exportar datos {0}, cierre automático en {0} segundos",
     "ExportToastInProgressContent": "Exportar datos, cierre automático en {0} segundos",
+    "ExportCsvDropdownItemText": "MS-Csv",
     "ExportExcelDropdownItemText": "MS-Excel",
     "ExportPdfDropdownItemText": "Pdf",
     "PageInfoText": "{0} - {1} Total {2}",
diff --git a/localization/pt.json b/localization/pt.json
index e8aacbb2984..ae88a27804b 100644
--- a/localization/pt.json
+++ b/localization/pt.json
@@ -230,6 +230,7 @@
     "ExportToastTitle": "Exportar dados",
     "ExportToastContent": "Exportar dados {0}, Fechamento automático em {0} segundos",
     "ExportToastInProgressContent": "Exportar dados, Fechamento automático em {0} segundos",
+    "ExportCsvDropdownItemText": "MS-Csv",
     "ExportExcelDropdownItemText": "MS-Excel",
     "ExportPdfDropdownItemText": "Pdf",
     "PageInfoText": "{0} - {1} Total {2}",
diff --git a/localization/th-TH.json b/localization/th-TH.json
index 3f08d9fbe69..88542ac1fb9 100644
--- a/localization/th-TH.json
+++ b/localization/th-TH.json
@@ -1,4 +1,4 @@
-{
+{
   "BootstrapBlazor.Components.AutoComplete": {
     "NoDataTip": "ไม่มีข้อมูลที่ตรงกัน",
     "PlaceHolder": "กรุณากรอก"
@@ -225,6 +225,7 @@
     "ExportToastTitle": "ส่งออกข้อมูล",
     "ExportToastContent": "ส่งออกข้อมูล {0}，{1} ปิดอัตโนมัติหลังจากวินาที",
     "ExportToastInProgressContent": "กำลังส่งออกข้อมูล โปรดทราบภายหลัง, {0} ปิดอัตโนมัติหลังจากวินาที",
+    "ExportCsvDropdownItemText": "ไมโครซอฟท์ Csv รูปแบบ",
     "ExportExcelDropdownItemText": "ไมโครซอฟท์ Excel รูปแบบ",
     "ExportPdfDropdownItemText": "Pdf รูปแบบ",
     "PageInfoText": "{0} - {1} ทั้งหมด {2} บทความ",
diff --git a/localization/zh-TW.json b/localization/zh-TW.json
index 7bd84d686a1..56fa9eabde4 100644
--- a/localization/zh-TW.json
+++ b/localization/zh-TW.json
@@ -239,6 +239,7 @@
     "ExportToastTitle": "匯出資料",
     "ExportToastContent": "匯出資料 {0}，{1} 秒後自動關閉",
     "ExportToastInProgressContent": "正在匯出資料，請稍後, {0} 秒後自動關閉",
+    "ExportCsvDropdownItemText": "微軟 Csv 格式",
     "ExportExcelDropdownItemText": "微軟 Excel 格式",
     "ExportPdfDropdownItemText": "Pdf 格式"
   },
diff --git a/src/BootstrapBlazor/Locales/en.json b/src/BootstrapBlazor/Locales/en.json
index 05ac3fb77b9..9c6d878dcb5 100644
--- a/src/BootstrapBlazor/Locales/en.json
+++ b/src/BootstrapBlazor/Locales/en.json
@@ -225,6 +225,7 @@
     "ExportToastTitle": "Export",
     "ExportToastContent": "Export data {0}, auto close after {1}s",
     "ExportToastInProgressContent": "Exporting data, please wait a moment, auto close after {0}s",
+    "ExportCsvDropdownItemText": "MS-Csv",
     "ExportExcelDropdownItemText": "MS-Excel",
     "ExportPdfDropdownItemText": "Pdf",
     "PageInfoText": "{0} - {1} Total {2}",
diff --git a/src/BootstrapBlazor/Locales/zh.json b/src/BootstrapBlazor/Locales/zh.json
index 5ed28328aec..9a0a016ad85 100644
--- a/src/BootstrapBlazor/Locales/zh.json
+++ b/src/BootstrapBlazor/Locales/zh.json
@@ -225,6 +225,7 @@
     "ExportToastTitle": "导出数据",
     "ExportToastContent": "导出数据 {0}，{1} 秒后自动关闭",
     "ExportToastInProgressContent": "正在导出数据，请稍后, {0} 秒后自动关闭",
+    "ExportCsvDropdownItemText": "微软 Csv 格式",
     "ExportExcelDropdownItemText": "微软 Excel 格式",
     "ExportPdfDropdownItemText": "Pdf 格式",
     "PageInfoText": "{0} - {1} 共 {2} 条",

From d0d569fb9e9abc93a96fe0e9a171c46fc0f9b07b Mon Sep 17 00:00:00 2001
From: Argo-AscioTech 
Date: Mon, 11 Dec 2023 10:04:39 +0800
Subject: [PATCH 04/35] =?UTF-8?q?refactor:=20=E5=AE=8C=E5=96=84=20IHtml2Pd?=
 =?UTF-8?q?f=20=E6=8E=A5=E5=8F=A3=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/DefaultPdfService.cs             | 20 +++-----------
 .../Services/IHtml2Pdf.cs                     | 27 -------------------
 2 files changed, 4 insertions(+), 43 deletions(-)
 delete mode 100644 src/Extensions/Components/BootstrapBlazor.Html2Pdf/Services/IHtml2Pdf.cs

diff --git a/src/Extensions/Components/BootstrapBlazor.Html2Pdf/Services/DefaultPdfService.cs b/src/Extensions/Components/BootstrapBlazor.Html2Pdf/Services/DefaultPdfService.cs
index e20adabe67d..9f7c731e10a 100644
--- a/src/Extensions/Components/BootstrapBlazor.Html2Pdf/Services/DefaultPdfService.cs
+++ b/src/Extensions/Components/BootstrapBlazor.Html2Pdf/Services/DefaultPdfService.cs
@@ -7,35 +7,23 @@
 namespace BootstrapBlazor.Components;
 
 /// 
-/// 构造函数
+/// 默认 Html to Pdf 实现 
 /// 
 class DefaultPdfService : IHtml2Pdf
 {
     /// 
     /// 
     /// 
-    public async Task ExportDataAsync(string url, PdfOptions? options = null)
+    public async Task PdfDataAsync(string url)
     {
         using var browserFetcher = new BrowserFetcher();
         await browserFetcher.DownloadAsync();
-        await using var browser = await Puppeteer.LaunchAsync(new LaunchOptions() { Headless = true });
-        await using var page = await browser.NewPageAsync();
-        await page.GoToAsync(url);
-        var content = await page.GetContentAsync();
-        return await page.PdfDataAsync(options ?? new PdfOptions());
-    }
 
-    /// 
-    /// 
-    /// 
-    public async Task ExportStreamAsync(string url, PdfOptions? options = null)
-    {
-        using var browserFetcher = new BrowserFetcher();
-        await browserFetcher.DownloadAsync();
         await using var browser = await Puppeteer.LaunchAsync(new LaunchOptions() { Headless = true });
         await using var page = await browser.NewPageAsync();
         await page.GoToAsync(url);
+
         var content = await page.GetContentAsync();
-        return await page.PdfStreamAsync(options ?? new PdfOptions());
+        return await page.PdfDataAsync();
     }
 }
diff --git a/src/Extensions/Components/BootstrapBlazor.Html2Pdf/Services/IHtml2Pdf.cs b/src/Extensions/Components/BootstrapBlazor.Html2Pdf/Services/IHtml2Pdf.cs
deleted file mode 100644
index 54b7bc833fe..00000000000
--- a/src/Extensions/Components/BootstrapBlazor.Html2Pdf/Services/IHtml2Pdf.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) Argo Zhang (argo@163.com). All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-// Website: https://www.blazor.zone or https://argozhang.github.io/
-
-using PuppeteerSharp;
-
-namespace BootstrapBlazor.Components;
-
-/// 
-/// Html export PDF service
-/// 
-public interface IHtml2Pdf
-{
-    /// 
-    /// Export method
-    /// 
-    /// url
-    /// the instance of PdfOptions
-    Task ExportDataAsync(string url, PdfOptions? options = null);
-
-    /// 
-    /// 导出流
-    /// 
-    /// url
-    /// the instance of PdfOptions
-    Task ExportStreamAsync(string url, PdfOptions? options = null);
-}

From 53138e5680f245f1340ec0f9535258876e465068 Mon Sep 17 00:00:00 2001
From: Argo-AscioTech 
Date: Mon, 11 Dec 2023 10:05:26 +0800
Subject: [PATCH 05/35] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=20TableExp?=
 =?UTF-8?q?ort=20=E5=AF=BC=E5=87=BA=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{ExcelExport.cs => DefaultTableExport.cs} | 39 +++++++++++++++++--
 ...TableExportServiceCollectionExtensions.cs} |  4 +-
 2 files changed, 38 insertions(+), 5 deletions(-)
 rename src/Extensions/Components/BootstrapBlazor.TableExport/{ExcelExport.cs => DefaultTableExport.cs} (70%)
 rename src/Extensions/Components/BootstrapBlazor.TableExport/{TableExcelExportServiceCollectionExtensions.cs => TableExportServiceCollectionExtensions.cs} (83%)

diff --git a/src/Extensions/Components/BootstrapBlazor.TableExport/ExcelExport.cs b/src/Extensions/Components/BootstrapBlazor.TableExport/DefaultTableExport.cs
similarity index 70%
rename from src/Extensions/Components/BootstrapBlazor.TableExport/ExcelExport.cs
rename to src/Extensions/Components/BootstrapBlazor.TableExport/DefaultTableExport.cs
index ad3c091ea0a..205de9a47dc 100644
--- a/src/Extensions/Components/BootstrapBlazor.TableExport/ExcelExport.cs
+++ b/src/Extensions/Components/BootstrapBlazor.TableExport/DefaultTableExport.cs
@@ -7,21 +7,25 @@
 
 namespace BootstrapBlazor.Components;
 
-class ExcelExport : ITableExcelExport
+class DefaultTableExport : ITableExport
 {
     private IServiceProvider ServiceProvider { get; set; }
 
+    private IHtml2Pdf Html2PdfService { get; set; }
+
     /// 
     /// 构造函数
     /// 
     /// 
-    public ExcelExport(IServiceProvider serviceProvider)
+    /// 
+    public DefaultTableExport(IServiceProvider serviceProvider, IHtml2Pdf html2Pdf)
     {
         ServiceProvider = serviceProvider;
+        Html2PdfService = html2Pdf;
     }
 
     /// 
-    /// 导出 Excel 方法
+    /// 导出 方法
     /// 
     /// 导出数据集合
     /// 导出列集合 默认 null 全部导出
@@ -29,8 +33,35 @@ public ExcelExport(IServiceProvider serviceProvider)
     /// 
     public Task ExportAsync(IEnumerable items, IEnumerable? cols = null, string? fileName = null) => InternalExportAsync(items, cols, ExcelType.XLSX, fileName);
 
+    /// 
+    /// 导出 Excel 方法
+    /// 
+    /// 导出数据集合
+    /// 导出列集合 默认 null 全部导出
+    /// 导出后下载文件名
+    /// 
+    public Task ExportExcelAsync(IEnumerable items, IEnumerable? cols = null, string? fileName = null) => InternalExportAsync(items, cols, ExcelType.XLSX, fileName);
+
+    /// 
+    /// 
+    /// 
+    /// 
+    /// 
+    /// 
+    /// 
+    /// 
     public Task ExportCsvAsync(IEnumerable items, IEnumerable? cols, string? fileName = null) => InternalExportAsync(items, cols, ExcelType.CSV, fileName);
 
+    /// 
+    /// 
+    /// 
+    /// 
+    /// 
+    /// 
+    /// 
+    /// 
+    public Task ExportPdfAsync(IEnumerable items, IEnumerable? cols, string? fileName = null) => Task.FromResult(false);
+
     private async Task InternalExportAsync(IEnumerable items, IEnumerable? cols, ExcelType excelType, string? fileName = null)
     {
         var value = new List>();
@@ -87,4 +118,6 @@ private async Task InternalExportAsync(IEnumerable items,
         }
         return ret;
     }
+
+
 }
diff --git a/src/Extensions/Components/BootstrapBlazor.TableExport/TableExcelExportServiceCollectionExtensions.cs b/src/Extensions/Components/BootstrapBlazor.TableExport/TableExportServiceCollectionExtensions.cs
similarity index 83%
rename from src/Extensions/Components/BootstrapBlazor.TableExport/TableExcelExportServiceCollectionExtensions.cs
rename to src/Extensions/Components/BootstrapBlazor.TableExport/TableExportServiceCollectionExtensions.cs
index ba3761f45ca..8c71003ee15 100644
--- a/src/Extensions/Components/BootstrapBlazor.TableExport/TableExcelExportServiceCollectionExtensions.cs
+++ b/src/Extensions/Components/BootstrapBlazor.TableExport/TableExportServiceCollectionExtensions.cs
@@ -7,7 +7,7 @@ namespace Microsoft.Extensions.DependencyInjection;
 /// 
 /// BootstrapBlazor 服务扩展类
 /// 
-public static class TableExcelExportServiceCollectionExtensions
+public static class TableExportServiceCollectionExtensions
 {
     /// 
     /// 增加 BootstrapBlazor 服务
@@ -16,7 +16,7 @@ public static class TableExcelExportServiceCollectionExtensions
     /// 
     public static IServiceCollection AddBootstrapBlazorTableExcelExport(this IServiceCollection services)
     {
-        services.AddTransient();
+        services.AddTransient();
         return services;
     }
 }

From fd6702c2bf3e7ed55fd184c18e58e575af3ce60a Mon Sep 17 00:00:00 2001
From: Argo-AscioTech 
Date: Mon, 11 Dec 2023 10:08:28 +0800
Subject: [PATCH 06/35] =?UTF-8?q?feat:=20=E5=90=88=E5=B9=B6=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/DefaultPdfExport.cs              | 21 ---------
 ...ltExcelExport.cs => DefaultTableExport.cs} | 11 ++++-
 .../Services/ITableExcelExport.cs             |  1 +
 src/BootstrapBlazor/Services/ITableExport.cs  | 43 +++++++++++++++++++
 .../Services/ITablePdfExport.cs               |  1 +
 5 files changed, 55 insertions(+), 22 deletions(-)
 delete mode 100644 src/BootstrapBlazor/Services/DefaultPdfExport.cs
 rename src/BootstrapBlazor/Services/{DefaultExcelExport.cs => DefaultTableExport.cs} (81%)
 create mode 100644 src/BootstrapBlazor/Services/ITableExport.cs

diff --git a/src/BootstrapBlazor/Services/DefaultPdfExport.cs b/src/BootstrapBlazor/Services/DefaultPdfExport.cs
deleted file mode 100644
index 2356d3f64b6..00000000000
--- a/src/BootstrapBlazor/Services/DefaultPdfExport.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) Argo Zhang (argo@163.com). All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-// Website: https://www.blazor.zone or https://argozhang.github.io/
-
-namespace BootstrapBlazor.Components;
-
-class DefaultPdfExport : ITablePdfExport
-{
-    /// 
-    /// 
-    /// 
-    /// 
-    /// 
-    /// 
-    /// 
-    /// 
-    public Task ExportAsync(IEnumerable items, IEnumerable? cols = null, string? fileName = null) where TItem : class
-    {
-        return Task.FromResult(false);
-    }
-}
diff --git a/src/BootstrapBlazor/Services/DefaultExcelExport.cs b/src/BootstrapBlazor/Services/DefaultTableExport.cs
similarity index 81%
rename from src/BootstrapBlazor/Services/DefaultExcelExport.cs
rename to src/BootstrapBlazor/Services/DefaultTableExport.cs
index 0b35917ca83..9a1626eaa3f 100644
--- a/src/BootstrapBlazor/Services/DefaultExcelExport.cs
+++ b/src/BootstrapBlazor/Services/DefaultTableExport.cs
@@ -4,7 +4,7 @@
 
 namespace BootstrapBlazor.Components;
 
-class DefaultExcelExport : ITableExcelExport
+class DefaultTableExport : ITableExport
 {
     /// 
     /// 
@@ -15,6 +15,15 @@ public Task ExportAsync(IEnumerable items, IEnumerable
+    /// 
+    /// 
+    /// 
+    public Task ExportExcelAsync(IEnumerable items, IEnumerable? cols = null, string? fileName = null)
+    {
+        return Task.FromResult(false);
+    }
+
     /// 
     /// 
     /// 
diff --git a/src/BootstrapBlazor/Services/ITableExcelExport.cs b/src/BootstrapBlazor/Services/ITableExcelExport.cs
index 14e386754d3..bbe5e14be4e 100644
--- a/src/BootstrapBlazor/Services/ITableExcelExport.cs
+++ b/src/BootstrapBlazor/Services/ITableExcelExport.cs
@@ -7,6 +7,7 @@ namespace BootstrapBlazor.Components;
 /// 
 /// Table 组件 Excel 导出接口
 /// 
+[Obsolete("已过期，请使用 ITableExport 代替 Please use ITableExport instead")]
 public interface ITableExcelExport
 {
     /// 
diff --git a/src/BootstrapBlazor/Services/ITableExport.cs b/src/BootstrapBlazor/Services/ITableExport.cs
new file mode 100644
index 00000000000..71a0ca4116f
--- /dev/null
+++ b/src/BootstrapBlazor/Services/ITableExport.cs
@@ -0,0 +1,43 @@
+// Copyright (c) Argo Zhang (argo@163.com). All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+// Website: https://www.blazor.zone or https://argozhang.github.io/
+
+namespace BootstrapBlazor.Components;
+
+/// 
+/// Table 组件 Excel 导出接口
+/// 
+public interface ITableExport
+{
+    /// 
+    /// 导出 方法
+    /// 
+    /// 导出数据集合
+    /// 当前可见列数据集合 默认 null 导出全部列
+    /// 文件名 默认 null ExportData_{DateTime.Now:yyyyMMddHHmmss}.xlsx
+    Task ExportAsync(IEnumerable items, IEnumerable? cols, string? fileName = null);
+
+    /// 
+    /// 导出 Excel 方法
+    /// 
+    /// 导出数据集合
+    /// 当前可见列数据集合 默认 null 导出全部列
+    /// 文件名 默认 null ExportData_{DateTime.Now:yyyyMMddHHmmss}.xlsx
+    Task ExportExcelAsync(IEnumerable items, IEnumerable? cols, string? fileName = null);
+
+    /// 
+    /// 导出 Csv 方法
+    /// 
+    /// 导出数据集合
+    /// 当前可见列数据集合 默认 null 导出全部列
+    /// 文件名 默认 null ExportData_{DateTime.Now:yyyyMMddHHmmss}.xlsx
+    Task ExportCsvAsync(IEnumerable items, IEnumerable? cols, string? fileName = null);
+
+    /// 
+    /// 导出 Pdf 方法
+    /// 
+    /// 导出数据集合
+    /// 当前可见列数据集合 默认 null 导出全部列
+    /// 文件名 默认 null ExportData_{DateTime.Now:yyyyMMddHHmmss}.xlsx
+    Task ExportPdfAsync(IEnumerable items, IEnumerable? cols, string? fileName = null);
+}
diff --git a/src/BootstrapBlazor/Services/ITablePdfExport.cs b/src/BootstrapBlazor/Services/ITablePdfExport.cs
index 47635f04b7f..342b52c9e59 100644
--- a/src/BootstrapBlazor/Services/ITablePdfExport.cs
+++ b/src/BootstrapBlazor/Services/ITablePdfExport.cs
@@ -7,6 +7,7 @@ namespace BootstrapBlazor.Components;
 /// 
 /// Table 组件 Pdf 导出接口
 /// 
+[Obsolete("已过期，统一使用 ITableExport 接口")]
 public interface ITablePdfExport
 {
     /// 

From 701ade93abdd8df1ddd85bcf6a1c1279379aa095 Mon Sep 17 00:00:00 2001
From: Argo-AscioTech 
Date: Mon, 11 Dec 2023 10:08:40 +0800
Subject: [PATCH 07/35] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=20IHtml2Pdf=20?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BootstrapBlazor/Services/IHtml2Pdf.cs | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 src/BootstrapBlazor/Services/IHtml2Pdf.cs

diff --git a/src/BootstrapBlazor/Services/IHtml2Pdf.cs b/src/BootstrapBlazor/Services/IHtml2Pdf.cs
new file mode 100644
index 00000000000..da00361bfb8
--- /dev/null
+++ b/src/BootstrapBlazor/Services/IHtml2Pdf.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Argo Zhang (argo@163.com). All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+// Website: https://www.blazor.zone or https://argozhang.github.io/
+
+namespace BootstrapBlazor.Components;
+
+/// 
+/// Html export PDF service
+/// 
+public interface IHtml2Pdf
+{
+    /// 
+    /// Export method
+    /// 
+    /// url
+    Task PdfDataAsync(string url);
+}

From 72beb0086696012fd9ea15414251c29882c6deb2 Mon Sep 17 00:00:00 2001
From: Argo-AscioTech 
Date: Mon, 11 Dec 2023 10:09:34 +0800
Subject: [PATCH 08/35] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=20Csv=20?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs | 6 ++++++
 src/BootstrapBlazor/Components/Table/Table.razor.cs         | 5 +++--
 src/BootstrapBlazor/Options/IconThemeOptions.cs             | 5 +++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs b/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs
index ec4410916b3..d1f8bef058d 100644
--- a/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs
+++ b/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs
@@ -75,6 +75,12 @@ public partial class Table
     [Parameter]
     public string? ExportButtonIcon { get; set; }
 
+    /// 
+    /// 获得/设置 内置导出 Csv 按钮图标
+    /// 
+    [Parameter]
+    public string? CsvExportIcon { get; set; }
+
     /// 
     /// 获得/设置 内置导出 Excel 按钮图标
     /// 
diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.cs b/src/BootstrapBlazor/Components/Table/Table.razor.cs
index a152b971d6f..df8eef83856 100644
--- a/src/BootstrapBlazor/Components/Table/Table.razor.cs
+++ b/src/BootstrapBlazor/Components/Table/Table.razor.cs
@@ -695,8 +695,9 @@ private void OnInitParameters()
         RefreshButtonIcon ??= IconTheme.GetIconByKey(ComponentIcons.TableRefreshButtonIcon);
         CardViewButtonIcon ??= IconTheme.GetIconByKey(ComponentIcons.TableCardViewButtonIcon);
         ColumnListButtonIcon ??= IconTheme.GetIconByKey(ComponentIcons.TableColumnListButtonIcon);
-        ExcelExportIcon ??= IconTheme.GetIconByKey(ComponentIcons.TableExcelExportIcon);
-        PdfExportIcon ??= IconTheme.GetIconByKey(ComponentIcons.TablePdfExportIcon);
+        CsvExportIcon ??= IconTheme.GetIconByKey(ComponentIcons.TableExportCsvIcon);
+        ExcelExportIcon ??= IconTheme.GetIconByKey(ComponentIcons.TableExportExcelIcon);
+        PdfExportIcon ??= IconTheme.GetIconByKey(ComponentIcons.TableExportPdfIcon);
         SearchButtonIcon ??= IconTheme.GetIconByKey(ComponentIcons.TableSearchButtonIcon);
         ResetSearchButtonIcon ??= IconTheme.GetIconByKey(ComponentIcons.TableResetSearchButtonIcon);
         CloseButtonIcon ??= IconTheme.GetIconByKey(ComponentIcons.TableCloseButtonIcon);
diff --git a/src/BootstrapBlazor/Options/IconThemeOptions.cs b/src/BootstrapBlazor/Options/IconThemeOptions.cs
index 914b3dedbc2..9995a7f1f05 100644
--- a/src/BootstrapBlazor/Options/IconThemeOptions.cs
+++ b/src/BootstrapBlazor/Options/IconThemeOptions.cs
@@ -165,8 +165,9 @@ public IconThemeOptions()
         { ComponentIcons.TableRefreshButtonIcon, "fa-solid fa-arrows-rotate" },
         { ComponentIcons.TableCardViewButtonIcon, "fa-solid fa-bars" },
         { ComponentIcons.TableColumnListButtonIcon, "fa-solid fa-table-list" },
-        { ComponentIcons.TableExcelExportIcon, "fa-regular fa-file-excel" },
-        { ComponentIcons.TablePdfExportIcon, "fa-regular fa-file-pdf" },
+        { ComponentIcons.TableExportCsvIcon, "fa-regular fa-file-csv" },
+        { ComponentIcons.TableExportExcelIcon, "fa-regular fa-file-excel" },
+        { ComponentIcons.TableExportPdfIcon, "fa-regular fa-file-pdf" },
         { ComponentIcons.TableSearchButtonIcon, "fa-solid fa-magnifying-glass" },
         { ComponentIcons.TableResetSearchButtonIcon, "fa-regular fa-trash-can" },
         { ComponentIcons.TableCloseButtonIcon, "fa-solid fa-xmark" },

From e7c7225cf282239f1cf67bba3aed267a2d06a663 Mon Sep 17 00:00:00 2001
From: Argo-AscioTech 
Date: Mon, 11 Dec 2023 10:10:02 +0800
Subject: [PATCH 09/35] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=20ExportCsvDro?=
 =?UTF-8?q?pdownItemText=20=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/Table/Table.razor.Localization.cs            | 1 +
 src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.Localization.cs b/src/BootstrapBlazor/Components/Table/Table.razor.Localization.cs
index ae29d4cdf5f..80da61e7b5d 100644
--- a/src/BootstrapBlazor/Components/Table/Table.razor.Localization.cs
+++ b/src/BootstrapBlazor/Components/Table/Table.razor.Localization.cs
@@ -414,6 +414,7 @@ private void OnInitLocalization()
         ExportToastTitle ??= Localizer[nameof(ExportToastTitle)];
         ExportToastContent ??= Localizer[nameof(ExportToastContent)];
         ExportToastInProgressContent ??= Localizer[nameof(ExportToastInProgressContent)];
+        ExportCsvDropdownItemText ??= Localizer[nameof(ExportCsvDropdownItemText)];
         ExportExcelDropdownItemText ??= Localizer[nameof(ExportExcelDropdownItemText)];
         ExportPdfDropdownItemText ??= Localizer[nameof(ExportPdfDropdownItemText)];
         CopyColumnTooltipText ??= Localizer[nameof(CopyColumnTooltipText)];
diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs b/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs
index d1f8bef058d..f4ada377437 100644
--- a/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs
+++ b/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs
@@ -123,6 +123,12 @@ public partial class Table
     [Parameter]
     public RenderFragment>? ExportButtonDropdownTemplate { get; set; }
 
+    /// 
+    /// 获得/设置 内置导出微软 Csv 按钮文本 默认 null 读取资源文件
+    /// 
+    [Parameter]
+    public string? ExportCsvDropdownItemText { get; set; }
+
     /// 
     /// 获得/设置 内置导出微软 Excel 按钮文本 默认 null 读取资源文件
     /// 

From bc345bc5a08ccb17d724423f200a103337187f9d Mon Sep 17 00:00:00 2001
From: Argo-AscioTech 
Date: Mon, 11 Dec 2023 10:10:41 +0800
Subject: [PATCH 10/35] =?UTF-8?q?feat:=20=E5=86=85=E7=BD=AE=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=20Csv=20=E6=8C=89=E9=92=AE=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BootstrapBlazor/Components/Table/Table.razor           | 7 +++++++
 .../Components/Table/Table.razor.Toolbar.cs                | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/src/BootstrapBlazor/Components/Table/Table.razor b/src/BootstrapBlazor/Components/Table/Table.razor
index fbeaaf06758..0dc0278e39a 100644
--- a/src/BootstrapBlazor/Components/Table/Table.razor
+++ b/src/BootstrapBlazor/Components/Table/Table.razor
@@ -125,6 +125,13 @@
                                 }
                                 else
                                 {
+                                    if (ShowExportCsvButton)
+                                    {
+                                        

+                                            
+                                            @ExportCsvDropdownItemText
+                                        

+                                    }
                                     if (ShowExportExcelButton)
                                     {
                                         

diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs b/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs
index f4ada377437..761a2004fcd 100644
--- a/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs
+++ b/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs
@@ -63,6 +63,12 @@ public partial class Table
     [Parameter]
     public bool ShowExportExcelButton { get; set; } = true;
 
+    /// 
+    /// 获得/设置 是否显示 Csv 导出按钮 默认为 false 显示
+    /// 
+    [Parameter]
+    public bool ShowExportCsvButton { get; set; }
+
     /// 
     /// 获得/设置 是否显示 Pdf 导出按钮 默认为 false 显示
     /// 

From 67b0f8e27f52f7d54067f471413e32fb290e32ce Mon Sep 17 00:00:00 2001
From: Argo-AscioTech 
Date: Mon, 11 Dec 2023 10:11:26 +0800
Subject: [PATCH 11/35] =?UTF-8?q?feat:=20=E7=A7=BB=E9=99=A4=20Pdf/Excel=20?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=BB=9F=E4=B8=80=E4=BD=BF=E7=94=A8=20TableE?=
 =?UTF-8?q?xport=20=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/Table/Table.razor.Toolbar.cs      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs b/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs
index 761a2004fcd..328be255d42 100644
--- a/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs
+++ b/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs
@@ -392,11 +392,7 @@ public Func? ShowDeleteButtonCallback
 
     [Inject]
     [NotNull]
-    private ITableExcelExport? ExcelExport { get; set; }
-
-    [Inject]
-    [NotNull]
-    private ITablePdfExport? PdfExport { get; set; }
+    private ITableExport? TableExport { get; set; }
 
     /// 
     /// 获得/设置 各列是否显示状态集合
@@ -1039,15 +1035,19 @@ private async Task ExecuteExportAsync(Func> callback)
 
     private Task ExportAsync() => ExecuteExportAsync(() => OnExportAsync != null
         ? OnExportAsync(new TableExportDataContext(TableExportType.Unknown, Rows, GetVisibleColumns(), BuildQueryPageOptions()))
-        : ExcelExport.ExportAsync(Rows, GetVisibleColumns()));
+        : TableExport.ExportAsync(Rows, GetVisibleColumns()));
+
+    private Task ExportCsvAsync() => ExecuteExportAsync(() => OnExportAsync != null
+        ? OnExportAsync(new TableExportDataContext(TableExportType.Pdf, Rows, GetVisibleColumns(), BuildQueryPageOptions()))
+        : TableExport.ExportCsvAsync(Rows, GetVisibleColumns()));
 
     private Task ExportPdfAsync() => ExecuteExportAsync(() => OnExportAsync != null
         ? OnExportAsync(new TableExportDataContext(TableExportType.Pdf, Rows, GetVisibleColumns(), BuildQueryPageOptions()))
-        : PdfExport.ExportAsync(Rows, GetVisibleColumns()));
+        : TableExport.ExportPdfAsync(Rows, GetVisibleColumns()));
 
     private Task ExportExcelAsync() => ExecuteExportAsync(() => OnExportAsync != null
         ? OnExportAsync(new TableExportDataContext(TableExportType.Excel, Rows, GetVisibleColumns(), BuildQueryPageOptions()))
-        : ExcelExport.ExportAsync(Rows, GetVisibleColumns()));
+        : TableExport.ExportExcelAsync(Rows, GetVisibleColumns()));
 
     /// 
     /// 获取当前 Table 选中的所有行数据

From 9ff6a245949ffe9b55dfbf44b3c971fe3ebecca5 Mon Sep 17 00:00:00 2001
From: Argo-AscioTech 
Date: Mon, 11 Dec 2023 10:11:43 +0800
Subject: [PATCH 12/35] =?UTF-8?q?refator:=20=E8=B0=83=E6=95=B4=E6=B3=A8?=
 =?UTF-8?q?=E5=85=A5=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Extensions/BootstrapBlazorServiceCollectionExtensions.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/BootstrapBlazor/Extensions/BootstrapBlazorServiceCollectionExtensions.cs b/src/BootstrapBlazor/Extensions/BootstrapBlazorServiceCollectionExtensions.cs
index 983b5c8c9c0..ae629d04428 100644
--- a/src/BootstrapBlazor/Extensions/BootstrapBlazorServiceCollectionExtensions.cs
+++ b/src/BootstrapBlazor/Extensions/BootstrapBlazorServiceCollectionExtensions.cs
@@ -37,9 +37,6 @@ public static IServiceCollection AddBootstrapBlazor(this IServiceCollection serv
         services.TryAddSingleton();
         services.TryAddSingleton(typeof(IDispatchService<>), typeof(DefaultDispatchService<>));
 
-        services.TryAddTransient();
-        services.TryAddTransient();
-
         services.TryAddScoped(typeof(IDataService<>), typeof(NullDataService<>));
         services.TryAddScoped();
         services.TryAddScoped();
@@ -63,6 +60,8 @@ public static IServiceCollection AddBootstrapBlazor(this IServiceCollection serv
         services.AddScoped();
         services.AddScoped();
 
+        services.TryAddTransient();
+
         services.ConfigureBootstrapBlazorOption(configureOptions);
         services.ConfigureIPLocatorOption();
 

From 372294429dd4e07dea903ea0778dd738f06c9a5c Mon Sep 17 00:00:00 2001
From: Argo-AscioTech 
Date: Mon, 11 Dec 2023 10:11:59 +0800
Subject: [PATCH 13/35] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=94=B9=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=E5=8F=82=E6=95=B0=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BootstrapBlazor/Enums/ComponentIcons.cs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/BootstrapBlazor/Enums/ComponentIcons.cs b/src/BootstrapBlazor/Enums/ComponentIcons.cs
index 61b74192978..dd22c583ec4 100644
--- a/src/BootstrapBlazor/Enums/ComponentIcons.cs
+++ b/src/BootstrapBlazor/Enums/ComponentIcons.cs
@@ -555,14 +555,19 @@ public enum ComponentIcons
     TableColumnListButtonIcon,
 
     /// 
-    /// Table 组件 ExcelExportIcon 属性图标
+    /// Table 组件 ExportExcelIcon 属性图标
     /// 
-    TableExcelExportIcon,
+    TableExportExcelIcon,
 
     /// 
-    /// Table 组件 PdfExportIcon 属性图标
+    /// Table 组件 ExportCsvIcon 属性图标
     /// 
-    TablePdfExportIcon,
+    TableExportCsvIcon,
+
+    /// 
+    /// Table 组件 ExportPdfIcon 属性图标
+    /// 
+    TableExportPdfIcon,
 
     /// 
     /// Table 组件 SearchButtonIcon 属性图标

From 701ef78fa80625994a6d5b044a79395da1ab8e33 Mon Sep 17 00:00:00 2001
From: Argo-AscioTech 
Date: Mon, 11 Dec 2023 11:07:16 +0800
Subject: [PATCH 14/35] =?UTF-8?q?refactor:=20=E5=A2=9E=E5=8A=A0=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BootstrapBlazor/Options/IconThemeOptions.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/BootstrapBlazor/Options/IconThemeOptions.cs b/src/BootstrapBlazor/Options/IconThemeOptions.cs
index 9995a7f1f05..39fba748566 100644
--- a/src/BootstrapBlazor/Options/IconThemeOptions.cs
+++ b/src/BootstrapBlazor/Options/IconThemeOptions.cs
@@ -165,9 +165,9 @@ public IconThemeOptions()
         { ComponentIcons.TableRefreshButtonIcon, "fa-solid fa-arrows-rotate" },
         { ComponentIcons.TableCardViewButtonIcon, "fa-solid fa-bars" },
         { ComponentIcons.TableColumnListButtonIcon, "fa-solid fa-table-list" },
-        { ComponentIcons.TableExportCsvIcon, "fa-regular fa-file-csv" },
-        { ComponentIcons.TableExportExcelIcon, "fa-regular fa-file-excel" },
-        { ComponentIcons.TableExportPdfIcon, "fa-regular fa-file-pdf" },
+        { ComponentIcons.TableExportCsvIcon, "fa-solid fa-fw fa-file-csv" },
+        { ComponentIcons.TableExportExcelIcon, "fa-solid fa-fw fa-file-excel" },
+        { ComponentIcons.TableExportPdfIcon, "fa-solid fa-fw fa-file-pdf" },
         { ComponentIcons.TableSearchButtonIcon, "fa-solid fa-magnifying-glass" },
         { ComponentIcons.TableResetSearchButtonIcon, "fa-regular fa-trash-can" },
         { ComponentIcons.TableCloseButtonIcon, "fa-solid fa-xmark" },

From 075abf8884ee56678c89ef7db2dd6bbbd03e0d99 Mon Sep 17 00:00:00 2001
From: Argo-AscioTech 
Date: Mon, 11 Dec 2023 11:07:26 +0800
Subject: [PATCH 15/35] =?UTF-8?q?refactor:=20=E7=B2=BE=E7=AE=80=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/DefaultIconTheme.cs              | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/BootstrapBlazor/Services/DefaultIconTheme.cs b/src/BootstrapBlazor/Services/DefaultIconTheme.cs
index b1ee1c04245..883e69dacb3 100644
--- a/src/BootstrapBlazor/Services/DefaultIconTheme.cs
+++ b/src/BootstrapBlazor/Services/DefaultIconTheme.cs
@@ -4,18 +4,13 @@
 
 namespace BootstrapBlazor.Components;
 
-internal class DefaultIconTheme : IIconTheme
+/// 
+/// 
+/// 
+/// 
+internal class DefaultIconTheme(IOptions options) : IIconTheme
 {
-    private IOptions Options { get; set; }
-
-    /// 
-    /// 
-    /// 
-    /// 
-    public DefaultIconTheme(IOptions options)
-    {
-        Options = options;
-    }
+    private IOptions Options { get; set; } = options;
 
     /// 
     /// 
@@ -25,7 +20,7 @@ public Dictionary GetIcons()
     {
         if (!Options.Value.Icons.TryGetValue(Options.Value.ThemeKey, out var icons))
         {
-            icons = new Dictionary();
+            icons = [];
         }
         return icons;
     }

From f6f632f248ef8dd6a7332d5b2c122de474b9c552 Mon Sep 17 00:00:00 2001
From: Argo-AscioTech 
Date: Mon, 11 Dec 2023 11:07:47 +0800
Subject: [PATCH 16/35] =?UTF-8?q?doc:=20=E6=9B=B4=E6=96=B0=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E6=8C=89=E9=92=AE=E7=A4=BA=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Samples/Table/TablesExport.razor           | 18 ++++++++++++++++++
 .../Samples/Table/TablesExport.razor.cs        | 10 +++++-----
 src/BootstrapBlazor.Server/Locales/en.json     |  2 ++
 src/BootstrapBlazor.Server/Locales/zh.json     |  2 ++
 4 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/BootstrapBlazor.Server/Components/Samples/Table/TablesExport.razor b/src/BootstrapBlazor.Server/Components/Samples/Table/TablesExport.razor
index 2e72065d6bc..2acd3c4ae2a 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/Table/TablesExport.razor
+++ b/src/BootstrapBlazor.Server/Components/Samples/Table/TablesExport.razor
@@ -38,6 +38,24 @@
     
 
 
+
+    
+        
+            
+            
+            
+            
+        
+    

+
+
 
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Table/TablesExport.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/Table/TablesExport.razor.cs
index 8ac6bf28926..e270f726789 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/Table/TablesExport.razor.cs
+++ b/src/BootstrapBlazor.Server/Components/Samples/Table/TablesExport.razor.cs
@@ -53,7 +53,7 @@ private async Task OnExportAsync(ITableExportDataContext context)
         // 自定义导出方法
         // 通过 context 参数可以自己查询数据进行导出操作
         // 本例使用 context 传递来的 Rows/Columns 自定义文件名为 Test.xlsx
-        var ret = await Exporter.ExportAsync(context.Rows, context.Columns, "Test.xlsx");
+        var ret = await TableExport.ExportExcelAsync(context.Rows, context.Columns, "Test.xlsx");
 
         // 返回 true 时自动弹出提示框
         return ret;
@@ -61,7 +61,7 @@ private async Task OnExportAsync(ITableExportDataContext context)
 
     [Inject]
     [NotNull]
-    private ITableExcelExport? Exporter { get; set; }
+    private ITableExport? TableExport { get; set; }
 
     [Inject]
     [NotNull]
@@ -124,7 +124,7 @@ private async Task ExcelExportAsync(ITableExportContext context)
         // 自定义导出模板导出当前页面数据为 Excel 方法
         // 使用 BootstrapBlazor 内置服务 ITableExcelExport 实例方法 ExportAsync 进行导出操作
         // 导出数据使用 context 传递来的 Rows/Columns 即为当前页数据
-        var ret = await Exporter.ExportAsync(context.Rows, context.Columns, $"Test_{DateTime.Now:yyyyMMddHHmmss}.xlsx");
+        var ret = await TableExport.ExportExcelAsync(context.Rows, context.Columns, $"Test_{DateTime.Now:yyyyMMddHHmmss}.xlsx");
 
         // 返回 true 时自动弹出提示框
         await ShowToast(ret);
@@ -145,7 +145,7 @@ private async Task ExcelExportAllAsync(ITableExportContext context)
         var data = Items.Where(filter.GetFilterFunc());
 
         // 导出符合条件的所有数据 data
-        var ret = await Exporter.ExportAsync(data, context.Columns, $"Test_{DateTime.Now:yyyyMMddHHmmss}.xlsx");
+        var ret = await TableExport.ExportExcelAsync(data, context.Columns, $"Test_{DateTime.Now:yyyyMMddHHmmss}.xlsx");
 
         // 返回 true 时自动弹出提示框
         await ShowToast(ret);
@@ -156,7 +156,7 @@ private async Task CsvExportAsync(ITableExportContext context)
         // 自定义导出模板导出当前页面数据为 Csv 方法
         // 使用 BootstrapBlazor 内置服务 ITableExcelExport 实例方法 ExportCsvAsync 进行导出操作
         // 导出数据使用 context 传递来的 Rows/Columns 即为当前页数据
-        var ret = await Exporter.ExportCsvAsync(context.Rows, context.Columns, $"Test_{DateTime.Now:yyyyMMddHHmmss}.csv");
+        var ret = await TableExport.ExportCsvAsync(context.Rows, context.Columns, $"Test_{DateTime.Now:yyyyMMddHHmmss}.csv");
 
         // 返回 true 时自动弹出提示框
         await ShowToast(ret);
diff --git a/src/BootstrapBlazor.Server/Locales/en.json b/src/BootstrapBlazor.Server/Locales/en.json
index dd302c982f0..725b7707725 100644
--- a/src/BootstrapBlazor.Server/Locales/en.json
+++ b/src/BootstrapBlazor.Server/Locales/en.json
@@ -5136,6 +5136,8 @@
     "TablesExportNote2": "Add Table Excel export service",
     "TablesExportShowExportButtonTitle": "Table export function",
     "TablesExportShowExportButtonIntro": "Whether to display the export button by setting the ShowExportButton property, the default is false",
+    "TablesExportShowExportCsvButtonTitle": "Export Csv/Pdf Button",
+    "TablesExportShowExportCsvButtonIntro": "Show/hide Csv/Pdf button by set ShowExportCsvButton=\"true\" ShowExportPdfButton=\"true\"",
     "TablesExportOnExportAsyncTitle": "Custom export method",
     "TablesExportOnExportAsyncIntro": "You can customize the export method by setting the OnExportAsync callback delegate method. If you don't set it, the built-in export function of the component will be used.",
     "TablesExportButtonDropdownTemplateTitle": "Custom export dropdown button",
diff --git a/src/BootstrapBlazor.Server/Locales/zh.json b/src/BootstrapBlazor.Server/Locales/zh.json
index 6e88057c773..34d5a31fba9 100644
--- a/src/BootstrapBlazor.Server/Locales/zh.json
+++ b/src/BootstrapBlazor.Server/Locales/zh.json
@@ -5136,6 +5136,8 @@
     "TablesExportNote2": "增加 Table Excel 导出服务",
     "TablesExportShowExportButtonTitle": "表格导出功能",
     "TablesExportShowExportButtonIntro": "通过设置 ShowExportButton=\"true\" 属性是否显示导出按钮，默认为false",
+    "TablesExportShowExportCsvButtonTitle": "导出 Csv/Pdf",
+    "TablesExportShowExportCsvButtonIntro": "通过设置 ShowExportCsvButton=\"true\" ShowExportPdfButton=\"true\" 控制 Csv/Pdf 导出按钮",
     "TablesExportOnExportAsyncTitle": "自定义导出方法",
     "TablesExportOnExportAsyncIntro": "通过设置 OnExportAsync 回调委托方法可自定义导出方法，不设置将使用组件内置导出函数",
     "TablesExportButtonDropdownTemplateTitle": "自定义导出下拉框按钮",

From f7f913a45eb1fbaad065bfcf8f29d1ba0ee078c4 Mon Sep 17 00:00:00 2001
From: Argo-AscioTech 
Date: Mon, 11 Dec 2023 11:08:03 +0800
Subject: [PATCH 17/35] =?UTF-8?q?doc:=20=E9=87=8D=E6=9E=84=20Html2Pdf=20?=
 =?UTF-8?q?=E7=A4=BA=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/Samples/Html2Pdfs.razor.cs                   | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/BootstrapBlazor.Server/Components/Samples/Html2Pdfs.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/Html2Pdfs.razor.cs
index 710ba2c9382..68020d96e78 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/Html2Pdfs.razor.cs
+++ b/src/BootstrapBlazor.Server/Components/Samples/Html2Pdfs.razor.cs
@@ -19,10 +19,6 @@ public partial class Html2Pdfs
     [NotNull]
     private DownloadService? DownloadService { get; set; }
 
-    [Inject]
-    [NotNull]
-    private IComponentHtmlRenderer? HtmlRenderService { get; set; }
-
     [Inject]
     [NotNull]
     private IWebHostEnvironment? WebHostEnvironment { get; set; }
@@ -63,7 +59,7 @@ private async Task OnExportAsync()
 
         // 拼接导出文件网址
         var url = $"{NavigationManager.BaseUri}{fileName}";
-        var data = await PdfService.ExportDataAsync(url);
+        var data = await PdfService.PdfDataAsync(url);
         using var stream = new MemoryStream(data);
         await DownloadService.DownloadFromStreamAsync("table.pdf", stream);
         await ToastService.Success("Pdf Export", "Export pdf element success.");

From 67a94804fd63d262f18f4c36ef979920676472a0 Mon Sep 17 00:00:00 2001
From: Argo-AscioTech 
Date: Mon, 11 Dec 2023 13:09:23 +0800
Subject: [PATCH 18/35] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=20ITableExport?=
 =?UTF-8?q?Pdf=20=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...tstrapBlazorServiceCollectionExtensions.cs |  1 +
 .../Services/DefaultTableExportPdf.cs         | 24 +++++++++++++++++++
 .../Services/ITableExportPdf.cs               | 23 ++++++++++++++++++
 3 files changed, 48 insertions(+)
 create mode 100644 src/BootstrapBlazor/Services/DefaultTableExportPdf.cs
 create mode 100644 src/BootstrapBlazor/Services/ITableExportPdf.cs

diff --git a/src/BootstrapBlazor/Extensions/BootstrapBlazorServiceCollectionExtensions.cs b/src/BootstrapBlazor/Extensions/BootstrapBlazorServiceCollectionExtensions.cs
index ae629d04428..9784b9a7d73 100644
--- a/src/BootstrapBlazor/Extensions/BootstrapBlazorServiceCollectionExtensions.cs
+++ b/src/BootstrapBlazor/Extensions/BootstrapBlazorServiceCollectionExtensions.cs
@@ -61,6 +61,7 @@ public static IServiceCollection AddBootstrapBlazor(this IServiceCollection serv
         services.AddScoped();
 
         services.TryAddTransient();
+        services.TryAddTransient();
 
         services.ConfigureBootstrapBlazorOption(configureOptions);
         services.ConfigureIPLocatorOption();
diff --git a/src/BootstrapBlazor/Services/DefaultTableExportPdf.cs b/src/BootstrapBlazor/Services/DefaultTableExportPdf.cs
new file mode 100644
index 00000000000..426124f9467
--- /dev/null
+++ b/src/BootstrapBlazor/Services/DefaultTableExportPdf.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Argo Zhang (argo@163.com). All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+// Website: https://www.blazor.zone or https://argozhang.github.io/
+
+namespace BootstrapBlazor.Components;
+
+class DefaultTableExportPdf : ITableExportPdf
+{
+    /// 
+    /// 
+    /// 
+    /// 
+    /// 
+    /// 
+    public Task PdfDataAsync(string content) => Task.FromResult(Array.Empty());
+
+    /// 
+    /// 
+    /// 
+    /// 
+    /// 
+    /// 
+    public Task PdfStreamAsync(string content) => Task.FromResult(Stream.Null);
+}
diff --git a/src/BootstrapBlazor/Services/ITableExportPdf.cs b/src/BootstrapBlazor/Services/ITableExportPdf.cs
new file mode 100644
index 00000000000..5d999fdb302
--- /dev/null
+++ b/src/BootstrapBlazor/Services/ITableExportPdf.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Argo Zhang (argo@163.com). All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+// Website: https://www.blazor.zone or https://argozhang.github.io/
+
+namespace BootstrapBlazor.Components;
+
+/// 
+/// Table 组件 Pdf 导出接口
+/// 
+public interface ITableExportPdf
+{
+    /// 
+    /// 导出 Pdf 数据
+    /// 
+    /// 
+    Task PdfDataAsync(string content);
+
+    /// 
+    /// 导出 Pdf 流
+    /// 
+    /// 
+    Task PdfStreamAsync(string content);
+}

From 925b55bfb9a6bfabbab779ef32c4255e225b63eb Mon Sep 17 00:00:00 2001
From: Argo-AscioTech 
Date: Mon, 11 Dec 2023 13:09:45 +0800
Subject: [PATCH 19/35] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=20PdfSteamAsyn?=
 =?UTF-8?q?c=20=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BootstrapBlazor/Services/IHtml2Pdf.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/BootstrapBlazor/Services/IHtml2Pdf.cs b/src/BootstrapBlazor/Services/IHtml2Pdf.cs
index da00361bfb8..b1f7d8ab450 100644
--- a/src/BootstrapBlazor/Services/IHtml2Pdf.cs
+++ b/src/BootstrapBlazor/Services/IHtml2Pdf.cs
@@ -14,4 +14,10 @@ public interface IHtml2Pdf
     /// 
     /// url
     Task PdfDataAsync(string url);
+
+    /// 
+    /// Export method
+    /// 
+    /// url
+    Task PdfStreamAsync(string url);
 }

From 7b47923ef3fd5c9c77d7cace18a7fa7e78587f59 Mon Sep 17 00:00:00 2001
From: Argo-AscioTech 
Date: Mon, 11 Dec 2023 13:11:02 +0800
Subject: [PATCH 20/35] =?UTF-8?q?doc:=20=E9=87=8D=E6=9E=84=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/Samples/Table/TablesExport.razor.cs       | 1 +
 .../Services/TableDemoDataService.cs                     | 9 ++-------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/BootstrapBlazor.Server/Components/Samples/Table/TablesExport.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/Table/TablesExport.razor.cs
index e270f726789..c9059cbea6d 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/Table/TablesExport.razor.cs
+++ b/src/BootstrapBlazor.Server/Components/Samples/Table/TablesExport.razor.cs
@@ -25,6 +25,7 @@ public partial class TablesExport
     /// 
     [NotNull]
     private List? Items { get; set; }
+
     private static IEnumerable PageItemsSource => new int[] { 4, 10, 20 };
 
     /// 
diff --git a/src/BootstrapBlazor.Server/Services/TableDemoDataService.cs b/src/BootstrapBlazor.Server/Services/TableDemoDataService.cs
index 0e98c829daf..825d41fc7b7 100644
--- a/src/BootstrapBlazor.Server/Services/TableDemoDataService.cs
+++ b/src/BootstrapBlazor.Server/Services/TableDemoDataService.cs
@@ -7,17 +7,12 @@ namespace BootstrapBlazor.Server.Services;
 /// 
 /// 演示网站示例数据注入服务实现类
 /// 
-internal class TableDemoDataService : DataServiceBase where TModel : class, new()
+class TableDemoDataService(IStringLocalizer localizer) : DataServiceBase where TModel : class, new()
 {
     [NotNull]
     private List? Items { get; set; }
 
-    private IStringLocalizer Localizer { get; set; }
-
-    public TableDemoDataService(IStringLocalizer localizer)
-    {
-        Localizer = localizer;
-    }
+    private IStringLocalizer Localizer { get; } = localizer;
 
     /// 
     /// 查询操作方法

From c9b77b898bbfa40bf72990605973dbfd34a514fa Mon Sep 17 00:00:00 2001
From: Argo-AscioTech 
Date: Mon, 11 Dec 2023 13:11:24 +0800
Subject: [PATCH 21/35] =?UTF-8?q?feat:=20=E5=AE=9E=E7=8E=B0=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=20Pdf=20=E5=AF=BC=E5=87=BA=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Extensions/ServicesExtensions.cs          |  1 +
 .../Services/TableExportPdfService.cs         | 46 +++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 src/BootstrapBlazor.Server/Services/TableExportPdfService.cs

diff --git a/src/BootstrapBlazor.Server/Extensions/ServicesExtensions.cs b/src/BootstrapBlazor.Server/Extensions/ServicesExtensions.cs
index 73494c670a3..c41437445ff 100644
--- a/src/BootstrapBlazor.Server/Extensions/ServicesExtensions.cs
+++ b/src/BootstrapBlazor.Server/Extensions/ServicesExtensions.cs
@@ -143,6 +143,7 @@ public static IServiceCollection AddWebSiteServices(this IServiceCollection serv
 
         // 增加 Table Excel 导出服务
         services.AddBootstrapBlazorTableExcelExport();
+        services.AddTransient();
 
         return services;
     }
diff --git a/src/BootstrapBlazor.Server/Services/TableExportPdfService.cs b/src/BootstrapBlazor.Server/Services/TableExportPdfService.cs
new file mode 100644
index 00000000000..4f243d7f2b5
--- /dev/null
+++ b/src/BootstrapBlazor.Server/Services/TableExportPdfService.cs
@@ -0,0 +1,46 @@
+// Copyright (c) Argo Zhang (argo@163.com). All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+// Website: https://www.blazor.zone or https://argozhang.github.io/
+
+namespace BootstrapBlazor.Server.Services;
+
+class TableExportPdfService(IWebHostEnvironment webHostEnvironment, NavigationManager navigationManager, IHtml2Pdf html2Pdf) : ITableExportPdf
+{
+    private readonly IWebHostEnvironment _webHostEnvironment = webHostEnvironment;
+    private readonly NavigationManager _navigationManager = navigationManager;
+    private readonly IHtml2Pdf _html2Pdf = html2Pdf;
+
+    public async Task PdfDataAsync(string content)
+    {
+        var url = await GenerateHtmlAsync(content);
+
+        // 生成 Pdf
+        return await _html2Pdf.PdfDataAsync(url);
+    }
+
+    public async Task PdfStreamAsync(string content)
+    {
+        var url = await GenerateHtmlAsync(content);
+
+        // 生成 Pdf
+        return await _html2Pdf.PdfStreamAsync(url);
+    }
+
+    private async Task GenerateHtmlAsync(string content)
+    {
+        // 通过 template 模板文件生成网页文件
+        var templateFileName = Path.Combine(_webHostEnvironment.WebRootPath, "pdf/template.htm");
+        var template = await File.ReadAllTextAsync(templateFileName);
+
+        // 生成静态 html 文件
+        var htmlFileName = $"pdf/{Guid.NewGuid()}.html";
+        var filePath = Path.Combine(_webHostEnvironment.WebRootPath, htmlFileName);
+        using var writer = File.CreateText(filePath);
+        await writer.WriteLineAsync(string.Format(template, content));
+        await writer.FlushAsync();
+        writer.Close();
+
+        // 拼接导出文件网址
+        return $"{_navigationManager.BaseUri}{htmlFileName}";
+    }
+}

From ffd00c1148f54e648f773b7c8a0c23f84c1f1f91 Mon Sep 17 00:00:00 2001
From: Argo-AscioTech 
Date: Mon, 11 Dec 2023 13:12:29 +0800
Subject: [PATCH 22/35] =?UTF-8?q?refactor:=20=E5=A2=9E=E5=8A=A0=20PdfStrea?=
 =?UTF-8?q?mAsync=20=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/DefaultPdfService.cs                | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/Extensions/Components/BootstrapBlazor.Html2Pdf/Services/DefaultPdfService.cs b/src/Extensions/Components/BootstrapBlazor.Html2Pdf/Services/DefaultPdfService.cs
index 9f7c731e10a..ee0f9b7c2ee 100644
--- a/src/Extensions/Components/BootstrapBlazor.Html2Pdf/Services/DefaultPdfService.cs
+++ b/src/Extensions/Components/BootstrapBlazor.Html2Pdf/Services/DefaultPdfService.cs
@@ -26,4 +26,20 @@ public async Task PdfDataAsync(string url)
         var content = await page.GetContentAsync();
         return await page.PdfDataAsync();
     }
+
+    /// 
+    /// 
+    /// 
+    public async Task PdfStreamAsync(string url)
+    {
+        using var browserFetcher = new BrowserFetcher();
+        await browserFetcher.DownloadAsync();
+
+        await using var browser = await Puppeteer.LaunchAsync(new LaunchOptions() { Headless = true });
+        await using var page = await browser.NewPageAsync();
+        await page.GoToAsync(url);
+
+        var content = await page.GetContentAsync();
+        return await page.PdfStreamAsync();
+    }
 }

From e347a09ef6da8153dd88ec3ed16d0b6dee4a5641 Mon Sep 17 00:00:00 2001
From: Argo-AscioTech 
Date: Mon, 11 Dec 2023 13:12:59 +0800
Subject: [PATCH 23/35] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=20ExportPdfAsy?=
 =?UTF-8?q?nc=20=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DefaultTableExport.cs                     | 99 ++++++++++++++-----
 1 file changed, 74 insertions(+), 25 deletions(-)

diff --git a/src/Extensions/Components/BootstrapBlazor.TableExport/DefaultTableExport.cs b/src/Extensions/Components/BootstrapBlazor.TableExport/DefaultTableExport.cs
index 205de9a47dc..48d3123dfdc 100644
--- a/src/Extensions/Components/BootstrapBlazor.TableExport/DefaultTableExport.cs
+++ b/src/Extensions/Components/BootstrapBlazor.TableExport/DefaultTableExport.cs
@@ -3,26 +3,19 @@
 // Website: https://www.blazor.zone or https://argozhang.github.io/
 
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 using MiniExcelLibs;
+using System.Text;
 
 namespace BootstrapBlazor.Components;
 
-class DefaultTableExport : ITableExport
+/// 
+/// 构造函数
+/// 
+/// 
+class DefaultTableExport(IServiceProvider serviceProvider) : ITableExport
 {
-    private IServiceProvider ServiceProvider { get; set; }
-
-    private IHtml2Pdf Html2PdfService { get; set; }
-
-    /// 
-    /// 构造函数
-    /// 
-    /// 
-    /// 
-    public DefaultTableExport(IServiceProvider serviceProvider, IHtml2Pdf html2Pdf)
-    {
-        ServiceProvider = serviceProvider;
-        Html2PdfService = html2Pdf;
-    }
+    private IServiceProvider ServiceProvider { get; set; } = serviceProvider;
 
     /// 
     /// 导出 方法
@@ -52,16 +45,6 @@ public DefaultTableExport(IServiceProvider serviceProvider, IHtml2Pdf html2Pdf)
     /// 
     public Task ExportCsvAsync(IEnumerable items, IEnumerable? cols, string? fileName = null) => InternalExportAsync(items, cols, ExcelType.CSV, fileName);
 
-    /// 
-    /// 
-    /// 
-    /// 
-    /// 
-    /// 
-    /// 
-    /// 
-    public Task ExportPdfAsync(IEnumerable items, IEnumerable? cols, string? fileName = null) => Task.FromResult(false);
-
     private async Task InternalExportAsync(IEnumerable items, IEnumerable? cols, ExcelType excelType, string? fileName = null)
     {
         var value = new List>();
@@ -119,5 +102,71 @@ private async Task InternalExportAsync(IEnumerable items,
         return ret;
     }
 
+    /// 
+    /// 
+    /// 
+    /// 
+    /// 
+    /// 
+    /// 
+    /// 
+    public async Task ExportPdfAsync(IEnumerable items, IEnumerable? cols, string? fileName = null)
+    {
+        var ret = false;
+        var logger = ServiceProvider.GetRequiredService>();
+
+        try
+        {
+            // 生成表格
+            var html = await GenerateTableHtmlAsync(items, cols);
+
+            // 得到 Pdf 文件数据
+            var pdfService = ServiceProvider.GetRequiredService();
+            var stream = await pdfService.PdfStreamAsync(html);
+
+            // 下载 Pdf 文件
+            var downloadService = ServiceProvider.GetRequiredService();
+            fileName ??= $"ExportData_{DateTime.Now:yyyyMMddHHmmss}.pdf";
+            await downloadService.DownloadFromStreamAsync(fileName, stream);
+            ret = true;
+        }
+        catch (Exception ex)
+        {
+            logger.LogError(ex, "ExportPdfAsync execute failed");
+        }
+        return ret;
+    }
+
+    private static async Task GenerateTableHtmlAsync(IEnumerable items, IEnumerable? cols)
+    {
+        var builder = new StringBuilder();
+        cols ??= Utility.GetTableColumns();
+        builder.AppendLine("");
 
+        // 生成表头
+        builder.AppendLine("");
+        foreach (var pi in cols)
+        {
+            builder.AppendLine($"");
+        }
+        builder.AppendLine("");
+
+        builder.AppendLine("");
+        foreach (var item in items)
+        {
+            if (item != null)
+            {
+                builder.AppendLine("");
+                foreach (var pi in cols)
+                {
+                    var val = await FormatValue(pi, Utility.GetPropertyValue(item, pi.GetFieldName()));
+                    builder.AppendLine($"");
+                }
+                builder.AppendLine("");
+            }
+        }
+        builder.AppendLine("");
+        builder.AppendLine("
{pi.GetDisplayName()}
{val}
");
+        return builder.ToString();
+    }
 }

From 217ad4ac4bb83b85fbd9c582140bf35f960d6597 Mon Sep 17 00:00:00 2001
From: Argo-AscioTech 
Date: Mon, 11 Dec 2023 13:13:31 +0800
Subject: [PATCH 24/35] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BootstrapBlazor.MaterialDesign.Extensions/DefaultIcon.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Extensions/Components/BootstrapBlazor.MaterialDesign.Extensions/DefaultIcon.cs b/src/Extensions/Components/BootstrapBlazor.MaterialDesign.Extensions/DefaultIcon.cs
index 6b701115874..84b26cbe648 100644
--- a/src/Extensions/Components/BootstrapBlazor.MaterialDesign.Extensions/DefaultIcon.cs
+++ b/src/Extensions/Components/BootstrapBlazor.MaterialDesign.Extensions/DefaultIcon.cs
@@ -142,8 +142,9 @@ internal class DefaultIcon
         { ComponentIcons.TableRefreshButtonIcon, "mdi mdi-refresh" },
         { ComponentIcons.TableCardViewButtonIcon, "mdi mdi-menu" },
         { ComponentIcons.TableColumnListButtonIcon, "mdi mdi-format-list-bulleted" },
-        { ComponentIcons.TableExcelExportIcon, "mdi mdi-file-excel" },
-        { ComponentIcons.TablePdfExportIcon, "mdi mdi-file-pdf-box" },
+        { ComponentIcons.TableExporCsvIcon, "mdi mdi-file-table-box" },
+        { ComponentIcons.TableExporExceltIcon, "mdi mdi-file-excel-box" },
+        { ComponentIcons.TableExportPdfIcon, "mdi mdi-file-pdf-box" },
         { ComponentIcons.TableSearchButtonIcon, "mdi mdi-magnify" },
         { ComponentIcons.TableResetSearchButtonIcon, "mdi mdi-trash-can-outline" },
         { ComponentIcons.TableCloseButtonIcon, "mdi mdi-close" },

From 4b600f7733ae324f8f7e01766d25df8e12d62754 Mon Sep 17 00:00:00 2001
From: Argo-AscioTech 
Date: Mon, 11 Dec 2023 13:13:39 +0800
Subject: [PATCH 25/35] =?UTF-8?q?test:=20=E6=9B=B4=E6=96=B0=E5=8D=95?=
 =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/UnitTest/Components/TableTest.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/UnitTest/Components/TableTest.cs b/test/UnitTest/Components/TableTest.cs
index 0d716e432bf..08b8e96566e 100644
--- a/test/UnitTest/Components/TableTest.cs
+++ b/test/UnitTest/Components/TableTest.cs
@@ -807,7 +807,7 @@ public void ExportButtonDropdownTemplate_Ok()
         ITableExportDataContext? exportContext = null;
         bool exported = false;
         var localizer = Context.Services.GetRequiredService>();
-        var export = Context.Services.GetRequiredService();
+        var export = Context.Services.GetRequiredService();
         var cut = Context.RenderComponent(pb =>
         {
             pb.AddChildContent>(pb =>

From fa58df2bdf6bbaed67bc1f738210d24e3002f771 Mon Sep 17 00:00:00 2001
From: Argo-AscioTech 
Date: Mon, 11 Dec 2023 13:13:46 +0800
Subject: [PATCH 26/35] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 exclusion.dic | 1 +
 1 file changed, 1 insertion(+)

diff --git a/exclusion.dic b/exclusion.dic
index 8532dbfa4fa..1ad05d9bec0 100644
--- a/exclusion.dic
+++ b/exclusion.dic
@@ -55,3 +55,4 @@ Splittings
 Foos
 Localizer
 onchange
+Render

From b832aa9af133a7a29b74b45cc46549ca44d73837 Mon Sep 17 00:00:00 2001
From: Argo-AscioTech 
Date: Mon, 11 Dec 2023 13:23:00 +0800
Subject: [PATCH 27/35] chore: bump version 8.0.6-beta01

---
 src/BootstrapBlazor/BootstrapBlazor.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj
index f0c6c5518b5..5b5a5a4c990 100644
--- a/src/BootstrapBlazor/BootstrapBlazor.csproj
+++ b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
 
 
   
-    8.0.5
+    8.0.6-beta01
   
 
   

From 01d398cb3cb53691e072c18bcb6fd4db75bebbfc Mon Sep 17 00:00:00 2001
From: Argo-AscioTech 
Date: Mon, 11 Dec 2023 13:23:20 +0800
Subject: [PATCH 28/35] chore: bump version 8.0.2-beta01

---
 .../BootstrapBlazor.Html2Pdf/BootstrapBlazor.Html2Pdf.csproj   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Extensions/Components/BootstrapBlazor.Html2Pdf/BootstrapBlazor.Html2Pdf.csproj b/src/Extensions/Components/BootstrapBlazor.Html2Pdf/BootstrapBlazor.Html2Pdf.csproj
index 4424a56e962..923c1ba81ce 100644
--- a/src/Extensions/Components/BootstrapBlazor.Html2Pdf/BootstrapBlazor.Html2Pdf.csproj
+++ b/src/Extensions/Components/BootstrapBlazor.Html2Pdf/BootstrapBlazor.Html2Pdf.csproj
@@ -1,7 +1,7 @@
 
 
   
-    8.0.1
+    8.0.2-beta01
   
 
   
@@ -10,6 +10,7 @@
   
 
   
+    
     
   
 

From 1b6bcfcd0eb9ca75c2720d2513e3c7106d282d02 Mon Sep 17 00:00:00 2001
From: Argo-AscioTech 
Date: Mon, 11 Dec 2023 13:23:39 +0800
Subject: [PATCH 29/35] chore: bump version 8.0.1-beta01

---
 .../BootstrapBlazor.TableExport.csproj                        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Extensions/Components/BootstrapBlazor.TableExport/BootstrapBlazor.TableExport.csproj b/src/Extensions/Components/BootstrapBlazor.TableExport/BootstrapBlazor.TableExport.csproj
index 6fcb45b49a1..692f54c9c9b 100644
--- a/src/Extensions/Components/BootstrapBlazor.TableExport/BootstrapBlazor.TableExport.csproj
+++ b/src/Extensions/Components/BootstrapBlazor.TableExport/BootstrapBlazor.TableExport.csproj
@@ -1,7 +1,7 @@
 
 
   
-    8.0.0
+    8.0.1-beta01
   
 
   
@@ -10,7 +10,7 @@
   
 
   
-    
+    
     
   
 

From 79289f12f718d2204847f6ad7c51460bd067ba16 Mon Sep 17 00:00:00 2001
From: Argo-AscioTech 
Date: Mon, 11 Dec 2023 13:23:55 +0800
Subject: [PATCH 30/35] chore: bump version 8.0.2-beta01

---
 .../BootstrapBlazor.MaterialDesign.Extensions.csproj          | 4 ++--
 .../BootstrapBlazor.MaterialDesign.Extensions/DefaultIcon.cs  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Extensions/Components/BootstrapBlazor.MaterialDesign.Extensions/BootstrapBlazor.MaterialDesign.Extensions.csproj b/src/Extensions/Components/BootstrapBlazor.MaterialDesign.Extensions/BootstrapBlazor.MaterialDesign.Extensions.csproj
index 314f6f30cdb..4b7a451c0d3 100644
--- a/src/Extensions/Components/BootstrapBlazor.MaterialDesign.Extensions/BootstrapBlazor.MaterialDesign.Extensions.csproj
+++ b/src/Extensions/Components/BootstrapBlazor.MaterialDesign.Extensions/BootstrapBlazor.MaterialDesign.Extensions.csproj
@@ -1,7 +1,7 @@
 
 
   
-    8.0.1
+    8.0.2-beta01
   
 
   
@@ -11,7 +11,7 @@
   
 
   
-    
+    
   
 
 
diff --git a/src/Extensions/Components/BootstrapBlazor.MaterialDesign.Extensions/DefaultIcon.cs b/src/Extensions/Components/BootstrapBlazor.MaterialDesign.Extensions/DefaultIcon.cs
index 84b26cbe648..82e590a7272 100644
--- a/src/Extensions/Components/BootstrapBlazor.MaterialDesign.Extensions/DefaultIcon.cs
+++ b/src/Extensions/Components/BootstrapBlazor.MaterialDesign.Extensions/DefaultIcon.cs
@@ -142,8 +142,8 @@ internal class DefaultIcon
         { ComponentIcons.TableRefreshButtonIcon, "mdi mdi-refresh" },
         { ComponentIcons.TableCardViewButtonIcon, "mdi mdi-menu" },
         { ComponentIcons.TableColumnListButtonIcon, "mdi mdi-format-list-bulleted" },
-        { ComponentIcons.TableExporCsvIcon, "mdi mdi-file-table-box" },
-        { ComponentIcons.TableExporExceltIcon, "mdi mdi-file-excel-box" },
+        { ComponentIcons.TableExportCsvIcon, "mdi mdi-file-table-box" },
+        { ComponentIcons.TableExportExcelIcon, "mdi mdi-file-excel-box" },
         { ComponentIcons.TableExportPdfIcon, "mdi mdi-file-pdf-box" },
         { ComponentIcons.TableSearchButtonIcon, "mdi mdi-magnify" },
         { ComponentIcons.TableResetSearchButtonIcon, "mdi mdi-trash-can-outline" },

From a42923ba039212b786eea266a9aa2fb54e3ea51e Mon Sep 17 00:00:00 2001
From: Argo-AscioTech 
Date: Mon, 11 Dec 2023 13:24:13 +0800
Subject: [PATCH 31/35] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96=E7=BB=84=E4=BB=B6=E5=8C=85=E5=88=B0=E6=9C=80=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj b/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj
index 30ab477da6d..557e9df10b4 100644
--- a/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj
+++ b/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj
@@ -42,12 +42,12 @@
     
     
     
-    
+    
     
     
     
     
-    
+    
     
     
     
@@ -56,7 +56,7 @@
     
     
     
-    
+    
     
     
     

From c63f3fd8481db63e598c3e99bd4e4bc23b7e23cd Mon Sep 17 00:00:00 2001
From: Argo-AscioTech 
Date: Mon, 11 Dec 2023 13:33:47 +0800
Subject: [PATCH 32/35] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=B6=88=E9=99=A4=E8=AD=A6=E5=91=8A=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/Table/Table.razor.Toolbar.cs   |  2 +-
 .../Components/Table/Table.razor.cs           | 23 +++++++++----------
 src/BootstrapBlazor/Utils/CssBuilder.cs       |  6 ++---
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs b/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs
index 328be255d42..573ba1cbbb0 100644
--- a/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs
+++ b/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs
@@ -397,7 +397,7 @@ public Func? ShowDeleteButtonCallback
     /// 
     /// 获得/设置 各列是否显示状态集合
     /// 
-    private List VisibleColumns { get; } = new();
+    private List VisibleColumns { get; } = [];
 
     /// 
     /// 获得当前可见列集合
diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.cs b/src/BootstrapBlazor/Components/Table/Table.razor.cs
index df8eef83856..197bd6ba8cd 100644
--- a/src/BootstrapBlazor/Components/Table/Table.razor.cs
+++ b/src/BootstrapBlazor/Components/Table/Table.razor.cs
@@ -130,9 +130,9 @@ namespace BootstrapBlazor.Components;
 
     private static string? GetColspan(int colspan) => colspan > 1 ? colspan.ToString() : null;
 
-    private bool IsShowFooter => ShowFooter && (Rows.Any() || !IsHideFooterWhenNoData);
+    private bool IsShowFooter => ShowFooter && (Rows.Count > 0 || !IsHideFooterWhenNoData);
 
-    private int PageStartIndex => Rows.Any() ? (PageIndex - 1) * PageItems + 1 : 0;
+    private int PageStartIndex => Rows.Count > 0 ? (PageIndex - 1) * PageItems + 1 : 0;
 
     private string? PageInfoLabelString => Localizer[nameof(PageInfoText), PageStartIndex, (PageIndex - 1) * PageItems + Rows.Count, TotalCount];
 
@@ -187,7 +187,7 @@ namespace BootstrapBlazor.Components;
     /// 
     /// 明细行集合用于数据懒加载
     /// 
-    protected List ExpandRows { get; } = new List();
+    protected List ExpandRows { get; } = [];
 
     /// 
     /// 获得/设置 组件工作模式为 Excel 模式 默认 false
@@ -350,7 +350,7 @@ public void ExpandDetailRow(TItem item)
     /// 
     /// 明细行集合用于数据懒加载
     /// 
-    protected List DetailRows { get; } = new List();
+    protected List DetailRows { get; } = [];
 
     /// 
     /// 获得 表头集合
@@ -846,6 +846,8 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
 
     private string? GetTableName(bool hasHeader) => hasHeader ? ClientTableName : null;
 
+    private readonly JsonSerializerOptions _serializerOption = new() { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
+
     private async Task> ReloadColumnWidth()
     {
         IEnumerable? ret = null;
@@ -859,10 +861,7 @@ private async Task> ReloadColumnWidth()
                     var doc = JsonDocument.Parse(jsonData);
                     if (doc.RootElement.TryGetProperty("cols", out var element))
                     {
-                        ret = element.Deserialize>(new JsonSerializerOptions()
-                        {
-                            PropertyNamingPolicy = JsonNamingPolicy.CamelCase
-                        });
+                        ret = element.Deserialize>(_serializerOption);
                     }
                     if (doc.RootElement.TryGetProperty("table", out var tableEl) && tableEl.TryGetInt32(out var tableWidth))
                     {
@@ -1107,7 +1106,7 @@ void SetDynamicEditTemplate()
                 var onValueChanged = Utility.GetOnValueChangedInvoke(col.PropertyType);
                 if (DynamicContext.OnValueChanged != null)
                 {
-                    var parameters = col.ComponentParameters?.ToList() ?? new List>();
+                    var parameters = col.ComponentParameters?.ToList() ?? [];
                     parameters.Add(new(nameof(ValidateBase.OnValueChanged), onValueChanged.Invoke(d, col, (model, column, val) => DynamicContext.OnValueChanged(model, column, val))));
                     col.ComponentParameters = parameters;
                 }
@@ -1135,7 +1134,7 @@ void SetEditTemplate()
     /// 
     /// 获得 过滤集合
     /// 
-    public Dictionary Filters { get; } = new();
+    public Dictionary Filters { get; } = [];
     #endregion
 
     private async ValueTask> LoadItems(ItemsProviderRequest request)
@@ -1166,7 +1165,7 @@ private Func TriggerDoubleClickCell(ITableColumn col, TItem item) => async
         .AddClass("is-dbcell", trigger)
         .Build();
 
-    private bool IsShowEmpty => ShowEmpty && !Rows.Any();
+    private bool IsShowEmpty => ShowEmpty && Rows.Count == 0;
 
     private int GetColumnCount()
     {
@@ -1225,7 +1224,7 @@ public async Task ResetFilters()
     /// 返回 true 时按钮禁用
     /// 
     /// 
-    private bool GetDeleteButtonStatus() => ShowAddForm || AddInCell || !SelectedRows.Any();
+    private bool GetDeleteButtonStatus() => ShowAddForm || AddInCell || SelectedRows.Count == 0;
 
     private async Task InvokeItemsChanged()
     {
diff --git a/src/BootstrapBlazor/Utils/CssBuilder.cs b/src/BootstrapBlazor/Utils/CssBuilder.cs
index e0f271bb153..19f2d1160ad 100644
--- a/src/BootstrapBlazor/Utils/CssBuilder.cs
+++ b/src/BootstrapBlazor/Utils/CssBuilder.cs
@@ -16,7 +16,7 @@ public class CssBuilder
     /// Call Build() to return the completed CSS Classes as a string.
     /// 
     /// 
-    public static CssBuilder Default(string? value = null) => new CssBuilder(value);
+    public static CssBuilder Default(string? value = null) => new(value);
 
     /// 
     /// Creates a CssBuilder used to define conditional CSS classes used in a component.
@@ -25,7 +25,7 @@ public class CssBuilder
     /// 
     protected CssBuilder(string? value)
     {
-        stringBuffer = new List();
+        stringBuffer = [];
         AddClass(value);
     }
 
@@ -124,5 +124,5 @@ public CssBuilder AddStyleFromAttributes(IDictionary? additional
     /// Finalize the completed CSS Classes as a string.
     /// 
     /// string
-    public string? Build() => stringBuffer.Any() ? string.Join(" ", stringBuffer) : null;
+    public string? Build() => stringBuffer.Count > 0 ? string.Join(" ", stringBuffer) : null;
 }

From 2cc2cdf578997a31a7cf6354ff1dabd5a1fae0c3 Mon Sep 17 00:00:00 2001
From: Argo-AscioTech 
Date: Mon, 11 Dec 2023 13:43:44 +0800
Subject: [PATCH 33/35] =?UTF-8?q?test:=20=E6=9B=B4=E6=96=B0=E5=8D=95?=
 =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/UnitTest/Components/TableTest.cs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/test/UnitTest/Components/TableTest.cs b/test/UnitTest/Components/TableTest.cs
index 08b8e96566e..153437b53da 100644
--- a/test/UnitTest/Components/TableTest.cs
+++ b/test/UnitTest/Components/TableTest.cs
@@ -789,15 +789,18 @@ public void ShowExportButton_Ok()
 
         // Excel 导出图标监测
         // Pdf 导出图标监测
-        table.DoesNotContain("fa-regular fa-file-excel");
-        table.DoesNotContain("fa-regular fa-file-pdf");
+        table.DoesNotContain("fa-solid fa-fw fa-file-excel");
+        table.DoesNotContain("fa-solid fa-fw fa-file-pdf");
+
         table.SetParametersAndRender(pb =>
         {
+            pb.Add(a => a.ShowExportCsvButton, true);
             pb.Add(a => a.ShowExportExcelButton, true);
             pb.Add(a => a.ShowExportPdfButton, true);
         });
-        table.Contains("fa-regular fa-file-excel");
-        table.Contains("fa-regular fa-file-pdf");
+        table.Contains("fa-solid fa-fw fa-file-csv");
+        table.Contains("fa-solid fa-fw fa-file-excel");
+        table.Contains("fa-solid fa-fw fa-file-pdf");
     }
 
     [Fact]

From 3bba7b023237bf7565bf64ed1681bc7d3ea9f42e Mon Sep 17 00:00:00 2001
From: Argo-AscioTech 
Date: Mon, 11 Dec 2023 13:56:03 +0800
Subject: [PATCH 34/35] =?UTF-8?q?refactor:=20=E7=B2=BE=E7=AE=80=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BootstrapBlazor/Services/ComponentHtmlRenderer.cs |  8 ++++----
 src/BootstrapBlazor/Services/DefaultIconTheme.cs      | 10 +++-------
 src/BootstrapBlazor/Services/DefaultTableExportPdf.cs |  1 +
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/BootstrapBlazor/Services/ComponentHtmlRenderer.cs b/src/BootstrapBlazor/Services/ComponentHtmlRenderer.cs
index 58732b792ff..42e9b905e47 100644
--- a/src/BootstrapBlazor/Services/ComponentHtmlRenderer.cs
+++ b/src/BootstrapBlazor/Services/ComponentHtmlRenderer.cs
@@ -9,9 +9,9 @@ namespace BootstrapBlazor.Components;
 
 class ComponentHtmlRenderer(IServiceProvider serviceProvider, ILoggerFactory loggerFactory) : IComponentHtmlRenderer
 {
-    private IServiceProvider ServiceProvider { get; set; } = serviceProvider;
+    private readonly IServiceProvider _serviceProvider = serviceProvider;
 
-    private ILoggerFactory LoggerFactory { get; set; } = loggerFactory;
+    private readonly ILoggerFactory _loggerFactory = loggerFactory;
 
     /// 
     /// 
@@ -21,7 +21,7 @@ class ComponentHtmlRenderer(IServiceProvider serviceProvider, ILoggerFactory log
     /// 
     public async Task RenderAsync(IDictionary? parameters = null) where TComponent : IComponent
     {
-        using var htmlRenderer = new HtmlRenderer(ServiceProvider, LoggerFactory);
+        using var htmlRenderer = new HtmlRenderer(_serviceProvider, _loggerFactory);
         var html = await htmlRenderer.Dispatcher.InvokeAsync(async () =>
         {
             parameters ??= new Dictionary();
@@ -40,7 +40,7 @@ public async Task RenderAsync(IDictionary?
     /// 
     public async Task RenderAsync(Type componentType, IDictionary? parameters = null)
     {
-        using var htmlRenderer = new HtmlRenderer(ServiceProvider, LoggerFactory);
+        using var htmlRenderer = new HtmlRenderer(_serviceProvider, _loggerFactory);
         var html = await htmlRenderer.Dispatcher.InvokeAsync(async () =>
         {
             parameters ??= new Dictionary();
diff --git a/src/BootstrapBlazor/Services/DefaultIconTheme.cs b/src/BootstrapBlazor/Services/DefaultIconTheme.cs
index 883e69dacb3..954534a968d 100644
--- a/src/BootstrapBlazor/Services/DefaultIconTheme.cs
+++ b/src/BootstrapBlazor/Services/DefaultIconTheme.cs
@@ -4,13 +4,9 @@
 
 namespace BootstrapBlazor.Components;
 
-/// 
-/// 
-/// 
-/// 
-internal class DefaultIconTheme(IOptions options) : IIconTheme
+class DefaultIconTheme(IOptions options) : IIconTheme
 {
-    private IOptions Options { get; set; } = options;
+    private readonly IOptions _options = options;
 
     /// 
     /// 
@@ -18,7 +14,7 @@ internal class DefaultIconTheme(IOptions options) : IIconTheme
     /// 
     public Dictionary GetIcons()
     {
-        if (!Options.Value.Icons.TryGetValue(Options.Value.ThemeKey, out var icons))
+        if (!_options.Value.Icons.TryGetValue(_options.Value.ThemeKey, out var icons))
         {
             icons = [];
         }
diff --git a/src/BootstrapBlazor/Services/DefaultTableExportPdf.cs b/src/BootstrapBlazor/Services/DefaultTableExportPdf.cs
index 426124f9467..e2c4380e374 100644
--- a/src/BootstrapBlazor/Services/DefaultTableExportPdf.cs
+++ b/src/BootstrapBlazor/Services/DefaultTableExportPdf.cs
@@ -4,6 +4,7 @@
 
 namespace BootstrapBlazor.Components;
 
+[ExcludeFromCodeCoverage]
 class DefaultTableExportPdf : ITableExportPdf
 {
     /// 

From 2bcf705065fe89f5f08cddd2fa40d6c17e0420ef Mon Sep 17 00:00:00 2001
From: Argo-AscioTech 
Date: Mon, 11 Dec 2023 13:56:10 +0800
Subject: [PATCH 35/35] =?UTF-8?q?test:=20=E6=9B=B4=E6=96=B0=E5=8D=95?=
 =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/UnitTest/Components/TableTest.cs | 41 ++++++++++++++-------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/test/UnitTest/Components/TableTest.cs b/test/UnitTest/Components/TableTest.cs
index 153437b53da..adbb1859b4f 100644
--- a/test/UnitTest/Components/TableTest.cs
+++ b/test/UnitTest/Components/TableTest.cs
@@ -752,7 +752,7 @@ public void ShowCardView_Ok()
     }
 
     [Fact]
-    public void ShowExportButton_Ok()
+    public async Task ShowExportButton_Ok()
     {
         var localizer = Context.Services.GetRequiredService>();
         var cut = Context.RenderComponent(pb =>
@@ -801,6 +801,10 @@ public void ShowExportButton_Ok()
         table.Contains("fa-solid fa-fw fa-file-csv");
         table.Contains("fa-solid fa-fw fa-file-excel");
         table.Contains("fa-solid fa-fw fa-file-pdf");
+
+        // 导出 csv
+        var button = table.Find(".fa-file-csv");
+        await table.InvokeAsync(() => button.Click());
     }
 
     [Fact]
@@ -6161,6 +6165,7 @@ public void ExportAsync_Ok()
                 pb.Add(a => a.OnQueryAsync, OnQueryAsync(localizer));
                 pb.Add(a => a.ShowToolbar, true);
                 pb.Add(a => a.ShowExportButton, true);
+                pb.Add(a => a.ShowExportCsvButton, true);
                 pb.Add(a => a.ShowExportPdfButton, true);
                 pb.Add(a => a.TableColumns, foo => builder =>
                 {
@@ -6172,33 +6177,29 @@ public void ExportAsync_Ok()
             });
         });
 
-        cut.InvokeAsync(() =>
+        var buttons = cut.FindAll(".dropdown-menu-end .dropdown-item");
+        foreach (var button in buttons)
         {
-            var button = cut.Find(".dropdown-menu-end .dropdown-item");
-            button.Click();
-        });
-
-        cut.InvokeAsync(() =>
-        {
-            var buttons = cut.FindAll(".dropdown-menu-end .dropdown-item");
-            buttons[buttons.Count - 1].Click();
-        });
+            cut.InvokeAsync(() =>
+            {
+                button.Click();
+            });
+        }
 
         var table = cut.FindComponent>();
         table.SetParametersAndRender(pb =>
         {
             pb.Add(a => a.OnExportAsync, _ => Task.FromResult(true));
         });
-        cut.InvokeAsync(() =>
-        {
-            var button = cut.Find(".dropdown-menu-end .dropdown-item");
-            button.Click();
-        });
-        cut.InvokeAsync(() =>
+
+        buttons = cut.FindAll(".dropdown-menu-end .dropdown-item");
+        foreach (var button in buttons)
         {
-            var buttons = cut.FindAll(".dropdown-menu-end .dropdown-item");
-            buttons[buttons.Count - 1].Click();
-        });
+            cut.InvokeAsync(() =>
+            {
+                button.Click();
+            });
+        }
     }
 
     [Fact]