From fcbb59dac41eac872580be7e55e07d3549a27518 Mon Sep 17 00:00:00 2001 From: Argo-Lenovo Date: Wed, 28 Sep 2022 10:51:18 +0800 Subject: [PATCH 1/3] =?UTF-8?q?doc:=20=E6=9B=B4=E6=96=B0=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Layout/LayoutBase.cs | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/BootstrapBlazor/Components/Layout/LayoutBase.cs b/src/BootstrapBlazor/Components/Layout/LayoutBase.cs index c835c8eee..e9b57519c 100644 --- a/src/BootstrapBlazor/Components/Layout/LayoutBase.cs +++ b/src/BootstrapBlazor/Components/Layout/LayoutBase.cs @@ -72,10 +72,10 @@ public abstract class LayoutBase : BootstrapComponentBase, IHandlerException, IA public string? NotFoundTabText { get; set; } /// - /// 获得/设置 Footer 高度 支持百分比 默认宽度为 300px + /// 获得/设置 侧边栏宽度,支持百分比,设置 0 时关闭宽度功能 默认值 300 /// [Parameter] - public string SideWidth { get; set; } = "300"; + public string? SideWidth { get; set; } /// /// 获得/设置 Main 模板 @@ -200,6 +200,16 @@ public abstract class LayoutBase : BootstrapComponentBase, IHandlerException, IA ErrorLogger?.Register(this); } + /// + /// OnParametersSet + /// + protected override void OnParametersSet() + { + base.OnParametersSet(); + + SideWidth ??= "300"; + } + private async void Navigation_LocationChanged(object? sender, LocationChangedEventArgs e) { if (OnAuthorizing != null) @@ -283,7 +293,7 @@ public abstract class LayoutBase : BootstrapComponentBase, IHandlerException, IA } /// - /// + /// DisposeAsyncCore 方法 /// /// public async ValueTask DisposeAsync() -- Gitee From e5311d319f591ab785faace60f9bd00b35ce88ef Mon Sep 17 00:00:00 2001 From: Argo-Lenovo Date: Wed, 28 Sep 2022 10:59:38 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20ConvertToPercentString=20=E6=94=AF?= =?UTF-8?q?=E6=8C=81=20auto=20=E5=85=B3=E9=94=AE=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Extensions/ObjectExtensions.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/BootstrapBlazor/Extensions/ObjectExtensions.cs b/src/BootstrapBlazor/Extensions/ObjectExtensions.cs index 3e8e7aa98..2372baea7 100644 --- a/src/BootstrapBlazor/Extensions/ObjectExtensions.cs +++ b/src/BootstrapBlazor/Extensions/ObjectExtensions.cs @@ -34,6 +34,10 @@ public static class ObjectExtensions { ret = $"{d}px"; } + else + { + ret = val; + } } return ret; } -- Gitee From f238bd262916dc4bba67c170ca2c54af9ea2a3ed Mon Sep 17 00:00:00 2001 From: Argo-Lenovo Date: Wed, 28 Sep 2022 11:00:10 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20Carousel=20=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=AE=BD=E5=BA=A6=E6=94=AF=E6=8C=81=20100%=20auto?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Carousel/Carousel.razor.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BootstrapBlazor/Components/Carousel/Carousel.razor.cs b/src/BootstrapBlazor/Components/Carousel/Carousel.razor.cs index 3e53eafe3..ce8d10394 100644 --- a/src/BootstrapBlazor/Components/Carousel/Carousel.razor.cs +++ b/src/BootstrapBlazor/Components/Carousel/Carousel.razor.cs @@ -29,7 +29,7 @@ public partial class Carousel /// 获得 Style 样式 /// private string? StyleName => CssBuilder.Default() - .AddClass($"width: {Width}px;", Width.HasValue) + .AddClass($"width: {Width.ConvertToPercentString()};", !string.IsNullOrEmpty(Width)) .Build(); /// @@ -52,7 +52,7 @@ public partial class Carousel /// 获得/设置 内部图片的宽度 /// [Parameter] - public int? Width { get; set; } + public string? Width { get; set; } /// /// 获得/设置 是否采用淡入淡出效果 默认为 false -- Gitee