diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj
index 35916bc0d1c..3e8202eb2cb 100644
--- a/src/BootstrapBlazor/BootstrapBlazor.csproj
+++ b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>9.6.4</Version>
+    <Version>9.6.14</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/BootstrapBlazor/Components/BaseComponents/BootstrapModuleComponentBase.cs b/src/BootstrapBlazor/Components/BaseComponents/BootstrapModuleComponentBase.cs
index 5b1ba65b30a..ac8abc23429 100644
--- a/src/BootstrapBlazor/Components/BaseComponents/BootstrapModuleComponentBase.cs
+++ b/src/BootstrapBlazor/Components/BaseComponents/BootstrapModuleComponentBase.cs
@@ -106,7 +106,7 @@ protected virtual void OnLoadJSModule()
     /// call JavaScript method
     /// </summary>
     /// <returns></returns>
-    protected virtual Task InvokeInitAsync() => InvokeVoidAsync("init", Id);
+    protected virtual Task InvokeInitAsync() => InvokeVoidAsync("init", Id, Interop);
 
     /// <summary>
     /// call JavaScript method
diff --git a/src/BootstrapBlazor/Components/BaseComponents/DynamicElement.cs b/src/BootstrapBlazor/Components/BaseComponents/DynamicElement.cs
index 53f30af13e3..39bde4e177b 100644
--- a/src/BootstrapBlazor/Components/BaseComponents/DynamicElement.cs
+++ b/src/BootstrapBlazor/Components/BaseComponents/DynamicElement.cs
@@ -80,6 +80,12 @@ public class DynamicElement : BootstrapComponentBase
     [Parameter]
     public bool GenerateElement { get; set; } = true;
 
+    /// <summary>
+    /// 获得/设置 组件 Key 值
+    /// </summary>
+    [Parameter]
+    public object? Key { get; set; }
+
     /// <summary>
     /// BuildRenderTree 方法
     /// </summary>
@@ -119,6 +125,11 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
 
         builder.AddContent(8, ChildContent);
 
