Merge branch 'main' into doc-home

ArgoZhang · ArgoZhang · commit aa1e770c9b1d · 2025-08-04T16:57:44.000+08:00
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Buttons.razor b/src/BootstrapBlazor.Server/Components/Samples/Buttons.razor
@@ -152,6 +152,10 @@
     </div>
 </DemoBlock>
 
+<DemoBlock Title="@Localizer["ToggleButton"]" Introduction="@Localizer["ToggleIntroduction"]" Name="Toggle">
+    <ToggleButton Text="Toggle" Color="Color.Danger"></ToggleButton>
+</DemoBlock>
+
 <AttributeTable Items="@GetAttributes()" />
 
 <EventTable Items="@GetEvents()" />
diff --git a/src/BootstrapBlazor.Server/Components/Samples/SortableLists.razor b/src/BootstrapBlazor.Server/Components/Samples/SortableLists.razor
@@ -187,7 +187,7 @@
            Introduction="@Localizer["SortableListTableIntro"]"
            Name="Table">
     <SortableList Option="_optionTable" OnUpdate="OnUpdateTable">
-        <Table TItem="Foo" Items="@Items" IsStriped="true" ShowLineNo="true">
+        <Table TItem="Foo" Items="@Items" IsStriped="true" ShowLineNo="true" RenderMode="TableRenderMode.Table">
             <TableColumns>
                 <TableColumn @bind-Field="@context.DateTime" Width="180" />
                 <TableColumn @bind-Field="@context.Name" />
diff --git a/src/BootstrapBlazor.Server/Locales/en-US.json b/src/BootstrapBlazor.Server/Locales/en-US.json
@@ -2211,7 +2211,9 @@
     "TooltipText": "Button",
     "TooltipTitle": "Tooltip",
     "TooltipIntro": "Set <code>TooltipText</code> <code>TooltipPlacement</code> <code>TooltipTrigger</code> shortcut button prompt bar information, position, and triggering method. For more functions, please use the <code>Tooltip</code> component to implement. In this example, the second button is in the <b>disabled</b> state, and the prompt bar is still available",
