From 056a5b1ea72a16ecebc56cac5fce1cd397d0ea67 Mon Sep 17 00:00:00 2001 From: Argo-Tianyi Date: Mon, 21 Mar 2022 16:01:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20IpAddress=20=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E8=A1=A8=E5=8D=95=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Checkbox/CheckboxList.razor.cs | 3 +-- src/BootstrapBlazor/Components/IpAddress/IpAddress.razor.cs | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/BootstrapBlazor/Components/Checkbox/CheckboxList.razor.cs b/src/BootstrapBlazor/Components/Checkbox/CheckboxList.razor.cs index f70e7433c..6e33e4c33 100644 --- a/src/BootstrapBlazor/Components/Checkbox/CheckboxList.razor.cs +++ b/src/BootstrapBlazor/Components/Checkbox/CheckboxList.razor.cs @@ -22,8 +22,7 @@ public partial class CheckboxList .AddClass(defaultClass) .AddClass("no-border", !ShowBorder && ValidCss != "is-invalid") .AddClass("is-vertical", IsVertical) - .AddClass(CssClass) - .AddClass("is-invalid", IsValid.HasValue && !IsValid.Value) + .AddClass(CssClass).AddClass(ValidCss) .Build(); /// diff --git a/src/BootstrapBlazor/Components/IpAddress/IpAddress.razor.cs b/src/BootstrapBlazor/Components/IpAddress/IpAddress.razor.cs index 470d04409..277b38d87 100644 --- a/src/BootstrapBlazor/Components/IpAddress/IpAddress.razor.cs +++ b/src/BootstrapBlazor/Components/IpAddress/IpAddress.razor.cs @@ -26,7 +26,7 @@ public partial class IpAddress /// protected string? ClassName => CssBuilder.Default("ipaddress form-control") .AddClass("disabled", IsDisabled) - .AddClassFromAttributes(AdditionalAttributes) + .AddClass(CssClass).AddClass(ValidCss) .Build(); /// -- Gitee From 04b1a0cd8e03b9cd013b9f11c9441c977e756914 Mon Sep 17 00:00:00 2001 From: Argo-Tianyi Date: Mon, 21 Mar 2022 16:01:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?doc:=20=E6=9B=B4=E6=96=B0=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor.Shared/Samples/Ips.razor | 2 +- src/BootstrapBlazor.Shared/Shared/NavMenu.razor.cs | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/BootstrapBlazor.Shared/Samples/Ips.razor b/src/BootstrapBlazor.Shared/Samples/Ips.razor index ca6739fbf..8035840bb 100644 --- a/src/BootstrapBlazor.Shared/Samples/Ips.razor +++ b/src/BootstrapBlazor.Shared/Samples/Ips.razor @@ -4,6 +4,6 @@ -
@Value
+
@Value
diff --git a/src/BootstrapBlazor.Shared/Shared/NavMenu.razor.cs b/src/BootstrapBlazor.Shared/Shared/NavMenu.razor.cs index 45aca08f2..927f46e68 100644 --- a/src/BootstrapBlazor.Shared/Shared/NavMenu.razor.cs +++ b/src/BootstrapBlazor.Shared/Shared/NavMenu.razor.cs @@ -293,6 +293,12 @@ public sealed partial class NavMenu Url = "inputgroups" }, new() + { + IsNew = true, + Text = Localizer["Ip"], + Url = "ips" + }, + new() { Text = Localizer["Markdown"], Url = "markdowns" @@ -466,12 +472,6 @@ public sealed partial class NavMenu Url = "handwrittenpage" }, new() - { - IsNew = true, - Text = Localizer["Ip"], - Url = "ips" - }, - new() { IsNew = true, Text = Localizer["LinkButton"], -- Gitee