refactor: 拆分 ShowAddButton 方法

Author: ArgoZhang

src/BootstrapBlazor/Components/Upload/AvatarUpload.razor

@@ -8,7 +8,7 @@
 }
 <div @attributes="@AdditionalAttributes" class="@ClassString" id="@Id">
     <div class="upload-body is-avatar">
-        @if (IsUploadButtonAtFirst && CheckCanUpload())
+        @if (IsUploadButtonAtFirst && ShowAddButton())
         {
             @RenderAdd
         }
@@ -39,7 +39,7 @@
                 }
             </div>
         }
-        @if (!IsUploadButtonAtFirst && CheckCanUpload())
+        @if (!IsUploadButtonAtFirst && ShowAddButton())
         {
             @RenderAdd
         }

src/BootstrapBlazor/Components/Upload/AvatarUpload.razor.cs

@@ -96,7 +96,12 @@ public partial class AvatarUpload<TValue>
             return null;
         }
 
-        var state = item?.IsValid ?? IsValid;
+        if(item == null)
+        {
+            return null;
+        }
+
+        var state = item.IsValid ?? IsValid;
         if (state == null)
         {
             return null;

src/BootstrapBlazor/Components/Upload/ButtonUpload.razor

@@ -7,7 +7,7 @@
     <BootstrapLabel required="@Required" ShowLabelTooltip="ShowLabelTooltip" Value="@DisplayText" />
 }
 <div @attributes="@AdditionalAttributes" class="@ClassString" id="@Id">
-    <Button class="@BrowserButtonClassString" IsDisabled="@(!CheckCanUpload())" Size="Size" Icon="@BrowserButtonIcon" Text="@BrowserButtonText" Color="@BrowserButtonColor">
+    <Button class="@BrowserButtonClassString" IsDisabled="@CheckStatus()" Size="Size" Icon="@BrowserButtonIcon" Text="@BrowserButtonText" Color="@BrowserButtonColor">
         @ChildContent
     </Button>
     @if (ShowUploadFileList)

src/BootstrapBlazor/Components/Upload/ButtonUpload.razor.cs

@@ -208,4 +208,6 @@ protected override void OnParametersSet()
         BrowserButtonText ??= Localizer[nameof(BrowserButtonText)];
         BrowserButtonIcon ??= IconTheme.GetIconByKey(ComponentIcons.ButtonUploadBrowserButtonIcon);
     }
+
+    private bool CheckStatus() => IsDisabled || CanUpload() == false;
 }

src/BootstrapBlazor/Components/Upload/CardUpload.razor

@@ -8,7 +8,7 @@
 }
 <div @attributes="@AdditionalAttributes" class="@ClassString" id="@Id" data-bb-previewer-id="@PreviewerId">
     <div class="@BodyClassString">
-        @if (IsUploadButtonAtFirst && CheckCanUpload())
+        @if (IsUploadButtonAtFirst && ShowAddButton())
         {
             @RenderAdd
         }
@@ -70,7 +70,7 @@
                 </span>
             </div>
         }
-        @if (!IsUploadButtonAtFirst && CheckCanUpload())
+        @if (!IsUploadButtonAtFirst && ShowAddButton())
         {
             @RenderAdd
         }

src/BootstrapBlazor/Components/Upload/CardUpload.razor.cs

@@ -19,7 +19,7 @@ public partial class CardUpload<TValue>
         .AddClass("is-invalid", item.Code != 0)
         .Build();
     private string? ItemClassString => CssBuilder.Default("upload-item")
-        .AddClass("disabled", CheckCanUpload() == false)
+        .AddClass("disabled", CanUpload() == false)
         .Build();
 
     private string? BodyClassString => CssBuilder.Default("upload-body is-card")

src/BootstrapBlazor/Components/Upload/DropUpload.razor.cs

@@ -204,16 +204,16 @@ public partial class DropUpload
     private IStringLocalizer<UploadBase<string>>? Localizer { get; set; }
 
     private string? ClassString => CssBuilder.Default("upload is-drop")
-        .AddClass("disabled", CheckCanUpload() == false)
+        .AddClass("disabled", CanUpload() == false)
         .AddClassFromAttributes(AdditionalAttributes)
         .Build();
 
     private string? BodyClassString => CssBuilder.Default("upload-drop-body")
-        .AddClass("btn-browser", CheckCanUpload())
+        .AddClass("btn-browser", CanUpload())
         .Build();
 
     private string? TextClassString => CssBuilder.Default("upload-drop-text")
-        .AddClass("text-muted", CheckCanUpload() == false)
+        .AddClass("text-muted", CanUpload() == false)
         .Build();
 
     /// <summary>

src/BootstrapBlazor/Components/Upload/UploadBase.cs

@@ -260,13 +260,8 @@ protected List<UploadFile> GetUploadFiles()
     /// <para>Check whether can upload file.</para>
     /// </summary>
     /// <returns></returns>
-    protected bool CheckCanUpload()
+    protected bool CanUpload()
     {
-        if (IsDisabled)
-        {
-            return false;
-        }
-
         // 允许多上传
         if (IsMultiple)
         {
@@ -277,6 +272,20 @@ protected bool CheckCanUpload()
         return Files.Count == 0;
     }
 
+    /// <summary>
+    /// 判断是否显示新建按钮
+    /// </summary>
+    /// <returns></returns>
+    protected bool ShowAddButton()
+    {
+        if (IsDisabled)
+        {
+            return Files.Count == 0;
+        }
+
+        return CanUpload();
+    }
+
     /// <summary>
     /// 清空上传列表方法
     /// <para>Clear the upload files collection.</para>

test/UnitTest/Components/UploadAvatarTest.cs

@@ -4,7 +4,6 @@
 // Maintainer: Argo Zhang([email protected]) Website: https://www.blazor.zone
 
 using Microsoft.AspNetCore.Components.Forms;
-using System.ComponentModel.DataAnnotations;
 
 namespace UnitTest.Components;