refactor: 更新 MaxFileCount 逻辑

Author: ArgoZhang

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

@@ -87,28 +87,15 @@ public partial class AvatarUpload<TValue>
 
     private string? GetValidStatus(UploadFile? item = null)
     {
-        if (ValidateForm == null)
+        if(item == null || IsDisabled || ValidateForm == null)
         {
             return null;
         }
 
-        if (IsDisabled)
-        {
-            return null;
-        }
-
-        if(item == null)
-        {
-            return null;
-        }
-
-        var state = item.IsValid ?? IsValid;
-        if (state == null)
-        {
-            return null;
-        }
-
-        return state.Value ? "is-valid" : "is-invalid";
+        var state = item.IsValid;
+        return state.HasValue
+            ? state.Value ? "is-valid" : "is-invalid"
+            : null;
     }
 
     /// <summary>

src/BootstrapBlazor/Components/Upload/UploadBase.cs

@@ -143,8 +143,9 @@ protected override void OnParametersSet()
     /// <returns></returns>
     protected async Task OnFileChange(InputFileChangeEventArgs args)
     {
-        var fileCount = MaxFileCount ?? args.FileCount;
-        var items = args.GetMultipleFiles(fileCount).Select(f =>
+        var fileCount = MaxFileCount ?? 0;
+        fileCount = Math.Max(fileCount, args.FileCount);
+        var items = args.GetMultipleFiles(args.FileCount).Take(fileCount).Select(f =>
         {
             var file = new UploadFile()
             {

test/UnitTest/Components/UploadAvatarTest.cs

@@ -5,6 +5,7 @@
 
 using Microsoft.AspNetCore.Components.Forms;
 using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
 
 namespace UnitTest.Components;
 
@@ -94,22 +95,6 @@ await cut.InvokeAsync(() => input.Instance.OnChange.InvokeAsync(new InputFileCha
         });
     }
 
-    [Fact]
-    public void MaxFileCount_Ok()
-    {
-        var cut = Context.RenderComponent<AvatarUpload<string>>(pb =>
-        {
-            pb.Add(a => a.IsMultiple, true);
-            pb.Add(a => a.MaxFileCount, 2);
-            pb.Add(a => a.DefaultFileList,
-            [
-                new UploadFile { FileName = "Test-File" },
-                new UploadFile { FileName = "Test-File" }
-            ]);
-        });
-        Assert.DoesNotContain(".upload-item-plus", cut.Markup);
-    }
-
     [Fact]
     public async Task AvatarUpload_ValidateForm_Ok()
     {

test/UnitTest/Components/UploadInputTest.cs

@@ -227,6 +227,24 @@ public void InputUpload_IsMultiple()
         Assert.False(button.IsDisabled());
     }
 
+    [Fact]
+    public async Task MaxFileCount_Ok()
+    {
+        var cut = Context.RenderComponent<InputUpload<string>>(pb =>
+        {
+            pb.Add(a => a.IsMultiple, true);
+            pb.Add(a => a.MaxFileCount, 4);
+        });
+
+        var input = cut.FindComponent<InputFile>();
+        await cut.InvokeAsync(() => input.Instance.OnChange.InvokeAsync(new InputFileChangeEventArgs(new List<MockBrowserFile>()
+        {
+            new("test1.png"), new("test2.png"), new("test3.png")
+        })));
+        cut.Contains("test1.png;test2.png");
+        cut.DoesNotContain("test3.png");
+    }
+
     private class Person
     {
         [Required]