refactor: 调整已上传列表逻辑

Author: ArgoZhang

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

@@ -148,18 +148,6 @@ protected override void OnParametersSet()
         };
     }
 
-    private bool CheckCanUpload()
-    {
-        // 允许多上传
-        if (IsMultiple)
-        {
-            return !MaxFileCount.HasValue || Files.Count < MaxFileCount;
-        }
-
-        // 只允许单个上传
-        return Files.Count == 0;
-    }
-
     /// <summary>
     /// 获得 数据验证客户端 ID
     /// </summary>

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", IsDisabled)
+        .AddClass("disabled", CheckCanUpload() == false)
         .Build();
 
     private string? BodyClassString => CssBuilder.Default("upload-body is-card")
@@ -252,18 +252,6 @@ protected override void OnParametersSet()
         FileIconFile ??= IconTheme.GetIconByKey(ComponentIcons.FileIconFile);
     }
 
-    private bool CheckCanUpload()
-    {
-        // 允许多上传
-        if (IsMultiple)
-        {
-            return !MaxFileCount.HasValue || Files.Count < MaxFileCount;
-        }
-
-        // 只允许单个上传
-        return Files.Count == 0;
-    }
-
     private async Task OnCardFileDelete(UploadFile item)
     {
         await OnFileDelete(item);

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", IsDisabled)
+        .AddClass("disabled", CheckCanUpload() == false)
         .AddClassFromAttributes(AdditionalAttributes)
         .Build();
 
     private string? BodyClassString => CssBuilder.Default("upload-drop-body")
-        .AddClass("btn-browser", !IsDisabled)
+        .AddClass("btn-browser", CheckCanUpload())
         .Build();
 
     private string? TextClassString => CssBuilder.Default("upload-drop-text")
-        .AddClass("text-muted", IsDisabled)
+        .AddClass("text-muted", CheckCanUpload() == false)
         .Build();
 
     /// <summary>

src/BootstrapBlazor/Components/Upload/UploadBase.cs

@@ -151,6 +151,7 @@ protected async Task OnFileChange(InputFileChangeEventArgs args)
 
         foreach (var item in items)
         {
+            _filesCache = null;
             UploadFiles.Add(item);
 
             // trigger OnChange event callback
@@ -209,6 +210,7 @@ protected virtual async Task<bool> OnFileDelete(UploadFile item)
             }
             UploadFiles.Remove(item);
             DefaultFileList?.Remove(item);
+            _filesCache = null;
         }
         StateHasChanged();
         return ret;
@@ -235,8 +237,8 @@ protected void Update(UploadFile file)
 
     private List<UploadFile>? _filesCache;
     /// <summary>
-    /// Get the files collection.
     /// 获得当前文件集合
+    /// <para>Get the files collection.</para>
     /// </summary>
     /// <returns></returns>
     protected List<UploadFile> GetUploadFiles()
@@ -253,8 +255,31 @@ protected List<UploadFile> GetUploadFiles()
         return _filesCache;
     }
 
+    /// <summary>
+    /// 检查是否可以继续上传文件
+    /// <para>Check whether can upload file.</para>
+    /// </summary>
+    /// <returns></returns>
+    protected bool CheckCanUpload()
+    {
+        if(IsDisabled)
+        {
+            return false;
+        }
+
+        // 允许多上传
+        if (IsMultiple)
+        {
+            return !MaxFileCount.HasValue || Files.Count < MaxFileCount;
+        }
+
+        // 只允许单个上传
+        return Files.Count == 0;
+    }
+
     /// <summary>
     /// 清空上传列表方法
+    /// <para>Clear the upload files collection.</para>
     /// </summary>
     public virtual void Reset()
     {
@@ -274,9 +299,7 @@ public override void ToggleMessage(IEnumerable<ValidationResult> results)
             var messages = results.Where(item => item.MemberNames.Any(m => m == FieldIdentifier.Value.FieldName)).ToList();
             if (messages.Count == 0)
             {
-                messages = results.Where(item => item.MemberNames.Any(m =>
-                        UploadFiles.Any(f => f.ValidateId?.Equals(m, StringComparison.OrdinalIgnoreCase) ?? false)))
-                    .ToList();
+                messages = [.. results.Where(item => item.MemberNames.Any(m => UploadFiles.Any(f => f.ValidateId?.Equals(m, StringComparison.OrdinalIgnoreCase) ?? false)))];
             }
             if (messages.Count > 0)
             {