diff --git a/src/BootstrapBlazor.Shared/Pages/Samples/EditDialogs.razor b/src/BootstrapBlazor.Shared/Pages/Samples/EditDialogs.razor
index 464c1156cd940632c7f23f4ed78825f047d918cd..b50651db83f93012bcda02da219b04609d9a31de 100644
--- a/src/BootstrapBlazor.Shared/Pages/Samples/EditDialogs.razor
+++ b/src/BootstrapBlazor.Shared/Pages/Samples/EditDialogs.razor
@@ -11,7 +11,8 @@
-
+
+
diff --git a/src/BootstrapBlazor.Shared/Pages/Samples/EditDialogs.razor.cs b/src/BootstrapBlazor.Shared/Pages/Samples/EditDialogs.razor.cs
index 2776a03a4d62b48a2941cfc605ed0d27e602df78..0702e0c0cbf97e8dab337d70b7c7a64127f5fa95 100644
--- a/src/BootstrapBlazor.Shared/Pages/Samples/EditDialogs.razor.cs
+++ b/src/BootstrapBlazor.Shared/Pages/Samples/EditDialogs.razor.cs
@@ -64,6 +64,35 @@ namespace BootstrapBlazor.Shared.Pages
await DialogService.ShowEditDialog(option);
}
+ private async Task ShowAlignDialog()
+ {
+ var items = EditorItem.GenerateEditorItems();
+ var item = items.First(i => i.GetFieldName() == nameof(Foo.Hobby));
+ item.Data = Foo.GenerateHobbys(Localizer);
+
+ var option = new EditDialogOption()
+ {
+ Title = "编辑对话框",
+ Model = Model,
+ Items = items,
+ ItemsPerRow = 2,
+ RowType = RowType.Inline,
+ LabelAlign = Alignment.Right,
+ OnCloseAsync = () =>
+ {
+ Trace.Log("关闭按钮被点击");
+ return Task.CompletedTask;
+ },
+ OnSaveAsync = context =>
+ {
+ Trace.Log("保存按钮被点击");
+ return Task.FromResult(true);
+ }
+ };
+
+ await DialogService.ShowEditDialog(option);
+ }
+
///
/// 获得属性方法
///
@@ -119,6 +148,27 @@ namespace BootstrapBlazor.Shared.Pages
Type = "Func",
ValueList = " — ",
DefaultValue = " — "
+ },
+ new AttributeItem() {
+ Name = "ItemsPerRow",
+ Description = "每行显示组件数量",
+ Type = "int?",
+ ValueList = " — ",
+ DefaultValue = " — "
+ },
+ new AttributeItem() {
+ Name = "RowType",
+ Description = "设置组件布局方式",
+ Type = "RowType",
+ ValueList = "Row|Inline",
+ DefaultValue = "Row"
+ },
+ new AttributeItem() {
+ Name = "LabelAlign",
+ Description = "Inline 布局模式下标签对齐方式",
+ Type = "Alignment",
+ ValueList = "None|Left|Center|Right",
+ DefaultValue = "None"
}
};
}
diff --git a/src/BootstrapBlazor.Shared/Pages/Samples/EditorForms.razor b/src/BootstrapBlazor.Shared/Pages/Samples/EditorForms.razor
index 05bd62e4c887a660544f8d211952ad3e5101e764..e1d0d8e81eb923e57c3c193560d13a5154d73007 100644
--- a/src/BootstrapBlazor.Shared/Pages/Samples/EditorForms.razor
+++ b/src/BootstrapBlazor.Shared/Pages/Samples/EditorForms.razor
@@ -117,11 +117,11 @@
- Inline 布局模式下通过设置 TextAlign="Alignment.Right" 使表单内标签右对齐
+ Inline 布局模式下通过设置 LabelAlign="Alignment.Right" 使表单内标签右对齐
Buttons 模板内可嵌套 div 并设置样式 text-end 使按钮右侧对齐
-
+
diff --git a/src/BootstrapBlazor.Shared/Pages/Samples/EditorForms.razor.cs b/src/BootstrapBlazor.Shared/Pages/Samples/EditorForms.razor.cs
index f0cad0345f472f429662360c65d4e4644b6e787e..90c242d129eb7ba59d367422271771593425791e 100644
--- a/src/BootstrapBlazor.Shared/Pages/Samples/EditorForms.razor.cs
+++ b/src/BootstrapBlazor.Shared/Pages/Samples/EditorForms.razor.cs
@@ -114,7 +114,7 @@ namespace BootstrapBlazor.Shared.Pages
DefaultValue = "Row"
},
new AttributeItem() {
- Name = "TextAlign",
+ Name = "LabelAlign",
Description = "Inline 布局模式下标签对齐方式",
Type = "Alignment",
ValueList = "None|Left|Center|Right",
diff --git a/src/BootstrapBlazor/Components/Dialog/DialogBase.cs b/src/BootstrapBlazor/Components/Dialog/DialogBase.cs
index 30f509099dc2b0f1455ebb1527da831845848287..1d123b05e6a1d3eac63fe6984c50899bade89f8d 100644
--- a/src/BootstrapBlazor/Components/Dialog/DialogBase.cs
+++ b/src/BootstrapBlazor/Components/Dialog/DialogBase.cs
@@ -51,6 +51,12 @@ namespace BootstrapBlazor.Components
[Parameter]
public RowType RowType { get; set; }
+ ///
+ /// 获得/设置 设置 Inline 模式下标签对齐方式 默认 None 等效于 Left 左对齐
+ ///
+ [Parameter]
+ public Alignment LabelAlign { get; set; }
+
///
/// OnInitialized 方法
///
diff --git a/src/BootstrapBlazor/Components/Dialog/DialogService.cs b/src/BootstrapBlazor/Components/Dialog/DialogService.cs
index 70a42ec79e35b3e60fea15c272a2affc2123c7a1..4ceb3c670d19f81f486197bdb48184548f78255c 100644
--- a/src/BootstrapBlazor/Components/Dialog/DialogService.cs
+++ b/src/BootstrapBlazor/Components/Dialog/DialogService.cs
@@ -133,7 +133,9 @@ namespace BootstrapBlazor.Components
}
}
})),
- new(nameof(RowType), option.RowType)
+ new(nameof(EditDialog.RowType), option.RowType),
+ new(nameof(EditDialog.LabelAlign), option.LabelAlign)
+
};
if (option.ItemsPerRow.HasValue)
diff --git a/src/BootstrapBlazor/Components/Dialog/EditDialog.razor b/src/BootstrapBlazor/Components/Dialog/EditDialog.razor
index 1af629adf69e090e781c9ca69d42fb1366365d45..cc842f67b961683132898b39c67cf744d3b053a9 100644
--- a/src/BootstrapBlazor/Components/Dialog/EditDialog.razor
+++ b/src/BootstrapBlazor/Components/Dialog/EditDialog.razor
@@ -11,7 +11,7 @@
else
{
-
+
@RenderFooter
diff --git a/src/BootstrapBlazor/Components/Dialog/EditDialogOption.cs b/src/BootstrapBlazor/Components/Dialog/EditDialogOption.cs
index 4bd1788e634f796d0b8161735174c16412b8e9f7..df43b94792414682f43e9b31ad52e0edfb9f2c91 100644
--- a/src/BootstrapBlazor/Components/Dialog/EditDialogOption.cs
+++ b/src/BootstrapBlazor/Components/Dialog/EditDialogOption.cs
@@ -42,6 +42,11 @@ namespace BootstrapBlazor.Components
///
public RowType RowType { get; set; }
+ ///
+ /// 获得/设置 设置 Inline 模式下标签对齐方式 默认 None 等效于 Left 左对齐
+ ///
+ public Alignment LabelAlign { get; set; }
+
///
/// 获得/设置 查询时是否显示正在加载中动画 默认为 false
///
diff --git a/src/BootstrapBlazor/Components/EditorForm/EditorForm.razor.cs b/src/BootstrapBlazor/Components/EditorForm/EditorForm.razor.cs
index 6c07e3abd710d4796be4196b45b0a58bd7a0a9a5..e51cc327ec457c437f8d5797903ce70b08017a4c 100644
--- a/src/BootstrapBlazor/Components/EditorForm/EditorForm.razor.cs
+++ b/src/BootstrapBlazor/Components/EditorForm/EditorForm.razor.cs
@@ -29,7 +29,7 @@ namespace BootstrapBlazor.Components
private string? FormClassString => CssBuilder.Default("row g-3")
.AddClass("form-inline", RowType == RowType.Inline)
- .AddClass($"is-{TextAlign.ToDescriptionString()}", RowType == RowType.Inline && TextAlign != Alignment.None)
+ .AddClass($"is-{LabelAlign.ToDescriptionString()}", RowType == RowType.Inline && LabelAlign != Alignment.None)
.Build();
///
@@ -48,7 +48,7 @@ namespace BootstrapBlazor.Components
/// 获得/设置 设置 Inline 模式下标签对齐方式 默认 None 等效于 Left 左对齐
///
[Parameter]
- public Alignment TextAlign { get; set; }
+ public Alignment LabelAlign { get; set; }
///
/// 获得/设置 列模板