wip: test pr

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>

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

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();

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)
     }

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)
 {

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();
+    }
 }

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);
+        });
     })
 }
 

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;

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)"

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>

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))
         {

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">

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>

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; }
+}

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);
 }