From 4a44328e3d685b31c548153875cee92859701596 Mon Sep 17 00:00:00 2001
From: Argo-Tianyi <argo@163.com>
Date: Mon, 2 Aug 2021 10:09:08 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20Spinner=20=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E9=80=82=E9=85=8D=20bs5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/Spinner/Spinner.razor          |  8 ++---
 .../{SpinnerBase.cs => Spinner.razor.cs}      | 31 +++++--------------
 .../Spinner => Enums}/SpinnerType.cs          |  8 +++--
 3 files changed, 17 insertions(+), 30 deletions(-)
 rename src/BootstrapBlazor/Components/Spinner/{SpinnerBase.cs => Spinner.razor.cs} (55%)
 rename src/BootstrapBlazor/{Components/Spinner => Enums}/SpinnerType.cs (80%)

diff --git a/src/BootstrapBlazor/Components/Spinner/Spinner.razor b/src/BootstrapBlazor/Components/Spinner/Spinner.razor
index 3063dc1f0..e66ecdd10 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
 
-<div @attributes="@AdditionalAttributes" class="@ClassName" role="status">
-    <span class="sr-only">Loading...</span>
-</div>
\ No newline at end of file
+<div @attributes="@AdditionalAttributes" class="@ClassString" role="status">
+    <span class="visually-hidden">Loading...</span>
+</div>
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 497108e43..b8e36ebb7 100644
--- a/src/BootstrapBlazor/Components/Spinner/SpinnerBase.cs
+++ b/src/BootstrapBlazor/Components/Spinner/Spinner.razor.cs
@@ -9,51 +9,34 @@ namespace BootstrapBlazor.Components
     /// <summary>
     /// Spinner 组件基类
     /// </summary>
-    public abstract class SpinnerBase : BootstrapComponentBase
+    public partial class Spinner
     {
         /// <summary>
         /// 获取Spinner样式
         /// </summary>
-        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();
 
         /// <summary>
-        /// 获得/设置 Spinner样式
-        /// </summary>
-        [Parameter]
-        public string? Class { get; set; }
-
-        /// <summary>
-        /// 获得/设置 Spinner颜色
+        /// 获得/设置 Spinner 颜色 默认 None 无设置
         /// </summary>
         [Parameter]
         public Color Color { get; set; }
 
         /// <summary>
-        /// 获得 / 设置 Spinner大小
+        /// 获得 / 设置 Spinner 大小 默认 None 无设置
         /// </summary>
         [Parameter]
         public Size Size { get; set; }
 
         /// <summary>
-        /// 获得/设置 Spinner类型
+        /// 获得/设置 Spinner 类型 默认为 Border
         /// </summary>
         [Parameter]
-        public SpinnerType SpinnerType { get; set; } = SpinnerType.Border;
-
-        /// <summary>
-        /// 获取 Spinner类型
-        /// </summary>
-        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 b1fc73ba8..bd60e7672 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
 {
     /// <summary>
@@ -12,11 +14,13 @@ namespace BootstrapBlazor.Components
         /// <summary>
         /// 
         /// </summary>
-        Border = 1,
+        [Description("border")]
+        Border,
 
         /// <summary>
         /// 
         /// </summary>
-        Grow = 2,
+        [Description("grow")]
+        Grow,
     }
 }
-- 
Gitee


From 9c8450d0dfae2ecfa83227a303a4b7f08482ac26 Mon Sep 17 00:00:00 2001
From: Argo-Tianyi <argo@163.com>
Date: Mon, 2 Aug 2021 11:28:25 +0800
Subject: [PATCH 2/2] chore: bump version to 5.4.4

---
 src/BootstrapBlazor/BootstrapBlazor.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj
index 6f6d050e9..d7c920926 100644
--- a/src/BootstrapBlazor/BootstrapBlazor.csproj
+++ b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>5.4.3</Version>
+    <Version>5.4.4</Version>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
-- 
Gitee