diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj index 6f6d050e9a300d707edfc704ab3f78e250aa5271..d7c920926c531287e96a3a4af6914296225e773f 100644 --- a/src/BootstrapBlazor/BootstrapBlazor.csproj +++ b/src/BootstrapBlazor/BootstrapBlazor.csproj @@ -1,7 +1,7 @@ - 5.4.3 + 5.4.4 diff --git a/src/BootstrapBlazor/Components/Spinner/Spinner.razor b/src/BootstrapBlazor/Components/Spinner/Spinner.razor index 3063dc1f08372082b613c046fa2b2c4b090bced1..e66ecdd106da8239fa840a05a4819c8da86bb36f 100644 --- a/src/BootstrapBlazor/Components/Spinner/Spinner.razor +++ b/src/BootstrapBlazor/Components/Spinner/Spinner.razor @@ -1,6 +1,6 @@ @namespace BootstrapBlazor.Components -@inherits SpinnerBase +@inherits BootstrapComponentBase -
- Loading... -
\ No newline at end of file +
+ Loading... +
diff --git a/src/BootstrapBlazor/Components/Spinner/SpinnerBase.cs b/src/BootstrapBlazor/Components/Spinner/Spinner.razor.cs similarity index 55% rename from src/BootstrapBlazor/Components/Spinner/SpinnerBase.cs rename to src/BootstrapBlazor/Components/Spinner/Spinner.razor.cs index 497108e43b8299f4796b11365d7e07b1bf55798a..b8e36ebb7f7b6eae9bc333a2e22f3cb10dbf9b1a 100644 --- a/src/BootstrapBlazor/Components/Spinner/SpinnerBase.cs +++ b/src/BootstrapBlazor/Components/Spinner/Spinner.razor.cs @@ -9,51 +9,34 @@ namespace BootstrapBlazor.Components /// /// Spinner 组件基类 /// - public abstract class SpinnerBase : BootstrapComponentBase + public partial class Spinner { /// /// 获取Spinner样式 /// - protected string? ClassName => CssBuilder.Default("spinner") - .AddClass($"spinner-{spinner}") + protected string? ClassString => CssBuilder.Default("spinner") + .AddClass($"spinner-{SpinnerType.ToDescriptionString()}") .AddClass($"text-{Color.ToDescriptionString()}", Color != Color.None) .AddClass($"spinner-border-{Size.ToDescriptionString()}", Size != Size.None) - .AddClass(Class) .AddClassFromAttributes(AdditionalAttributes) .Build(); /// - /// 获得/设置 Spinner样式 - /// - [Parameter] - public string? Class { get; set; } - - /// - /// 获得/设置 Spinner颜色 + /// 获得/设置 Spinner 颜色 默认 None 无设置 /// [Parameter] public Color Color { get; set; } /// - /// 获得 / 设置 Spinner大小 + /// 获得 / 设置 Spinner 大小 默认 None 无设置 /// [Parameter] public Size Size { get; set; } /// - /// 获得/设置 Spinner类型 + /// 获得/设置 Spinner 类型 默认为 Border /// [Parameter] - public SpinnerType SpinnerType { get; set; } = SpinnerType.Border; - - /// - /// 获取 Spinner类型 - /// - protected virtual string? spinner => SpinnerType switch - { - SpinnerType.Border => "border", - SpinnerType.Grow => "grow", - _ => "" - }; + public SpinnerType SpinnerType { get; set; } } } diff --git a/src/BootstrapBlazor/Components/Spinner/SpinnerType.cs b/src/BootstrapBlazor/Enums/SpinnerType.cs similarity index 80% rename from src/BootstrapBlazor/Components/Spinner/SpinnerType.cs rename to src/BootstrapBlazor/Enums/SpinnerType.cs index b1fc73ba817c37f801c8c616e88e4c75a77473fd..bd60e767227de21b24e171f0d4883165450c5968 100644 --- a/src/BootstrapBlazor/Components/Spinner/SpinnerType.cs +++ b/src/BootstrapBlazor/Enums/SpinnerType.cs @@ -2,6 +2,8 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Website: https://www.blazor.zone or https://argozhang.github.io/ +using System.ComponentModel; + namespace BootstrapBlazor.Components { /// @@ -12,11 +14,13 @@ namespace BootstrapBlazor.Components /// /// /// - Border = 1, + [Description("border")] + Border, /// /// /// - Grow = 2, + [Description("grow")] + Grow, } }