Merge branch 'main' of https://github.com/dotnetcore/BootstrapBlazor

Author: actions-user

src/BootstrapBlazor.Server/Components/Pages/Index.razor

@@ -12,7 +12,9 @@
                     @Localizer["Support"]
                 </span>
             </a>
-            <img src="./favicon.png" alt="bootstrap-blazor" class="bb-logo d-sm-block mx-auto my-5">
+            <div class="bb-logo d-sm-block mx-auto my-5">
+                <img src="./favicon.png" alt="bootstrap-blazor">
+            </div>
             <h1 class="mb-3 fw-semibold">@Localizer["Title"]</h1>
             <p class="lead mb-4">
                 @Localizer["SubTitle"]

src/BootstrapBlazor.Server/Components/Pages/Index.razor.css

@@ -30,10 +30,53 @@
         }
 
     .bd-masthead .bb-logo {
+        --bb-btn-space: 4px;
         width: 200px;
         height: 200px;
+        position: relative;
+        overflow: hidden;
+        border-radius: 30px;
     }
 
+        .bd-masthead .bb-logo img {
+            width: calc(100% - 2 * var(--bb-btn-space));
+            height: calc(100% - 2 * var(--bb-btn-space));
+            position: absolute;
+            left: var(--bb-btn-space);
+            top: var(--bb-btn-space);
+        }
+
+.bb-logo:before {
+    content: '';
+    position: absolute;
+    inset: 0;
+    background-color: #5a23c8;
+    z-index: -2;
+}
+
+.bb-logo:after {
+    content: '';
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    width: 68%;
+    height: 68%;
+    background-image: linear-gradient(to bottom, #3f51b1 0%, #5a55ae 13%, #7b5fac 25%, #8f6aae 38%, #a86aa4 50%, #cc6b8e 62%, #f18271 75%, #f3a469 87%, #f7c978 100%);
+    transform-origin: left top;
+    animation: rotate 5s linear infinite;
+    z-index: -1;
+}
+
+@keyframes rotate {
+    0% {
+        transform: rotate(0deg);
+    }
+
+    100% {
+        transform: rotate(360deg);
+    }
+}
+
 .bd-gutter {
     --bs-gutter-x: 3rem;
 }

src/BootstrapBlazor/BootstrapBlazor.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>9.9.2-beta03</Version>
+    <Version>9.9.2-beta05</Version>
   </PropertyGroup>
 
   <ItemGroup>

src/BootstrapBlazor/Components/Button/Button.razor.cs

@@ -65,24 +65,4 @@ protected virtual async Task OnClickButton()
     /// </summary>
     /// <returns></returns>
     public ValueTask FocusAsync() => ButtonElement.FocusAsync();
-
-    /// <summary>
-    /// 处理点击方法
-    /// </summary>
-    /// <returns></returns>
-    protected virtual async Task HandlerClick()
-    {
-        if (OnClickWithoutRender != null)
-        {
-            if (!IsAsync)
-            {
-                IsNotRender = true;
-            }
-            await OnClickWithoutRender();
-        }
-        if (OnClick.HasDelegate)
-        {
-            await OnClick.InvokeAsync();
-        }
-    }
 }

src/BootstrapBlazor/Components/Button/ButtonBase.cs

@@ -231,6 +231,26 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
         }
     }
 
+    /// <summary>
+    /// 处理点击方法
+    /// </summary>
+    /// <returns></returns>
+    protected virtual async Task HandlerClick()
+    {
+        if (OnClickWithoutRender != null)
+        {
+            if (!IsAsync)
+            {
+                IsNotRender = true;
+            }
+            await OnClickWithoutRender();
+        }
+        if (OnClick.HasDelegate)
+        {
+            await OnClick.InvokeAsync();
+        }
+    }
+
     /// <summary>
     /// 设置按钮是否可用状态
     /// </summary>

src/BootstrapBlazor/Components/Button/LinkButton.cs

@@ -5,14 +5,13 @@
 
 using Microsoft.AspNetCore.Components.Rendering;
 using Microsoft.AspNetCore.Components.Web;
-using System;
 
 namespace BootstrapBlazor.Components;
 
 /// <summary>
 /// LinkButton 组件
 /// </summary>
