diff --git a/src/BootstrapBlazor.Shared/Locales/en.json b/src/BootstrapBlazor.Shared/Locales/en.json index 6c0f423cf5644e0466dda2bfcb145acf6e31391c..4c87c3b0b3cdd4848909798ef6080c5698aac4b0 100644 --- a/src/BootstrapBlazor.Shared/Locales/en.json +++ b/src/BootstrapBlazor.Shared/Locales/en.json @@ -2051,6 +2051,7 @@ "CollapsibleIntro": "Card body can collapse/expand by set IsCollapsible to true", "CollapsibleIntro2": "Set Collapsed value to true for default collapsed card body.", "CollapsibleBody": "Click card hader for collapse/expand card body", + "CollapsibleHeaderTemplate": "Header Template", "ShadowTitle": "Shadow effect", "ShadowIntro": "Enable shadow effect by set IsShadow to true", "ShadowBody": "Shadow effect sample", diff --git a/src/BootstrapBlazor.Shared/Locales/zh.json b/src/BootstrapBlazor.Shared/Locales/zh.json index 9236dbf58ed6f2dc13ba571e465b833b58b28627..eab2eb3321409b21f6108eb383bdc19ae9c46a69 100644 --- a/src/BootstrapBlazor.Shared/Locales/zh.json +++ b/src/BootstrapBlazor.Shared/Locales/zh.json @@ -2055,6 +2055,7 @@ "CollapsibleIntro": "通过设置 IsCollapsible 使 Body 可以伸缩", "CollapsibleIntro2": "通过设置 Collapsed 使 Body 默认收缩 参数默认值 false 展开", "CollapsibleBody": "点击 Header 收缩/展开", + "CollapsibleHeaderTemplate": "这里是模板", "ShadowTitle": "带有阴影的卡片", "ShadowIntro": "通过设置 IsShadow 开启阴影特效", "ShadowBody": "阴影特效示例", diff --git a/src/BootstrapBlazor.Shared/Samples/Cards.razor b/src/BootstrapBlazor.Shared/Samples/Cards.razor index 8bffc6e97496193a370966c17543a199265139b0..fb5603a743cbd5420718ce84f1319f8544dbdfeb 100644 --- a/src/BootstrapBlazor.Shared/Samples/Cards.razor +++ b/src/BootstrapBlazor.Shared/Samples/Cards.razor @@ -136,6 +136,14 @@ @Localizer["CollapsibleBody"] + + + @Localizer["CollapsibleHeaderTemplate"] + + + @Localizer["CollapsibleBody"] + + diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj index 25454080d75e976f81c2a9155a93d4c0bd66f902..9d8a1a5ed66e6e0d8584e8844e9f7390ad8ba107 100644 --- a/src/BootstrapBlazor/BootstrapBlazor.csproj +++ b/src/BootstrapBlazor/BootstrapBlazor.csproj @@ -1,7 +1,7 @@ - 6.7.22 + 6.7.23 diff --git a/src/BootstrapBlazor/Components/Card/Card.razor b/src/BootstrapBlazor/Components/Card/Card.razor index 45e5e2a40f07c9fb42c138d4e6110538916dde98..0873b91cfbd2cc4b7fad9e0772ca57a9d96da9a6 100644 --- a/src/BootstrapBlazor/Components/Card/Card.razor +++ b/src/BootstrapBlazor/Components/Card/Card.razor @@ -9,7 +9,16 @@ {
-
@HeaderText
+
+ @if (CardHeader != null) + { + @CardHeader + } + else + { + @HeaderText + } +
} else diff --git a/test/UnitTest/Components/CardTest.cs b/test/UnitTest/Components/CardTest.cs index a2a344876aeb929ce4c0a2a89ce6e30c943ad8a4..e8af5aed66def16b13c4d0c75ea03614e92ce77c 100644 --- a/test/UnitTest/Components/CardTest.cs +++ b/test/UnitTest/Components/CardTest.cs @@ -68,6 +68,19 @@ public class CardTest : TestBase Assert.Contains("card-collapse", cut.Markup); } + [Fact] + public void HeaderTemplate_Ok() + { + var cut = Context.RenderComponent(builder => + { + builder.Add(a => a.IsCollapsible, true); + builder.Add(a => a.HeaderText, "Header"); + builder.Add(a => a.CardHeader, CreateComponent()); + }); + Assert.Contains("card-collapse", cut.Markup); + Assert.Contains("TestComponent-Card", cut.Markup); + } + [Fact] public void Collapsed_Ok() {