-    "TooltipDisabledText": "Disabled"
+    "TooltipDisabledText": "Disabled",
+    "ToggleButton": "Toggle",
+    "ToggleIntroduction": "Get the current button <code>Toggle</code> state by setting the <code>IsActiveChanged</code> or <code>OnToggleAsync</code> callback method"
   },
   "BootstrapBlazor.Server.Components.Samples.PulseButtons": {
     "Block1Title": "Basic usage",
diff --git a/src/BootstrapBlazor.Server/Locales/zh-CN.json b/src/BootstrapBlazor.Server/Locales/zh-CN.json
@@ -2211,7 +2211,9 @@
     "TooltipText": "按钮",
     "TooltipTitle": "按钮提示栏",
     "TooltipIntro": "通过设置 <code>TooltipText</code> <code>TooltipPlacement</code> <code>TooltipTrigger</code> 快捷设置按钮提示栏信息、位置、触发方式，更多功能请使用 <code>Tooltip</code> 组件实现，本例中第二个按钮是 <b>禁用</b> 状态，提示栏仍然可用",
-    "TooltipDisabledText": "禁用按钮"
+    "TooltipDisabledText": "禁用按钮",
+    "ToggleButton": "状态切换按钮",
+    "ToggleIntroduction": "通过设置 <code>IsActiveChanged</code> 或者 <code>OnToggleAsync</code> 回调方法获得当前按钮 <code>Toggle</code> 状态"
   },
   "BootstrapBlazor.Server.Components.Samples.PulseButtons": {
     "Block1Title": "基础用法",
diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>9.9.1-beta03</Version>
+    <Version>9.9.1-beta05</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/BootstrapBlazor/Components/Button/ToggleButton.razor b/src/BootstrapBlazor/Components/Button/ToggleButton.razor
@@ -0,0 +1,23 @@
+﻿@namespace BootstrapBlazor.Components
+@inherits ButtonBase
+
+<button @attributes="@AdditionalAttributes" @onclick="@OnClickButton" id="@Id" class="@ToggleClassName" disabled="@Disabled"
+        role="button" data-bs-placement="@PlacementString" data-bs-trigger="@TriggerString"
+        aria-disabled="@DisabledString" tabindex="@Tab" data-bs-toggle="button"
+        @onclick:stopPropagation="@StopPropagation">
+    @if(IsAsyncLoading)
+    {
+        <i class="@LoadingIcon"></i>
+    }
+    else if (!string.IsNullOrEmpty(Icon))
+    {
+        <i class="@Icon"></i>
+    }
+    @if (!string.IsNullOrEmpty(Text))
+    {
+        <span>@Text</span>
+    }
+    <CascadingValue Value="this" IsFixed="true">
+        @ChildContent
+    </CascadingValue>
+</button>
diff --git a/src/BootstrapBlazor/Components/Button/ToggleButton.razor.cs b/src/BootstrapBlazor/Components/Button/ToggleButton.razor.cs
@@ -0,0 +1,81 @@
+﻿// 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>
+/// Toggle Button 按钮组件
+/// </summary>
+public partial class ToggleButton
+{
+    /// <summary>
+    /// 获得/设置 状态切换回调方法
+    /// </summary>
+    [Parameter]
+    public Func<bool, Task>? OnToggleAsync { get; set; }
+
+    /// <summary>
+    /// 获得/设置 当前状态是否为激活状态 默认 false
+    /// </summary>
+    [Parameter]
+    public bool IsActive { get; set; }
+
+    /// <summary>
+    /// 获得/设置 激活状态回调方法
+    /// </summary>
+    [Parameter]
+    public EventCallback<bool> IsActiveChanged { get; set; }
+
+    private string? ToggleClassName => CssBuilder.Default(ClassName)
+        .AddClass("active", IsActive)
+        .Build();
+
+    private async Task OnClickButton()
+    {
+        if (IsAsync)
+        {
+            IsAsyncLoading = true;
+            IsDisabled = true;
+        }
+
+        await HandlerClick();
+
+        // 恢复按钮
+        if (IsAsync)
+        {
+            IsDisabled = IsKeepDisabled;
+            IsAsyncLoading = false;
+        }
+    }
+
+    private async Task HandlerClick()
+    {
+        IsActive = !IsActive;
+        if (OnClickWithoutRender != null)
+        {
+            if (!IsAsync)
+            {
+                IsNotRender = true;
+            }
+
+            await OnClickWithoutRender();
+        }
+
+        if (OnClick.HasDelegate)
+        {
+            await OnClick.InvokeAsync();
+        }
+
+        if (IsActiveChanged.HasDelegate)
+        {
+            await IsActiveChanged.InvokeAsync(IsActive);
+        }
+
+        if (OnToggleAsync != null)
+        {
+            await OnToggleAsync(IsActive);
+        }
+    }
+}
diff --git a/src/BootstrapBlazor/Components/SortableList/ISortableList.cs b/src/BootstrapBlazor/Components/SortableList/ISortableList.cs
@@ -0,0 +1,14 @@
+﻿// 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>
+/// SortableList 组件接口
+/// </summary>
+public interface ISortableList
+{
+
+}
diff --git a/src/BootstrapBlazor/Components/Table/Table.razor b/src/BootstrapBlazor/Components/Table/Table.razor
@@ -243,7 +243,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"
@@ -692,7 +692,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
@@ -198,6 +198,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
@@ -780,6 +786,9 @@ public async Task ExpandDetailRow(TItem item)
     [CascadingParameter]
     private ContextMenuZone? ContextMenuZone { get; set; }
 
+    [CascadingParameter]
+    private ISortableList? SortableList { get; set; }
+
     [Inject]
     [NotNull]
     private IIconTheme? IconTheme { get; set; }
@@ -1681,6 +1690,8 @@ private void OnTouchEnd()
         TouchStart = false;
     }
 
+    private object? GetKeyByITem(TItem item) => SortableList != null ? item : null; //OnGetRowKey?.Invoke(item);
+
     /// <summary>
     /// Dispose 方法
     /// </summary>
diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.scss b/src/BootstrapBlazor/Components/Table/Table.razor.scss
@@ -963,3 +963,7 @@ form .table .table-cell > textarea {
         border-bottom-color: var(--bs-primary);
     }
 }
+
+.bb-sortable tr {
+    cursor: pointer;
+}
diff --git a/src/BootstrapBlazor/Components/ValidateForm/BootstrapBlazorDataAnnotationsValidator.cs b/src/BootstrapBlazor/Components/ValidateForm/BootstrapBlazorDataAnnotationsValidator.cs
@@ -10,7 +10,7 @@ namespace BootstrapBlazor.Components;
 /// <summary>
 /// BootstrapBlazorDataAnnotationsValidator 验证组件
 /// </summary>
