Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/BootstrapBlazor/BootstrapBlazor.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<Version>9.9.2-beta03</Version>
<Version>9.9.2-beta04</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
40 changes: 21 additions & 19 deletions src/BootstrapBlazor/Components/EditorForm/EditorForm.razor
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,35 @@
@typeparam TModel
@inherits BootstrapComponentBase

<div class="@ClassString">
<div @attributes="AdditionalAttributes" class="bb-editor">
<CascadingValue Value="@_editorItems" IsFixed="false">
@FieldItems?.Invoke(Model)
</CascadingValue>
<CascadingValue Value="this" Name="EditorForm">
@if (ShowUnsetGroupItemsOnTop)
{
if (UnsetGroupItems.Any())
{
@RenderUnsetGroupItems
}
@foreach (var g in GroupItems)
<div class="form-body">
@if (ShowUnsetGroupItemsOnTop)
{
@RenderGroupItems(g)
}
}
else
{
@foreach (var g in GroupItems)
{
@RenderGroupItems(g)
if (UnsetGroupItems.Any())
{
@RenderUnsetGroupItems
}
@foreach (var g in GroupItems)
{
@RenderGroupItems(g)
}
}
if (UnsetGroupItems.Any())
else
{
@RenderUnsetGroupItems
@foreach (var g in GroupItems)
{
@RenderGroupItems(g)
}
if (UnsetGroupItems.Any())
{
@RenderUnsetGroupItems
}
}
}
</div>
</CascadingValue>

@if (Buttons != null)
Expand Down
6 changes: 0 additions & 6 deletions src/BootstrapBlazor/Components/EditorForm/EditorForm.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,9 @@ 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")
.AddClassFromAttributes(AdditionalAttributes)
.Build();

/// <summary>
/// 支持每行多少个控件功能
/// </summary>
Expand Down
1 change: 1 addition & 0 deletions src/BootstrapBlazor/Components/Table/Table.razor.scss
Original file line number Diff line number Diff line change
Expand Up @@ -921,6 +921,7 @@ 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 {
Expand Down
Loading