+        if (Key != null)
+        {
+            builder.SetKey(Key);
+        }
+
         if (GenerateElement || IsTriggerClick() || IsTriggerDoubleClick())
         {
             builder.CloseElement();
diff --git a/src/BootstrapBlazor/Components/Drawer/Drawer.razor.js b/src/BootstrapBlazor/Components/Drawer/Drawer.razor.js
index a9c72fb3e40..064197cd6e7 100644
--- a/src/BootstrapBlazor/Components/Drawer/Drawer.razor.js
+++ b/src/BootstrapBlazor/Components/Drawer/Drawer.razor.js
@@ -9,7 +9,7 @@ const initDrag = el => {
     let height = 0;
     let isVertical = false;
     const drawerBody = el.querySelector('.drawer-body');
-    const bar = el.querySelector('.drawer-bar');
+    const bar = [...drawerBody.children].find(i => i.classList.contains('drawer-bar'));
     Drag.drag(bar,
         e => {
             isVertical = drawerBody.classList.contains("top") || drawerBody.classList.contains("bottom")
@@ -105,7 +105,7 @@ export function execute(id, open) {
             showDrawer();
         }
     }
-    
+
     const showDrawer = () => {
         drawerBody.classList.add('show');
         if (drawerBackdrop) {
@@ -175,7 +175,8 @@ export function dispose(id) {
         body.classList.remove('overflow-hidden')
     }
 
-    const bar = el.querySelector('.drawer-bar');
+    const drawerBody = el.querySelector('.drawer-body');
+    const bar = [...drawerBody.children].find(i => i.classList.contains('drawer-bar'));
     if (bar) {
         Drag.dispose(bar)
     }
diff --git a/src/BootstrapBlazor/Components/IpAddress/IpAddress.razor b/src/BootstrapBlazor/Components/IpAddress/IpAddress.razor
index b9e7aa6737e..caec88b1d50 100644
--- a/src/BootstrapBlazor/Components/IpAddress/IpAddress.razor
+++ b/src/BootstrapBlazor/Components/IpAddress/IpAddress.razor
@@ -1,6 +1,6 @@
-@namespace BootstrapBlazor.Components
+@namespace BootstrapBlazor.Components
 @inherits ValidateBase<string>
-@attribute [BootstrapModuleAutoLoader]
+@attribute [BootstrapModuleAutoLoader(JSObjectReference = true)]
 
 @if (IsShowLabel)
 {
diff --git a/src/BootstrapBlazor/Components/IpAddress/IpAddress.razor.cs b/src/BootstrapBlazor/Components/IpAddress/IpAddress.razor.cs
index c3150784301..9718c07b6bb 100644
--- a/src/BootstrapBlazor/Components/IpAddress/IpAddress.razor.cs
+++ b/src/BootstrapBlazor/Components/IpAddress/IpAddress.razor.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the Apache 2.0 License
 // See the LICENSE file in the project root for more information.
 // Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone
@@ -21,7 +21,7 @@ public partial class IpAddress
     /// <summary>
     /// 获得 class 样式集合
     /// </summary>
-    protected string? ClassName => CssBuilder.Default("ipaddress form-control")
+    protected string? ClassName => CssBuilder.Default("bb-ip form-control")
         .AddClass("disabled", IsDisabled)
         .AddClass(CssClass).AddClass(ValidCss)
         .Build();
@@ -62,7 +62,6 @@ private void ValueChanged1(ChangeEventArgs args)
         {
             Value1 = Value1[0..3];
         }
-
         UpdateValue();
     }
 
@@ -112,4 +111,22 @@ private void UpdateValue()
     {
         CurrentValueAsString = $"{Value1}.{Value2}.{Value3}.{Value4}";
     }
+
+    /// <summary>
+    /// 更新 值方法供 JS 调用
+    /// </summary>
+    /// <param name="v1"></param>
+    /// <param name="v2"></param>
+    /// <param name="v3"></param>
+    /// <param name="v4"></param>
+    [JSInvokable]
+    public void TriggerUpdate(int v1, int v2, int v3, int v4)
+    {
+        Value1 = v1.ToString();
+        Value2 = v2.ToString();
+        Value3 = v3.ToString();
+        Value4 = v4.ToString();
+
+        UpdateValue();
+    }
 }
diff --git a/src/BootstrapBlazor/Components/IpAddress/IpAddress.razor.js b/src/BootstrapBlazor/Components/IpAddress/IpAddress.razor.js
index c24cfa78eea..f97b93777cf 100644
--- a/src/BootstrapBlazor/Components/IpAddress/IpAddress.razor.js
+++ b/src/BootstrapBlazor/Components/IpAddress/IpAddress.razor.js
@@ -1,4 +1,4 @@
-import Data from "../../modules/data.js"
+import Data from "../../modules/data.js"
 import EventHandler from "../../modules/event-handler.js"
 
 const selectCell = (el, index) => {
@@ -13,7 +13,7 @@ const selectCell = (el, index) => {
     return c
 }
 
-export function init(id) {
+export function init(id, invoke) {
     const el = document.getElementById(id)
     if (el === null) {
         return
@@ -25,7 +25,6 @@ export function init(id) {
     el.querySelectorAll(".ipv4-cell").forEach((c, index) => {
         EventHandler.on(c, 'keydown', e => {
             if ((e.keyCode >= 48 && e.keyCode <= 57) || (e.keyCode >= 96 && e.keyCode <= 105)) {
-                // numbers, backup last status
                 ip.prevValues[index] = c.value
                 if (c.value === "0") {
                     c.value = ""
@@ -56,7 +55,15 @@ export function init(id) {
                     selectCell(el, index - 1)
                 }
             }
-            else if (e.key === 'Delete' || e.key === 'Tab' || e.key === 'ArrowLeft' || e.key === 'ArrowRight') {
+            else if (current.selectionStart === current.value.length && (e.key === 'Space' || e.key === 'ArrowRight')) {
+                e.preventDefault()
+                selectCell(el, index + 1)
+            }
+            else if (current.selectionStart === 0 && e.key === 'ArrowLeft') {
+                e.preventDefault()
+                selectCell(el, index - 1)
+            }
+            else if (e.composed || e.key === 'Delete' || e.key === 'Tab' || e.key === 'ArrowLeft' || e.key === 'ArrowRight') {
 
             }
             else {
@@ -72,6 +79,37 @@ export function init(id) {
                 }
             }
         })
+
+        EventHandler.on(c, 'paste', e => {
+            e.preventDefault();
+            const raw = (e.clipboardData || window.clipboardData)?.getData('text') ?? '';
+            if (!raw) {
+                return;
+            }
+
+            const ipRegex = /\b((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\b/;
+            const match = raw.match(ipRegex);
+            const parts = match ? match[0] : null;
+            if (parts === null) {
+                return;
+            }
+
+            const cells = el.querySelectorAll(".ipv4-cell");
+            let pos = 0;
+            const args = [];
+            parts.split('.').forEach(p => {
+                if (pos > 3) {
+                    return;
+                }
+                const num = parseInt(p, 10);
+                args.push(num);
+                cells[pos].value = num.toString();
+                ip.prevValues[pos] = cells[pos].value;
+                pos++;
+            });
+
+            invoke.invokeMethodAsync("TriggerUpdate", ...args);
+        });
     })
 }
 
diff --git a/src/BootstrapBlazor/Components/IpAddress/IpAddress.razor.scss b/src/BootstrapBlazor/Components/IpAddress/IpAddress.razor.scss
index 3f002ee43d6..a57ba28e86b 100644
--- a/src/BootstrapBlazor/Components/IpAddress/IpAddress.razor.scss
+++ b/src/BootstrapBlazor/Components/IpAddress/IpAddress.razor.scss
@@ -1,4 +1,4 @@
-.ipaddress {
+.bb-ip {
     --bb-ip-cell-max-width: #{$bb-ip-cell-max-width};
     display: flex;
     flex-wrap: nowrap;
diff --git a/src/BootstrapBlazor/Components/Table/Table.razor b/src/BootstrapBlazor/Components/Table/Table.razor
index 80d1bc0bed6..9687f30c3d0 100644
--- a/src/BootstrapBlazor/Components/Table/Table.razor
+++ b/src/BootstrapBlazor/Components/Table/Table.razor
@@ -237,7 +237,7 @@
                         }
                         else
                         {
-                            <DynamicElement class="@GetRowClassString(item, "table-row")" @key="item"
+                            <DynamicElement class="@GetRowClassString(item, "table-row")" Key="GetKeyByITem(item)"
                                             TriggerContextMenu="ContextMenuZone != null" OnContextMenu="e => OnContextMenu(e, item)"
                                             @ontouchstart="e => OnTouchStart(e, item)"
                                             @ontouchend="OnTouchEnd"
@@ -675,7 +675,7 @@
     </thead>;
 
     RenderFragment<TItem> RenderRow => item =>
-    @<DynamicElement TagName="tr" class="@GetRowClassString(item)" @key="item"
+    @<DynamicElement TagName="tr" class="@GetRowClassString(item)" Key="GetKeyByITem(item)"
                      TriggerContextMenu="ContextMenuZone != null" OnContextMenu="e => OnContextMenu(e, item)"
                      @ontouchstart="e => OnTouchStart(e, item)" @ontouchend="OnTouchEnd"
                      TriggerClick="@(ClickToSelect || OnClickRowCallback != null)" OnClick="() => ClickRow(item)"
diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.cs b/src/BootstrapBlazor/Components/Table/Table.razor.cs
index c67b1afaaeb..9728b187ed7 100644
--- a/src/BootstrapBlazor/Components/Table/Table.razor.cs
+++ b/src/BootstrapBlazor/Components/Table/Table.razor.cs
@@ -186,6 +186,12 @@ private string GetSortTooltip(ITableColumn col) => SortName != col.GetFieldName(
     [Parameter]
     public bool ShowColumnWidthTooltip { get; set; }
 
+    /// <summary>
+    /// 获得/设置 行 Key 回调方法
+    /// </summary>
+    [Parameter]
+    public Func<TItem, object?>? OnGetRowKey { get; set; }
+
     private string ScrollWidthString => $"width: {ActualScrollWidth}px;";
 
     private string? GetScrollStyleString(bool condition) => condition
@@ -1667,6 +1673,8 @@ private void OnTouchEnd()
         TouchStart = false;
     }
 
+    private object? GetKeyByITem(TItem item) => OnGetRowKey?.Invoke(item);
+
     /// <summary>
     /// Dispose 方法
     /// </summary>
diff --git a/src/BootstrapBlazor/Components/TreeView/TreeView.razor.cs b/src/BootstrapBlazor/Components/TreeView/TreeView.razor.cs
index 58a5c28161a..dd90e419123 100644
--- a/src/BootstrapBlazor/Components/TreeView/TreeView.razor.cs
+++ b/src/BootstrapBlazor/Components/TreeView/TreeView.razor.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the Apache 2.0 License
 // See the LICENSE file in the project root for more information.
 // Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone
@@ -152,6 +152,12 @@ public partial class TreeView<TItem> : IModelEqualityComparer<TItem>
     [Parameter]
     public Func<TreeViewItem<TItem>, Task>? OnTreeItemClick { get; set; }
 
+    /// <summary>
+    /// 获得/设置 点击节点前回调方法
+    /// </summary>
+    [Parameter]
+    public Func<TreeViewItem<TItem>, Task<bool>>? OnBeforeTreeItemClick { get; set; }
+
     /// <summary>
     /// Gets or sets the callback method when a tree item is checked.
     /// </summary>
@@ -545,6 +551,15 @@ private async Task<IEnumerable<IExpandableNode<TItem>>> GetChildrenRowAsync(Tree
 
     private async Task OnClick(TreeViewItem<TItem> item)
     {
+        if (OnBeforeTreeItemClick != null)
+        {
+            var ret = await OnBeforeTreeItemClick(item);
+            if (ret == false)
+            {
+                return;
+            }
+        }
+
         _activeItem = item;
         if (ClickToggleNode && item.CanTriggerClickNode(IsDisabled, CanExpandWhenDisabled))
         {
diff --git a/src/BootstrapBlazor/Components/Upload/CardUpload.razor b/src/BootstrapBlazor/Components/Upload/CardUpload.razor
index 9a02c28b95f..d05c7fb09f1 100644
--- a/src/BootstrapBlazor/Components/Upload/CardUpload.razor
+++ b/src/BootstrapBlazor/Components/Upload/CardUpload.razor
@@ -16,13 +16,13 @@
         {
             <div @key="@item" class="@GetItemClassString(item)">
                 <div class="upload-item-body">
-                    @if (IsImage(item))
+                    @if (IconTemplate != null)
                     {
-                        <img class="upload-item-body-image" alt="prevUrl" src="@item.PrevUrl" @onclick="() => OnClickZoom(item)" />
+                        @IconTemplate(item)
                     }
-                    else if (IconTemplate != null)
+                    else if (IsImage(item))
                     {
-                        @IconTemplate(item)
+                        <img class="upload-item-body-image" alt="prevUrl" src="@item.PrevUrl" @onclick="() => OnClickZoom(item)" />
                     }
                     else
                     {
@@ -32,6 +32,10 @@
                 <div class="upload-item-size"><span>@item.GetFileName()</span> (@item.Size.ToFileSizeString())</div>
                 <div class="upload-item-actions">
                     <div class="btn-group">
+                        @if (ActionButtonTemplate != null)
+                        {
+                            @ActionButtonTemplate(item)
+                        }
                         @if (ShowZoomButton)
                         {
                             <button type="button" class="btn btn-sm btn-secondary btn-zoom" disabled="@GetDisabledString(item)" @onclick="() => OnClickZoom(item)" aria-label="zoom">
diff --git a/src/BootstrapBlazor/Components/Upload/CardUpload.razor.cs b/src/BootstrapBlazor/Components/Upload/CardUpload.razor.cs
index 90b847dab8d..3c1804801cc 100644
--- a/src/BootstrapBlazor/Components/Upload/CardUpload.razor.cs
+++ b/src/BootstrapBlazor/Components/Upload/CardUpload.razor.cs
@@ -48,6 +48,12 @@ public partial class CardUpload<TValue>
     [Parameter]
     public RenderFragment<UploadFile>? IconTemplate { get; set; }
 
+    /// <summary>
+    /// 获得/设置 操作按钮模板
+    /// </summary>
+    [Parameter]
+    public RenderFragment<UploadFile>? ActionButtonTemplate { get; set; }
+
     /// <summary>
     /// 获得/设置 新建图标
     /// </summary>
diff --git a/src/BootstrapBlazor/Options/PdfOptions.cs b/src/BootstrapBlazor/Options/PdfOptions.cs
new file mode 100644
index 00000000000..23e744268bd
--- /dev/null
+++ b/src/BootstrapBlazor/Options/PdfOptions.cs
@@ -0,0 +1,17 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the Apache 2.0 License
+// See the LICENSE file in the project root for more information.
+// Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone
+
+namespace BootstrapBlazor.Components;
+
+/// <summary>
+/// PdfOptions 实例用于设置导出 Pdf 相关选项
+/// </summary>
+public class PdfOptions
+{
+    /// <summary>
+    /// 获得/设置 是否横向打印 默认 false
+    /// </summary>
+    public bool Landscape { get; set; }
+}
diff --git a/src/BootstrapBlazor/Services/DefaultHtml2PdfService.cs b/src/BootstrapBlazor/Services/DefaultHtml2PdfService.cs
index aee8de4afe5..778e0ef9279 100644
--- a/src/BootstrapBlazor/Services/DefaultHtml2PdfService.cs
+++ b/src/BootstrapBlazor/Services/DefaultHtml2PdfService.cs
@@ -12,29 +12,11 @@ class DefaultHtml2PdfService : IHtml2Pdf
 {
     private const string ErrorMessage = "请增加依赖包 BootstrapBlazor.Html2Pdf 通过 AddBootstrapBlazorHtml2PdfService 进行服务注入; Please add BootstrapBlazor.Html2Pdf package and use AddBootstrapBlazorHtml2PdfService inject service";
 
-    /// <summary>
-    /// <inheritdoc/>
-    /// </summary>
-    public Task<byte[]> PdfDataAsync(string url) => throw new NotImplementedException(ErrorMessage);
+    public Task<byte[]> PdfDataAsync(string url, PdfOptions? options = null) => throw new NotImplementedException(ErrorMessage);
 
-    /// <summary>
-    /// <inheritdoc/>
-    /// </summary>
-    public Task<Stream> PdfStreamAsync(string url) => throw new NotImplementedException(ErrorMessage);
+    public Task<Stream> PdfStreamAsync(string url, PdfOptions? options = null) => throw new NotImplementedException(ErrorMessage);
 
-    /// <summary>
-    /// Export method
-    /// </summary>
-    /// <param name="html">html raw string</param>
-    /// <param name="links"></param>
-    /// <param name="scripts"></param>
-    public Task<byte[]> PdfDataFromHtmlAsync(string html, IEnumerable<string>? links = null, IEnumerable<string>? scripts = null) => throw new NotImplementedException(ErrorMessage);
+    public Task<byte[]> PdfDataFromHtmlAsync(string html, IEnumerable<string>? links = null, IEnumerable<string>? scripts = null, PdfOptions? options = null) => throw new NotImplementedException(ErrorMessage);
 
-    /// <summary>
-    /// Export method
-    /// </summary>
-    /// <param name="html">html raw string</param>
-    /// <param name="links"></param>
-    /// <param name="scripts"></param>
-    public Task<Stream> PdfStreamFromHtmlAsync(string html, IEnumerable<string>? links = null, IEnumerable<string>? scripts = null) => throw new NotImplementedException(ErrorMessage);
+    public Task<Stream> PdfStreamFromHtmlAsync(string html, IEnumerable<string>? links = null, IEnumerable<string>? scripts = null, PdfOptions? options = null) => throw new NotImplementedException(ErrorMessage);
 }
diff --git a/src/BootstrapBlazor/Services/DefaultZipArchiveService.cs b/src/BootstrapBlazor/Services/DefaultZipArchiveService.cs
index e872ab3eeda..aca5aa5183d 100644
--- a/src/BootstrapBlazor/Services/DefaultZipArchiveService.cs
+++ b/src/BootstrapBlazor/Services/DefaultZipArchiveService.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the Apache 2.0 License
 // See the LICENSE file in the project root for more information.
 // Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone
@@ -13,15 +13,12 @@ class DefaultZipArchiveService : IZipArchiveService
     /// <summary>
     /// <inheritdoc/>
     /// </summary>
-    /// <param name="files">要归档的文件集合</param>
-    /// <param name="options">归档配置</param>
-    /// <returns>归档数据流</returns>
-    public async Task<Stream> ArchiveAsync(IEnumerable<string> files, ArchiveOptions? options = null)
+    public async Task<Stream> ArchiveAsync(IEnumerable<ArchiveEntry> entries, ArchiveOptions? options = null)
     {
         var stream = new MemoryStream();
         options ??= new ArchiveOptions();
         options.LeaveOpen = true;
-        await ArchiveFilesAsync(stream, files, options);
+        await ArchiveFilesAsync(stream, entries, options);
         stream.Position = 0;
         return stream;
     }
@@ -29,31 +26,41 @@ public async Task<Stream> ArchiveAsync(IEnumerable<string> files, ArchiveOptions
     /// <summary>
     /// <inheritdoc/>
     /// </summary>
-    /// <param name="archiveFileName">归档文件</param>
-    /// <param name="files">要归档的文件集合</param>
-    /// <param name="options">归档配置</param>
-    public async Task ArchiveAsync(string archiveFileName, IEnumerable<string> files, ArchiveOptions? options = null)
+    public async Task ArchiveAsync(string archiveFile, IEnumerable<ArchiveEntry> entries, ArchiveOptions? options = null)
     {
-        using var stream = File.OpenWrite(archiveFileName);
-        await ArchiveFilesAsync(stream, files, options);
+        using var stream = File.OpenWrite(archiveFile);
+        await ArchiveFilesAsync(stream, entries, options);
     }
 
-    private static async Task ArchiveFilesAsync(Stream stream, IEnumerable<string> files, ArchiveOptions? options = null)
+    private static async Task ArchiveFilesAsync(Stream stream, IEnumerable<ArchiveEntry> entries, ArchiveOptions? options = null)
     {
         options ??= new ArchiveOptions();
         using var archive = new ZipArchive(stream, options.Mode, options.LeaveOpen, options.Encoding);
-        foreach (var f in files)
+        foreach (var f in entries)
         {
             if (options.ReadStreamAsync != null)
             {
-                var entry = archive.CreateEntry(Path.GetFileName(f), options.CompressionLevel);
-                using var entryStream = entry.Open();
-                await using var content = await options.ReadStreamAsync(f);
+                var entry = archive.CreateEntry(f.EntryName, options.CompressionLevel);
+                await using var content = await options.ReadStreamAsync(f.SourceFileName);
+                await using var entryStream = entry.Open();
                 await content.CopyToAsync(entryStream);
+                entryStream.Close();
+            }
+            else if (Directory.Exists(f.SourceFileName))
+            {
+                var entryName = f.EntryName;
+                if (!string.IsNullOrEmpty(entryName))
+                {
+                    if (!entryName.EndsWith(Path.DirectorySeparatorChar))
+                    {
+                        entryName = $"{entryName}{Path.DirectorySeparatorChar}";
+                    }
+                    archive.CreateEntry(entryName, f.CompressionLevel ?? options.CompressionLevel);
+                }
             }
             else
             {
-                archive.CreateEntryFromFile(f, Path.GetFileName(f), options.CompressionLevel);
+                archive.CreateEntryFromFile(f.SourceFileName, f.EntryName, f.CompressionLevel ?? options.CompressionLevel);
             }
         }
     }
@@ -61,52 +68,52 @@ private static async Task ArchiveFilesAsync(Stream stream, IEnumerable<string> f
     /// <summary>
     /// <inheritdoc/>
     /// </summary>
-    /// <param name="archiveFileName">归档文件</param>
-    /// <param name="directoryName">要归档文件夹</param>
-    /// <param name="compressionLevel"></param>
-    /// <param name="includeBaseDirectory"></param>
-    /// <param name="encoding"></param>
-    /// <returns></returns>
-    /// <exception cref="NotImplementedException"></exception>
-    public async Task ArchiveDirectory(string archiveFileName, string directoryName, CompressionLevel compressionLevel = CompressionLevel.Optimal, bool includeBaseDirectory = false, Encoding? encoding = null)
+    public async Task ArchiveDirectoryAsync(string archiveFile, string directoryName, CompressionLevel compressionLevel = CompressionLevel.Optimal, bool includeBaseDirectory = false, Encoding? encoding = null, CancellationToken token = default)
     {
         if (Directory.Exists(directoryName))
         {
-            var folder = Path.GetDirectoryName(archiveFileName);
+            var folder = Path.GetDirectoryName(archiveFile);
             if (!string.IsNullOrEmpty(folder) && !Directory.Exists(folder))
             {
                 Directory.CreateDirectory(folder);
             }
-            await Task.Run(() => ZipFile.CreateFromDirectory(directoryName, archiveFileName, compressionLevel, includeBaseDirectory, encoding));
+#if NET10_0_OR_GREATER
+            await ZipFile.CreateFromDirectoryAsync(directoryName, archiveFile, compressionLevel, includeBaseDirectory, encoding, token);
+#else
+            await Task.Run(() =>
+            {
+                token.ThrowIfCancellationRequested();
+                ZipFile.CreateFromDirectory(directoryName, archiveFile, compressionLevel, includeBaseDirectory, encoding);
+            }, token);
+#endif
         }
     }
 
     /// <summary>
     /// <inheritdoc/>
     /// </summary>
-    /// <param name="archiveFile">归档文件</param>
-    /// <param name="destinationDirectoryName">解压缩文件夹</param>
-    /// <param name="overwriteFiles">是否覆盖文件 默认 false 不覆盖</param>
-    /// <param name="encoding">编码方式 默认 null 内部使用 UTF-8</param>
-    /// <returns></returns>
-    public bool ExtractToDirectory(string archiveFile, string destinationDirectoryName, bool overwriteFiles = false, Encoding? encoding = null)
+    public async Task<bool> ExtractToDirectoryAsync(string archiveFile, string destinationDirectoryName, bool overwriteFiles = false, Encoding? encoding = null, CancellationToken token = default)
     {
         if (!Directory.Exists(destinationDirectoryName))
         {
             Directory.CreateDirectory(destinationDirectoryName);
         }
-        ZipFile.ExtractToDirectory(archiveFile, destinationDirectoryName, encoding, overwriteFiles);
+
+#if NET10_0_OR_GREATER
+        await ZipFile.ExtractToDirectoryAsync(archiveFile, destinationDirectoryName, encoding, overwriteFiles, token);
+#else
+        await Task.Run(() =>
+        {
+            token.ThrowIfCancellationRequested();
+            ZipFile.ExtractToDirectory(archiveFile, destinationDirectoryName, encoding, overwriteFiles);
+        }, token);
+#endif
         return true;
     }
 
     /// <summary>
     /// <inheritdoc/>
     /// </summary>
-    /// <param name="archiveFile">归档文件</param>
-    /// <param name="entryFile">解压缩文件</param>
-    /// <param name="overwriteFiles">是否覆盖文件 默认 false 不覆盖</param>
-    /// <param name="encoding">编码方式 默认 null 内部使用 UTF-8</param>
-    /// <returns></returns>
     public ZipArchiveEntry? GetEntry(string archiveFile, string entryFile, bool overwriteFiles = false, Encoding? encoding = null)
     {
         using var archive = ZipFile.Open(archiveFile, ZipArchiveMode.Read, encoding);
diff --git a/src/BootstrapBlazor/Services/IHtml2Pdf.cs b/src/BootstrapBlazor/Services/IHtml2Pdf.cs
index 77693f7c8d4..1bf56d703d8 100644
--- a/src/BootstrapBlazor/Services/IHtml2Pdf.cs
+++ b/src/BootstrapBlazor/Services/IHtml2Pdf.cs
@@ -14,13 +14,15 @@ public interface IHtml2Pdf
     /// Export method
     /// </summary>
     /// <param name="url">url</param>
-    Task<byte[]> PdfDataAsync(string url);
+    /// <param name="options"></param>
+    Task<byte[]> PdfDataAsync(string url, PdfOptions? options = null);
 
     /// <summary>
     /// Export method
     /// </summary>
     /// <param name="url">url</param>
-    Task<Stream> PdfStreamAsync(string url);
+    /// <param name="options"></param>
+    Task<Stream> PdfStreamAsync(string url, PdfOptions? options = null);
 
     /// <summary>
     /// Export method
@@ -28,7 +30,8 @@ public interface IHtml2Pdf
     /// <param name="html">html raw string</param>
     /// <param name="links"></param>
     /// <param name="scripts"></param>
-    Task<byte[]> PdfDataFromHtmlAsync(string html, IEnumerable<string>? links = null, IEnumerable<string>? scripts = null);
+    /// <param name="options"></param>
+    Task<byte[]> PdfDataFromHtmlAsync(string html, IEnumerable<string>? links = null, IEnumerable<string>? scripts = null, PdfOptions? options = null);
 
     /// <summary>
     /// Export method
@@ -36,5 +39,6 @@ public interface IHtml2Pdf
     /// <param name="html">html raw string</param>
     /// <param name="links"></param>
     /// <param name="scripts"></param>
-    Task<Stream> PdfStreamFromHtmlAsync(string html, IEnumerable<string>? links = null, IEnumerable<string>? scripts = null);
+    /// <param name="options"></param>
+    Task<Stream> PdfStreamFromHtmlAsync(string html, IEnumerable<string>? links = null, IEnumerable<string>? scripts = null, PdfOptions? options = null);
 }
diff --git a/src/BootstrapBlazor/Services/IZipArchiveService.cs b/src/BootstrapBlazor/Services/IZipArchiveService.cs
index 2514f9b6c17..1bcdf2f33a6 100644
--- a/src/BootstrapBlazor/Services/IZipArchiveService.cs
+++ b/src/BootstrapBlazor/Services/IZipArchiveService.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the Apache 2.0 License
 // See the LICENSE file in the project root for more information.
 // Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone
@@ -16,39 +16,39 @@ public interface IZipArchiveService
     /// <summary>
     /// 将文件归档方法
     /// </summary>
-    /// <param name="files">要归档的文件集合</param>
+    /// <param name="entries">要归档的文件集合</param>
     /// <param name="options">归档配置</param>
     /// <returns>归档数据流</returns>
-    Task<Stream> ArchiveAsync(IEnumerable<string> files, ArchiveOptions? options = null);
+    Task<Stream> ArchiveAsync(IEnumerable<ArchiveEntry> entries, ArchiveOptions? options = null);
 
     /// <summary>
     /// 将文件归档方法
     /// </summary>
-    /// <param name="archiveFileName">归档文件</param>
-    /// <param name="files">要归档的文件集合</param>
+    /// <param name="archiveFile">归档文件</param>
+    /// <param name="entries">要归档的文件集合</param>
     /// <param name="options">归档配置</param>
-    Task ArchiveAsync(string archiveFileName, IEnumerable<string> files, ArchiveOptions? options = null);
+    Task ArchiveAsync(string archiveFile, IEnumerable<ArchiveEntry> entries, ArchiveOptions? options = null);
 
     /// <summary>
     /// 将指定目录归档方法
     /// </summary>
-    /// <param name="archiveFileName">归档文件</param>
+    /// <param name="archiveFile">归档文件</param>
     /// <param name="directoryName">要归档文件夹</param>
-    /// <param name="compressionLevel"></param>
-    /// <param name="includeBaseDirectory"></param>
-    /// <param name="encoding"></param>
-    /// <returns></returns>
-    Task ArchiveDirectory(string archiveFileName, string directoryName, CompressionLevel compressionLevel = CompressionLevel.Optimal, bool includeBaseDirectory = false, Encoding? encoding = null);
+    /// <param name="compressionLevel">压缩率</param>
+    /// <param name="includeBaseDirectory">是否包含本目录 默认 false</param>
+    /// <param name="encoding">编码方式 默认 null 内部使用 UTF-8</param>
+    /// <param name="token"></param>
+    Task ArchiveDirectoryAsync(string archiveFile, string directoryName, CompressionLevel compressionLevel = CompressionLevel.Optimal, bool includeBaseDirectory = false, Encoding? encoding = null, CancellationToken token = default);
 
     /// <summary>
-    /// 解压缩归档文件到指定文件夹
+    /// 解压缩归档文件到指定文件夹异步方法
     /// </summary>
     /// <param name="archiveFile">归档文件</param>
     /// <param name="destinationDirectoryName">解压缩文件夹</param>
     /// <param name="overwriteFiles">是否覆盖文件 默认 false 不覆盖</param>
     /// <param name="encoding">编码方式 默认 null 内部使用 UTF-8</param>
-    /// <returns></returns>
-    bool ExtractToDirectory(string archiveFile, string destinationDirectoryName, bool overwriteFiles = false, Encoding? encoding = null);
+    /// <param name="token"></param>
+    Task<bool> ExtractToDirectoryAsync(string archiveFile, string destinationDirectoryName, bool overwriteFiles = false, Encoding? encoding = null, CancellationToken token = default);
 
     /// <summary>
     /// 获得归档压缩文件中指定归档文件
@@ -57,6 +57,26 @@ public interface IZipArchiveService
     /// <param name="entryFile">解压缩文件</param>
     /// <param name="overwriteFiles">是否覆盖文件 默认 false 不覆盖</param>
     /// <param name="encoding">编码方式 默认 null 内部使用 UTF-8</param>
-    /// <returns></returns>
     ZipArchiveEntry? GetEntry(string archiveFile, string entryFile, bool overwriteFiles = false, Encoding? encoding = null);
 }
+
+/// <summary>
+/// 归档项实体类
+/// </summary>
+public readonly record struct ArchiveEntry
+{
+    /// <summary>
+    /// 获得 物理文件
+    /// </summary>
+    public string SourceFileName { get; init; }
+
+    /// <summary>
+    /// 获得 归档项
+    /// </summary>
+    public string EntryName { get; init; }
+
+    /// <summary>
+    /// 获得 压缩配置
+    /// </summary>
+    public CompressionLevel? CompressionLevel { get; init; }
+}
diff --git a/test/UnitTest/Components/IpAddressTest.cs b/test/UnitTest/Components/IpAddressTest.cs
index 55e143cefc6..02d6383a169 100644
--- a/test/UnitTest/Components/IpAddressTest.cs
+++ b/test/UnitTest/Components/IpAddressTest.cs
@@ -11,7 +11,7 @@ public class IpAddressTest : BootstrapBlazorTestBase
     public async Task IpAddress_Ok()
     {
         var cut = Context.RenderComponent<IpAddress>();
-        cut.Contains("ipaddress form-control");
+        cut.Contains("bb-ip form-control");
         Assert.Equal("0.0.0.0", cut.Instance.Value);
 
         var inputs = cut.FindAll(".ipv4-cell");
@@ -46,6 +46,14 @@ public async Task IpAddress_Value()
         Assert.Equal("123.123.123.123", cut.Instance.Value);
     }
 
+    [Fact]
+    public async Task TriggerUpdate_Ok()
+    {
+        var cut = Context.Render<IpAddress>();
+        await cut.InvokeAsync(() => cut.Instance.TriggerUpdate(192, 0, 1, 10));
+        Assert.Equal("192.0.1.10", cut.Instance.Value);
+    }
+
     [Fact]
     public void ValidateForm_Ok()
     {
diff --git a/test/UnitTest/Services/ZipArchiveServiceTest.cs b/test/UnitTest/Services/ZipArchiveServiceTest.cs
index b4dd9caae67..0e5bd852e74 100644
--- a/test/UnitTest/Services/ZipArchiveServiceTest.cs
+++ b/test/UnitTest/Services/ZipArchiveServiceTest.cs
@@ -1,8 +1,10 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the Apache 2.0 License
 // See the LICENSE file in the project root for more information.
 // Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone
 
+using System.IO.Compression;
+
 namespace UnitTest.Services;
 
 public class ZipArchiveServiceTest : BootstrapBlazorTestBase
@@ -22,10 +24,15 @@ public async Task Archive_Ok()
             using var fs = File.OpenWrite(f);
             fs.WriteByte(65);
         });
-        var stream = await archService.ArchiveAsync(files);
+        var items = files.Select(i => new ArchiveEntry()
+        {
+            SourceFileName = i,
+            EntryName = Path.GetFileName(i)
+        });
+        var stream = await archService.ArchiveAsync(items);
         Assert.NotNull(stream);
 
-        stream = await archService.ArchiveAsync(files, new ArchiveOptions()
+        stream = await archService.ArchiveAsync(items, new ArchiveOptions()
         {
             CompressionLevel = System.IO.Compression.CompressionLevel.Optimal,
             Encoding = System.Text.Encoding.UTF8,
@@ -35,7 +42,7 @@ public async Task Archive_Ok()
         Assert.NotNull(stream);
 
         var archiveFile = Path.Combine(root, "test.zip");
-        await archService.ArchiveAsync(archiveFile, files);
+        await archService.ArchiveAsync(archiveFile, items);
         Assert.True(File.Exists(archiveFile));
 
         // GetEntry
@@ -48,7 +55,15 @@ public async Task Archive_Ok()
         {
             Directory.Delete(destFolder, true);
         }
-        archService.ExtractToDirectory(archiveFile, destFolder);
+        await archService.ExtractToDirectoryAsync(archiveFile, destFolder);
+        Assert.True(Directory.Exists(destFolder));
+
+        // 删除文件夹
+        Directory.Delete(destFolder, true);
+        Assert.False(Directory.Exists(destFolder));
+
+        // 异步解压缩单元测试
+        await archService.ExtractToDirectoryAsync(archiveFile, destFolder);
         Assert.True(Directory.Exists(destFolder));
 
         // 打包文件夹单元测试
@@ -62,10 +77,83 @@ public async Task Archive_Ok()
         {
             File.Delete(destFile);
         }
-        await archService.ArchiveDirectory(destFile, destFolder, includeBaseDirectory: true);
+        await archService.ArchiveDirectoryAsync(destFile, destFolder, includeBaseDirectory: true);
         Assert.True(File.Exists(destFile));
         File.Delete(destFile);
 
-        await Assert.ThrowsAsync<ArgumentNullException>(() => archService.ArchiveDirectory(null!, destFolder, includeBaseDirectory: true));
+        await Assert.ThrowsAsync<ArgumentNullException>(() => archService.ArchiveDirectoryAsync(null!, destFolder, includeBaseDirectory: true));
+    }
+
+    [Fact]
+    public async Task ZipArchive_Ok()
+    {
+        var fileName = Path.Combine(AppContext.BaseDirectory, "test", "3.zip");
+        if (File.Exists(fileName))
+        {
+            File.Delete(fileName);
+        }
+
+        using var fs = File.OpenWrite(fileName);
+        using var zip = new ZipArchive(fs, ZipArchiveMode.Create);
+
+        var item = Path.Combine(AppContext.BaseDirectory, "test", "1.txt");
+        zip.CreateEntry("text/");
+        await zip.CreateEntryFromFileAsync(item, "text/1.txt");
+    }
+
+    [Fact]
+    public async Task ArchiveAsync_Ok()
+    {
+        var fileName = Path.Combine(AppContext.BaseDirectory, "archive_test", "test.zip");
+        if (File.Exists(fileName))
+        {
+            File.Delete(fileName);
+        }
+
+        var root = AppContext.BaseDirectory;
+        var files = new string[]
+        {
+            Path.Combine(root, "archive_test", "test1", "1.txt"),
+            Path.Combine(root, "archive_test", "test2", "2.txt")
+        };
+        files.ToList().ForEach(f =>
+        {
+            var folder = Path.GetDirectoryName(f);
+            if (!string.IsNullOrEmpty(folder) && !Directory.Exists(folder))
+            {
+                Directory.CreateDirectory(folder);
+            }
+            using var fs = File.OpenWrite(f);
+            fs.WriteByte(65);
+        });
+
+        var archService = Context.Services.GetRequiredService<IZipArchiveService>();
+        await archService.ArchiveAsync(fileName, new List<ArchiveEntry>()
+        {
+            new ArchiveEntry()
+            {
+                SourceFileName = files[0],
+                EntryName = "test1/test.log"
+            },
+            new ArchiveEntry()
+            {
+                SourceFileName = files[1],
+                EntryName = "test2/test.log",
+                CompressionLevel = CompressionLevel.Optimal
+            },
+            new ArchiveEntry()
+            {
+                SourceFileName = Path.Combine(AppContext.BaseDirectory, "archive_test", "test1"),
+                EntryName = "test1",
+            },
+            new ArchiveEntry()
+            {
+                SourceFileName = Path.Combine(AppContext.BaseDirectory, "archive_test", "test1"),
+                EntryName = "test2",
+                CompressionLevel = CompressionLevel.Optimal
+            }
+        });
+
+        Assert.True(File.Exists(fileName));
     }
 }