-public class BootstrapBlazorDataAnnotationsValidator : ComponentBase
+public class BootstrapBlazorDataAnnotationsValidator : ComponentBase, IDisposable
 {
     /// <summary>
     /// 获得/设置 当前编辑数据上下文
@@ -23,30 +23,110 @@ public class BootstrapBlazorDataAnnotationsValidator : ComponentBase
     /// 获得/设置 当前编辑窗体上下文
     /// </summary>
     [CascadingParameter]
+    [NotNull]
     private ValidateForm? ValidateForm { get; set; }
 
     [Inject]
     [NotNull]
     private IServiceProvider? Provider { get; set; }
 
+    [NotNull]
+    private ValidationMessageStore? _message = null;
+
     /// <summary>
     /// 初始化方法
     /// </summary>
     protected override void OnInitialized()
     {
         if (ValidateForm == null)
         {
-            throw new InvalidOperationException($"{nameof(Components.BootstrapBlazorDataAnnotationsValidator)} requires a cascading " +
-                $"parameter of type {nameof(Components.ValidateForm)}. For example, you can use {nameof(Components.BootstrapBlazorDataAnnotationsValidator)} " +
-                $"inside an {nameof(Components.ValidateForm)}.");
+            throw new InvalidOperationException($"{nameof(BootstrapBlazorDataAnnotationsValidator)} requires a cascading parameter of type {nameof(Components.ValidateForm)}. For example, you can use {nameof(BootstrapBlazorDataAnnotationsValidator)} inside an {nameof(Components.ValidateForm)}.");
         }
 
-        CurrentEditContext.AddEditContextDataAnnotationsValidation(ValidateForm, Provider);
+        _message = new ValidationMessageStore(CurrentEditContext);
+        AddEditContextDataAnnotationsValidation();
     }
 
     /// <summary>
     /// 手动验证表单方法
     /// </summary>
     /// <returns></returns>
     internal bool Validate() => CurrentEditContext.Validate();
+
+    private void AddEditContextDataAnnotationsValidation()
+    {
+        CurrentEditContext.OnValidationRequested += OnValidationRequested;
+        CurrentEditContext.OnFieldChanged += OnFieldChanged;
+    }
+
+    private void RemoveEditContextDataAnnotationsValidation()
+    {
+        CurrentEditContext.OnValidationRequested -= OnValidationRequested;
+        CurrentEditContext.OnFieldChanged -= OnFieldChanged;
+    }
+
+    private void OnValidationRequested(object? sender, ValidationRequestedEventArgs args)
+    {
+        _ = ValidateModel(CurrentEditContext, _message, Provider);
+    }
+
+    private void OnFieldChanged(object? sender, FieldChangedEventArgs args)
+    {
+        _ = ValidateField(CurrentEditContext, _message, args.FieldIdentifier, Provider);
+    }
+
+    private async Task ValidateModel(EditContext editContext, ValidationMessageStore messages, IServiceProvider provider)
+    {
+        var validationContext = new ValidationContext(editContext.Model, provider, null);
+        var validationResults = new List<ValidationResult>();
+        await ValidateForm.ValidateObject(validationContext, validationResults);
+
+        messages.Clear();
+        foreach (var validationResult in validationResults.Where(v => !string.IsNullOrEmpty(v.ErrorMessage)))
+        {
+            foreach (var memberName in validationResult.MemberNames)
+            {
+                if (!string.IsNullOrEmpty(memberName))
+                {
+                    messages.Add(editContext.Field(memberName), validationResult.ErrorMessage!);
+                }
+            }
+        }
+        editContext.NotifyValidationStateChanged();
+    }
+
+    private async Task ValidateField(EditContext editContext, ValidationMessageStore messages, FieldIdentifier field, IServiceProvider provider)
+    {
+        // 获取验证消息
+        var validationResults = new List<ValidationResult>();
+        var validationContext = new ValidationContext(field.Model, provider, null)
+        {
+            MemberName = field.FieldName,
+            DisplayName = field.GetDisplayName()
+        };
+
+        await ValidateForm.ValidateFieldAsync(validationContext, validationResults);
+
+        messages.Clear(field);
+        messages.Add(field, validationResults.Where(v => !string.IsNullOrEmpty(v.ErrorMessage)).Select(result => result.ErrorMessage!));
+
+        editContext.NotifyValidationStateChanged();
+    }
+
+    private void Dispose(bool disposing)
+    {
+        if (disposing)
+        {
+            RemoveEditContextDataAnnotationsValidation();
+        }
+    }
+
+    /// <summary>
+    /// <inheritdoc/>
+    /// </summary>
+    public void Dispose()
+    {
+        Dispose(true);
+        GC.SuppressFinalize(this);
+    }
 }
diff --git a/src/BootstrapBlazor/Extensions/BootstrapBlazorEditContextDataAnnotationsExtensions.cs b/src/BootstrapBlazor/Extensions/BootstrapBlazorEditContextDataAnnotationsExtensions.cs
diff --git a/test/UnitTest/Components/ButtonTest.cs b/test/UnitTest/Components/ButtonTest.cs
diff --git a/test/UnitTest/Components/TableTest.cs b/test/UnitTest/Components/TableTest.cs