-public sealed class LinkButton : ButtonBase
+public class LinkButton : ButtonBase
 {
     /// <summary>
     /// 获得/设置 Url 默认为 #
@@ -120,14 +119,19 @@ private RenderFragment AddImage() => builder =>
 
     private async Task OnClickButton()
     {
-        if (OnClickWithoutRender != null)
+        if (IsAsync)
         {
-            await OnClickWithoutRender();
+            IsAsyncLoading = true;
+            IsDisabled = true;
         }
 
-        if (OnClick.HasDelegate)
+        await HandlerClick();
+
+        // 恢复按钮
+        if (IsAsync)
         {
-            await OnClick.InvokeAsync();
+            IsDisabled = IsKeepDisabled;
+            IsAsyncLoading = false;
         }
     }
 }

src/BootstrapBlazor/Components/EditorForm/EditorForm.razor

@@ -2,41 +2,43 @@
 @typeparam TModel
 @inherits BootstrapComponentBase
 
-<div class="@ClassString">
+<div @attributes="AdditionalAttributes" class="@ClassString">
     <CascadingValue Value="@_editorItems" IsFixed="false">
         @FieldItems?.Invoke(Model)
     </CascadingValue>
     <CascadingValue Value="this" Name="EditorForm">
-        @if (ShowUnsetGroupItemsOnTop)
-        {
-            if (UnsetGroupItems.Any())
+        <div class="form-body">
+            @if (ShowUnsetGroupItemsOnTop)
             {
-                @RenderUnsetGroupItems
+                if (UnsetGroupItems.Any())
+                {
+                    @RenderUnsetGroupItems
+                }
+                @foreach (var g in GroupItems)
+                {
+                    @RenderGroupItems(g)
+                }
             }
-            @foreach (var g in GroupItems)
+            else
             {
-                @RenderGroupItems(g)
+                @foreach (var g in GroupItems)
+                {
+                    @RenderGroupItems(g)
+                }
+                if (UnsetGroupItems.Any())
+                {
+                    @RenderUnsetGroupItems
+                }
             }
-        }
-        else
+        </div>
+
+        @if (Buttons != null)
         {
-            @foreach (var g in GroupItems)
-            {
-                @RenderGroupItems(g)
-            }
-            if (UnsetGroupItems.Any())
-            {
-                @RenderUnsetGroupItems
-            }
+            <div class="bb-editor-footer form-footer">
+                @Buttons
+            </div>
         }
     </CascadingValue>
-
-    @if (Buttons != null)
-    {
-        <div class="bb-editor-footer form-footer">
-            @Buttons
-        </div>
-    }
 </div>
 
 @code

src/BootstrapBlazor/Components/EditorForm/EditorForm.razor.cs

@@ -11,12 +11,10 @@ namespace BootstrapBlazor.Components;
 /// <summary>
 /// 编辑表单基类
 /// </summary>
-#if NET6_0_OR_GREATER
 [CascadingTypeParameter(nameof(TModel))]
-#endif
 public partial class EditorForm<TModel> : IShowLabel
 {
-    private string? ClassString => CssBuilder.Default("bb-editor form-body")
+    private string? ClassString => CssBuilder.Default("bb-editor")
         .AddClassFromAttributes(AdditionalAttributes)
         .Build();
 

src/BootstrapBlazor/Components/EditorForm/EditorForm.razor.scss

@@ -1,4 +1,4 @@
-.bb-editor {
+.bb-editor {
     position: relative;
 
     .ef-loading {
@@ -9,8 +9,4 @@
         bottom: 0;
         background-color: var(--bs-body-bg);
     }
-
-    .bb-editor-footer {
-        margin-block-start: 1rem;
-    }
 }

src/BootstrapBlazor/Components/Table/Table.razor.scss

@@ -921,11 +921,12 @@ form .table .table-cell > textarea {
     overflow-y: auto;
     overflow-x: hidden;
     padding: 1rem;
+    max-height: calc(100vh - 133px);
 }
 
 .modal-dialog-table.modal-dialog-scrollable .modal-body .form-footer {
     margin: 0;
-    padding: 1rem;
+    padding: 0.5rem 1rem;
 }
 
 .table-wrap thead th .table-cell .table-text {