diff --git a/src/BootstrapBlazor.Server/Components/Samples/Dropdowns.razor b/src/BootstrapBlazor.Server/Components/Samples/Dropdowns.razor index b69af811212..1f492cefbf7 100644 --- a/src/BootstrapBlazor.Server/Components/Samples/Dropdowns.razor +++ b/src/BootstrapBlazor.Server/Components/Samples/Dropdowns.razor @@ -31,6 +31,17 @@ + + + + + +
@context.Text
+
+
+
+
+
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Dropdowns.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/Dropdowns.razor.cs index 15b016ab120..bfdc9ab61fb 100644 --- a/src/BootstrapBlazor.Server/Components/Samples/Dropdowns.razor.cs +++ b/src/BootstrapBlazor.Server/Components/Samples/Dropdowns.razor.cs @@ -18,6 +18,8 @@ public sealed partial class Dropdowns private List Items { get; set; } = []; + private List ItemTemplateList { get; set; } = []; + /// /// ShowMessage /// @@ -41,6 +43,13 @@ protected override void OnInitialized() new SelectedItem() { Text=Localizer["Item3"], Value="2"}, ]; + ItemTemplateList = + [ + new SelectedItem() { Text=Localizer["Item1"], Value="0"}, + new SelectedItem() { Text=Localizer["Item2"], Value="1"}, + new SelectedItem() { Text=Localizer["Item3"], Value="2"}, + ]; + Foos = [ new SelectedItem{ Text=Localizer["Item1"], Value="0"}, diff --git a/src/BootstrapBlazor.Server/Locales/en-US.json b/src/BootstrapBlazor.Server/Locales/en-US.json index 8e433e80ae7..837a6d31bc3 100644 --- a/src/BootstrapBlazor.Server/Locales/en-US.json +++ b/src/BootstrapBlazor.Server/Locales/en-US.json @@ -1813,7 +1813,9 @@ "DropdownCascadeItem5": "Chaoyang", "DropdownCascadeItem6": "Haidian", "DropdownCascadeItem7": "Jingan", - "DropdownCascadeItem8": "Huangpu" + "DropdownCascadeItem8": "Huangpu", + "DropdownItemTemplateTitle": "Item Template", + "DropdownItemTemplateIntro": "By setting ItemTemplate, you can customize the content displayed in the drop-down item. In this example, the Tooltip component is used to add a tooltip function when the mouse is hovered." }, "BootstrapBlazor.Server.Components.Samples.GoTops": { "Title": "GoTop", diff --git a/src/BootstrapBlazor.Server/Locales/zh-CN.json b/src/BootstrapBlazor.Server/Locales/zh-CN.json index 03b07acd1cc..005f2dfc7f7 100644 --- a/src/BootstrapBlazor.Server/Locales/zh-CN.json +++ b/src/BootstrapBlazor.Server/Locales/zh-CN.json @@ -1813,7 +1813,9 @@ "DropdownCascadeItem5": "朝阳区", "DropdownCascadeItem6": "海淀区", "DropdownCascadeItem7": "静安区", - "DropdownCascadeItem8": "黄浦区" + "DropdownCascadeItem8": "黄浦区", + "DropdownItemTemplateTitle": "下拉项模板", + "DropdownItemTemplateIntro": "通过设置 ItemTemplate 可以自定义下拉项显示内容,本例中通过自定义模板使用 Tooltip 组件增加鼠标悬浮是显示提示功能" }, "BootstrapBlazor.Server.Components.Samples.GoTops": { "Title": "GoTop 返回顶端组件", diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj index b05de0d11d9..796e6d7247d 100644 --- a/src/BootstrapBlazor/BootstrapBlazor.csproj +++ b/src/BootstrapBlazor/BootstrapBlazor.csproj @@ -1,7 +1,7 @@ - 9.3.1-beta17 + 9.3.1-beta18 diff --git a/src/BootstrapBlazor/Components/Dropdown/Dropdown.razor b/src/BootstrapBlazor/Components/Dropdown/Dropdown.razor index 6957b632679..d2b72b8b57f 100644 --- a/src/BootstrapBlazor/Components/Dropdown/Dropdown.razor +++ b/src/BootstrapBlazor/Components/Dropdown/Dropdown.razor @@ -38,11 +38,13 @@ { if (ItemTemplate != null) { - @ItemTemplate.Invoke(item) +
+ @ItemTemplate(item) +
} else if (item.IsDisabled) { -
@item.Text
+
@item.Text
} else { diff --git a/src/BootstrapBlazor/Components/Dropdown/Dropdown.razor.cs b/src/BootstrapBlazor/Components/Dropdown/Dropdown.razor.cs index f5ca173f90d..b2ebb6f141c 100644 --- a/src/BootstrapBlazor/Components/Dropdown/Dropdown.razor.cs +++ b/src/BootstrapBlazor/Components/Dropdown/Dropdown.razor.cs @@ -63,14 +63,6 @@ public partial class Dropdown /// protected string? ActiveItem(SelectedItem item) => CssBuilder.Default("dropdown-item") .AddClass("active", () => item.Value == CurrentValueAsString) - .Build(); - - /// - /// 获得/设置 设置当前项是否 Active 方法 - /// - /// - /// - protected string? DisableItem(SelectedItem item) => CssBuilder.Default("dropdown-item") .AddClass("disabled", item.IsDisabled) .Build(); diff --git a/src/BootstrapBlazor/Components/Tooltip/Tooltip.razor.scss b/src/BootstrapBlazor/Components/Tooltip/Tooltip.razor.scss index 96abba5dc9d..7ea651c7f23 100644 --- a/src/BootstrapBlazor/Components/Tooltip/Tooltip.razor.scss +++ b/src/BootstrapBlazor/Components/Tooltip/Tooltip.razor.scss @@ -2,6 +2,11 @@ display: inline-block; } +.dropdown-item > span[data-bs-toggle="tooltip"] { + display: flex; + align-items: center; +} + .tooltip.is-invalid { --bs-tooltip-bg: var(--bs-danger); }