From 91e9f2bc58bc2c46fac0a4dc5724ba4a45046a60 Mon Sep 17 00:00:00 2001 From: Argo-Lenovo Date: Mon, 4 Jul 2022 13:38:45 +0800 Subject: [PATCH 01/12] =?UTF-8?q?doc:=20=E6=A0=BC=E5=BC=8F=E5=8C=96?= =?UTF-8?q?=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Samples/Badges.razor.cs | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/src/BootstrapBlazor.Shared/Samples/Badges.razor.cs b/src/BootstrapBlazor.Shared/Samples/Badges.razor.cs index 71a367579..b69fdd869 100644 --- a/src/BootstrapBlazor.Shared/Samples/Badges.razor.cs +++ b/src/BootstrapBlazor.Shared/Samples/Badges.razor.cs @@ -17,34 +17,34 @@ public sealed partial class Badges /// private IEnumerable GetAttributes() => new AttributeItem[] { - // TODO: 移动到数据库中 - new AttributeItem() { - Name = "ChildContent", - Description = Localizer["ChildContent"], - Type = "RenderFragment", - ValueList = " — ", - DefaultValue = " — " - }, - new AttributeItem() { - Name = "Class", - Description = Localizer["Class"], - Type = "string", - ValueList = " — ", - DefaultValue = " — " - }, - new AttributeItem() { - Name = "Color", - Description = Localizer["Color"], - Type = "Color", - ValueList = "Primary / Secondary / Success / Danger / Warning / Info / Dark", - DefaultValue = "Primary" - }, - new AttributeItem() { - Name = "IsPill", - Description = Localizer["IsPill"], - Type = "boolean", - ValueList = " — ", - DefaultValue = "false" - } + // TODO: 移动到数据库中 + new AttributeItem() { + Name = "ChildContent", + Description = Localizer["ChildContent"], + Type = "RenderFragment", + ValueList = " — ", + DefaultValue = " — " + }, + new AttributeItem() { + Name = "Class", + Description = Localizer["Class"], + Type = "string", + ValueList = " — ", + DefaultValue = " — " + }, + new AttributeItem() { + Name = "Color", + Description = Localizer["Color"], + Type = "Color", + ValueList = "Primary / Secondary / Success / Danger / Warning / Info / Dark", + DefaultValue = "Primary" + }, + new AttributeItem() { + Name = "IsPill", + Description = Localizer["IsPill"], + Type = "boolean", + ValueList = " — ", + DefaultValue = "false" + } }; } -- Gitee From 280e5f5a7c0907fbf5aebb1d452e63da4b97ec3e Mon Sep 17 00:00:00 2001 From: Argo-Lenovo Date: Mon, 4 Jul 2022 14:02:35 +0800 Subject: [PATCH 02/12] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=20OnClick?= =?UTF-8?q?=20=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Cascader/SubCascader.razor | 6 +++--- .../Components/Cascader/SubCascader.razor.cs | 10 +++++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/BootstrapBlazor/Components/Cascader/SubCascader.razor b/src/BootstrapBlazor/Components/Cascader/SubCascader.razor index 07e84cd53..6f66af95c 100644 --- a/src/BootstrapBlazor/Components/Cascader/SubCascader.razor +++ b/src/BootstrapBlazor/Components/Cascader/SubCascader.razor @@ -6,11 +6,11 @@ if (item.HasChildren) {
  • -
    +
    @item.Text
      - +
    • @@ -18,7 +18,7 @@ else {
  • -
    @item.Text
    +
    @item.Text
    • } } diff --git a/src/BootstrapBlazor/Components/Cascader/SubCascader.razor.cs b/src/BootstrapBlazor/Components/Cascader/SubCascader.razor.cs index fe2dddff1..86f569013 100644 --- a/src/BootstrapBlazor/Components/Cascader/SubCascader.razor.cs +++ b/src/BootstrapBlazor/Components/Cascader/SubCascader.razor.cs @@ -26,11 +26,19 @@ public sealed partial class SubCascader /// 获得/设置 选择项点击回调委托 /// [Parameter] - public Func OnClick { get; set; } = _ => Task.CompletedTask; + public Func? OnClick { get; set; } /// /// 获得/设置 选择项是否 Active 回调委托 /// [Parameter] public Func ActiveItem { get; set; } = (className, _) => CssBuilder.Default(className).Build(); + + private async Task OnClickItem(CascaderItem item) + { + if (OnClick != null) + { + await OnClick(item); + } + } } -- Gitee From 67863da7ff496fbe3a4ad9a2a3674a37398a89bb Mon Sep 17 00:00:00 2001 From: Argo-Lenovo Date: Mon, 4 Jul 2022 14:03:38 +0800 Subject: [PATCH 03/12] =?UTF-8?q?test:=20=E9=87=8D=E6=9E=84=20Items=20?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Cascader/SubCascader.razor.cs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/Components/Cascader/SubCascader.razor.cs b/src/BootstrapBlazor/Components/Cascader/SubCascader.razor.cs index 86f569013..fd7f56a7d 100644 --- a/src/BootstrapBlazor/Components/Cascader/SubCascader.razor.cs +++ b/src/BootstrapBlazor/Components/Cascader/SubCascader.razor.cs @@ -20,7 +20,7 @@ public sealed partial class SubCascader /// 获得/设置 组件数据源 /// [Parameter] - public IEnumerable Items { get; set; } = Enumerable.Empty(); + public IEnumerable? Items { get; set; } /// /// 获得/设置 选择项点击回调委托 @@ -34,6 +34,14 @@ public sealed partial class SubCascader [Parameter] public Func ActiveItem { get; set; } = (className, _) => CssBuilder.Default(className).Build(); + /// + /// OnParametersSet 方法 + /// + protected override void OnParametersSet() + { + Items ??= Enumerable.Empty(); + } + private async Task OnClickItem(CascaderItem item) { if (OnClick != null) -- Gitee From dfafe7c04fdbad6e7e56c5d9c1ccc5d441acddd1 Mon Sep 17 00:00:00 2001 From: Argo-Lenovo Date: Mon, 4 Jul 2022 14:05:01 +0800 Subject: [PATCH 04/12] =?UTF-8?q?refactor:=20=E7=B2=BE=E7=AE=80=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Cascader/SubCascader.razor.cs | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/BootstrapBlazor/Components/Cascader/SubCascader.razor.cs b/src/BootstrapBlazor/Components/Cascader/SubCascader.razor.cs index fd7f56a7d..9cd05eac5 100644 --- a/src/BootstrapBlazor/Components/Cascader/SubCascader.razor.cs +++ b/src/BootstrapBlazor/Components/Cascader/SubCascader.razor.cs @@ -9,17 +9,13 @@ namespace BootstrapBlazor.Components; /// public sealed partial class SubCascader { - /// - /// 获得 组件样式 - /// - private string? ClassString => CssBuilder.Default("has-leaf") - .AddClassFromAttributes(AdditionalAttributes) - .Build(); - /// /// 获得/设置 组件数据源 /// [Parameter] +#if NET6_0_OR_GREATER + [EditorRequired] +#endif public IEnumerable? Items { get; set; } /// -- Gitee From 12b16182fd689434d9c9e859c000f40e49d817f7 Mon Sep 17 00:00:00 2001 From: Argo-Lenovo Date: Mon, 4 Jul 2022 14:10:08 +0800 Subject: [PATCH 05/12] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=94=B9=E5=B0=81?= =?UTF-8?q?=E9=97=AD=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Cascader/SubCascader.razor.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/BootstrapBlazor/Components/Cascader/SubCascader.razor.cs b/src/BootstrapBlazor/Components/Cascader/SubCascader.razor.cs index 9cd05eac5..6a1f578c8 100644 --- a/src/BootstrapBlazor/Components/Cascader/SubCascader.razor.cs +++ b/src/BootstrapBlazor/Components/Cascader/SubCascader.razor.cs @@ -5,14 +5,15 @@ namespace BootstrapBlazor.Components; /// -/// +/// SubCascader 组件 /// -public sealed partial class SubCascader +public partial class SubCascader { /// /// 获得/设置 组件数据源 /// [Parameter] + [NotNull] #if NET6_0_OR_GREATER [EditorRequired] #endif -- Gitee From 5ad3bd96d62f78b2e70d197786f8cf780b687ee9 Mon Sep 17 00:00:00 2001 From: Argo-Lenovo Date: Mon, 4 Jul 2022 14:20:08 +0800 Subject: [PATCH 06/12] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=AA=8C=E8=AF=81=E5=A4=B1=E6=95=88=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E6=A0=8F=E9=BB=91=E8=89=B2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Cascader/Cascader.razor.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BootstrapBlazor/Components/Cascader/Cascader.razor.cs b/src/BootstrapBlazor/Components/Cascader/Cascader.razor.cs index 6260fbe11..871f4874e 100644 --- a/src/BootstrapBlazor/Components/Cascader/Cascader.razor.cs +++ b/src/BootstrapBlazor/Components/Cascader/Cascader.razor.cs @@ -132,7 +132,7 @@ public partial class Cascader /// private string? ClassName => CssBuilder.Default("dropdown") .AddClass("disabled", IsDisabled) - .AddClassFromAttributes(AdditionalAttributes) + .AddClass(CssClass).AddClass(ValidCss) .Build(); /// @@ -140,7 +140,7 @@ public partial class Cascader /// private string? InputClassName => CssBuilder.Default("form-control form-select") .AddClass($"border-{Color.ToDescriptionString()}", Color != Color.None && !IsDisabled) - .AddClass(CssClass).AddClass(ValidCss) + .AddClass(ValidCss) .Build(); private string? BackgroundColor => IsDisabled ? null : "background-color: #fff;"; -- Gitee From f62442e5bbe53eaa3f73f56e60b7f239b5b46f8a Mon Sep 17 00:00:00 2001 From: Argo-Lenovo Date: Mon, 4 Jul 2022 14:20:22 +0800 Subject: [PATCH 07/12] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=8D?= =?UTF-8?q?=E5=8F=AF=E8=8E=B7=E5=BE=97=E7=84=A6=E7=82=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Cascader/Cascader.razor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/Components/Cascader/Cascader.razor b/src/BootstrapBlazor/Components/Cascader/Cascader.razor index 8b85cad66..81a0b6d83 100644 --- a/src/BootstrapBlazor/Components/Cascader/Cascader.razor +++ b/src/BootstrapBlazor/Components/Cascader/Cascader.razor @@ -7,7 +7,7 @@ }
    -
    +
    @if (!IsDisabled) -- Gitee From 5234609e89c029139e871fbeba8380a6cc247d82 Mon Sep 17 00:00:00 2001 From: Argo-Lenovo Date: Mon, 4 Jul 2022 14:45:29 +0800 Subject: [PATCH 08/12] =?UTF-8?q?refactor:=20=E9=87=8D=E5=91=BD=E5=90=8D?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=B8=BA=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Cascader/Cascader.razor.cs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/BootstrapBlazor/Components/Cascader/Cascader.razor.cs b/src/BootstrapBlazor/Components/Cascader/Cascader.razor.cs index 871f4874e..6b9a78dfe 100644 --- a/src/BootstrapBlazor/Components/Cascader/Cascader.razor.cs +++ b/src/BootstrapBlazor/Components/Cascader/Cascader.razor.cs @@ -15,7 +15,7 @@ public partial class Cascader /// /// 当前选中节点集合 /// - private readonly List _selectedItems = new(); + private List SelectedItems { get; } = new(); /// /// 获得/设置 Cascader 内部 Input 组件 Id @@ -87,11 +87,11 @@ public partial class Cascader /// private void SetDefaultValue(string defaultValue) { - _selectedItems.Clear(); + SelectedItems.Clear(); var item = GetNodeByValue(Items, defaultValue); if (item != null) { - SetSelectedNodeWithParent(item, _selectedItems); + SetSelectedNodeWithParent(item, SelectedItems); } else { @@ -159,7 +159,7 @@ public partial class Cascader /// /// private string? ActiveItem(string className, CascaderItem item) => CssBuilder.Default(className) - .AddClass("active", () => _selectedItems.Contains(item)) + .AddClass("active", () => SelectedItems.Contains(item)) .Build(); /// @@ -169,15 +169,15 @@ public partial class Cascader private async Task SetSelectedItem(CascaderItem item) { - _selectedItems.Clear(); - SetSelectedNodeWithParent(item, _selectedItems); + SelectedItems.Clear(); + SetSelectedNodeWithParent(item, SelectedItems); await SetValue(item.Value); } private async Task SetValue(string value) { RefreshDisplayValue(); - if (_selectedItems.Count != 1) + if (SelectedItems.Count != 1) { StateHasChanged(); } @@ -186,11 +186,11 @@ public partial class Cascader if (OnSelectedItemChanged != null) { - await OnSelectedItemChanged.Invoke(_selectedItems.ToArray()); + await OnSelectedItemChanged.Invoke(SelectedItems.ToArray()); } } - private void RefreshDisplayValue() => DisplayTextString = string.Join("/", _selectedItems.Select(item => item.Text)); + private void RefreshDisplayValue() => DisplayTextString = string.Join("/", SelectedItems.Select(item => item.Text)); /// /// 设置选中所有父节点 -- Gitee From dd86fc6a137789597519324468f7ac06c6f840b1 Mon Sep 17 00:00:00 2001 From: Argo-Lenovo Date: Mon, 4 Jul 2022 14:45:46 +0800 Subject: [PATCH 09/12] =?UTF-8?q?refactor:=20=E5=A2=9E=E5=8A=A0=E7=BA=A7?= =?UTF-8?q?=E8=81=94=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Cascader/Cascader.razor | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/src/BootstrapBlazor/Components/Cascader/Cascader.razor b/src/BootstrapBlazor/Components/Cascader/Cascader.razor index 81a0b6d83..b7c119e5b 100644 --- a/src/BootstrapBlazor/Components/Cascader/Cascader.razor +++ b/src/BootstrapBlazor/Components/Cascader/Cascader.razor @@ -13,23 +13,25 @@ @if (!IsDisabled) {
    - @foreach (var item in Items) - { - if (item.HasChildren) + + @foreach (var item in Items) { -
    - @item.Text - -
      - -
    -
    + if (item.HasChildren) + { +
    + @item.Text + +
      + +
    +
    + } + else + { +
    @item.Text
    + } } - else - { -
    @item.Text
    - } - } +
    } -- Gitee From ee2510e77225fca5b9db7fc28181aefd71d98eb7 Mon Sep 17 00:00:00 2001 From: Argo-Lenovo Date: Mon, 4 Jul 2022 14:46:00 +0800 Subject: [PATCH 10/12] =?UTF-8?q?refactor:=20tabIndex=20=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=20-1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Cascader/Cascader.razor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/Components/Cascader/Cascader.razor b/src/BootstrapBlazor/Components/Cascader/Cascader.razor index b7c119e5b..0e242f6e7 100644 --- a/src/BootstrapBlazor/Components/Cascader/Cascader.razor +++ b/src/BootstrapBlazor/Components/Cascader/Cascader.razor @@ -7,7 +7,7 @@ }
    -
    +
    @if (!IsDisabled) -- Gitee From e3035641933bf4d8aaf67296601e0b878cd858f5 Mon Sep 17 00:00:00 2001 From: Argo-Lenovo Date: Mon, 4 Jul 2022 14:46:21 +0800 Subject: [PATCH 11/12] =?UTF-8?q?feat:=20=E9=87=8D=E6=9E=84=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E9=80=9A=E8=BF=87=E7=BA=A7=E8=81=94=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=20active=20=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Cascader/SubCascader.razor | 6 +++--- .../Components/Cascader/SubCascader.razor.cs | 12 +++++++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/BootstrapBlazor/Components/Cascader/SubCascader.razor b/src/BootstrapBlazor/Components/Cascader/SubCascader.razor index 6f66af95c..ddfffc664 100644 --- a/src/BootstrapBlazor/Components/Cascader/SubCascader.razor +++ b/src/BootstrapBlazor/Components/Cascader/SubCascader.razor @@ -6,11 +6,11 @@ if (item.HasChildren) {
  • -
    +
    @item.Text
      - +
    • @@ -18,7 +18,7 @@ else {
  • -
    @item.Text
    +
    @item.Text
    • } } diff --git a/src/BootstrapBlazor/Components/Cascader/SubCascader.razor.cs b/src/BootstrapBlazor/Components/Cascader/SubCascader.razor.cs index 6a1f578c8..459991e1d 100644 --- a/src/BootstrapBlazor/Components/Cascader/SubCascader.razor.cs +++ b/src/BootstrapBlazor/Components/Cascader/SubCascader.razor.cs @@ -25,11 +25,13 @@ public partial class SubCascader [Parameter] public Func? OnClick { get; set; } - /// - /// 获得/设置 选择项是否 Active 回调委托 - /// - [Parameter] - public Func ActiveItem { get; set; } = (className, _) => CssBuilder.Default(className).Build(); + [CascadingParameter] + [NotNull] + private List? SelectedItems { get; set; } + + private string? GetClassString(string classString, CascaderItem item) => CssBuilder.Default(classString) + .AddClass("active", SelectedItems.Contains(item)) + .Build(); /// /// OnParametersSet 方法 -- Gitee From ce00e9e2b4dedeacb4eedcb9200e88ad7770b1e4 Mon Sep 17 00:00:00 2001 From: Argo-Lenovo Date: Mon, 4 Jul 2022 14:46:29 +0800 Subject: [PATCH 12/12] =?UTF-8?q?test:=20=E5=A2=9E=E5=8A=A0=E7=A9=BA?= =?UTF-8?q?=E9=9B=86=E5=90=88=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/UnitTest/Components/CascaderTest.cs | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/test/UnitTest/Components/CascaderTest.cs b/test/UnitTest/Components/CascaderTest.cs index 317fd6e33..95703c9f7 100644 --- a/test/UnitTest/Components/CascaderTest.cs +++ b/test/UnitTest/Components/CascaderTest.cs @@ -126,4 +126,22 @@ public class CascaderTest : BootstrapBlazorTestBase var input = cut.Find(".dropdown > input"); Assert.True(input.HasAttribute("disabled")); } + + [Fact] + public void SubCascader_NullItems() + { + var items = new List() + { + new CascaderItem() { Text = "test1", Value = "1" } + }; + var cut = Context.RenderComponent>>(pb => + { + pb.Add(a => a.Value, items); + pb.AddChildContent(pb => + { + pb.Add(a => a.Items, null); + }); + }); + Assert.Equal("", cut.Markup); + } } -- Gitee