Merge branch 'main' into feat-link

Author: ArgoZhang

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