Skip to content

feat(CardUpload): support ValidateForm validate function #7432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ArgoZhang merged 7 commits into from
Dec 26, 2025
Merged

feat(CardUpload): support ValidateForm validate function #7432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4a28824
feat: 增加空集合验证样式
ArgoZhang Dec 26, 2025
1589a8e
refactor: 更正单词拼写错误
ArgoZhang Dec 26, 2025
b691fc6
feat: 增加验证逻辑
ArgoZhang Dec 26, 2025
20fa20c
fix: 修复空集合不报错问题
ArgoZhang Dec 26, 2025
dbecb66
refactor: 增加对 UploadFile 集合支持
ArgoZhang Dec 26, 2025
9c86d53
style: 更新样式
ArgoZhang Dec 26, 2025
0d1f430
chore: bump version 10.1.5-beta04
ArgoZhang Dec 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/BootstrapBlazor/BootstrapBlazor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<Version>10.1.5-beta03</Version>
<Version>10.1.5-beta04</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
10 changes: 5 additions & 5 deletions src/BootstrapBlazor/Components/Upload/AvatarUpload.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,19 +187,19 @@ public override async Task ToggleMessage(IReadOnlyCollection<ValidationResult> r

ValidateModule ??= await LoadValidateModule();

var invalidItems = IsInValiadOnAddItem
var invalidItems = IsInValidOnAddItem
? [new { Id = AddId, _results.First().ErrorMessage }]
: _results.Select(i => new { Id = i.MemberNames.FirstOrDefault(), i.ErrorMessage }).ToList();

var items = IsInValiadOnAddItem
var items = IsInValidOnAddItem
? [AddId]
: Files.Select(i => i.ValidateId).ToList();

var addId = IsInValiadOnAddItem ? null : AddId;
var addId = IsInValidOnAddItem ? null : AddId;
await ValidateModule.InvokeVoidAsync("executeUpload", items, invalidItems, addId);
}

private bool IsInValiadOnAddItem => Files.Count == 0 && _results.Count > 0;
private bool IsInValidOnAddItem => Files.Count == 0 && _results.Count > 0;

/// <summary>
/// <inheritdoc/>
Expand Down Expand Up @@ -238,7 +238,7 @@ protected override async ValueTask DisposeAsync(bool disposing)

if (ValidateModule != null)
{
var items = IsInValiadOnAddItem
var items = IsInValidOnAddItem
? [AddId]
: Files.Select(i => i.ValidateId).ToList();

Expand Down
4 changes: 2 additions & 2 deletions src/BootstrapBlazor/Components/Upload/CardUpload.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
}
@foreach (var item in Files)
{
<div @key="@item" class="@GetItemClassString(item)">
<div @key="@item" id="@item.ValidateId" class="@GetItemClassString(item)">
<div class="upload-item-body">
@if (IconTemplate != null)
{
Expand Down Expand Up @@ -98,7 +98,7 @@

@code {
RenderFragment RenderAdd =>
@<div class="@CardItemClass">
@<div id="@AddId" class="@CardItemClass">
<i class="@AddIcon"></i>
</div>;
}
49 changes: 49 additions & 0 deletions src/BootstrapBlazor/Components/Upload/CardUpload.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ public partial class CardUpload<TValue>
.AddClass("is-valid", item is { Uploaded: true, Code: 0 })
.AddClass("is-invalid", item.Code != 0)
.Build();

private string? ItemClassString => CssBuilder.Default("upload-item")
.AddClass("disabled", CanUpload() == false)
.Build();
Expand Down Expand Up @@ -162,6 +163,54 @@ protected override async Task TriggerOnChanged(UploadFile file)
await base.TriggerOnChanged(file);
}

private IReadOnlyCollection<ValidationResult> _results = [];

/// <summary>
/// <inheritdoc/>
/// </summary>
/// <param name="results"></param>
public override async Task ToggleMessage(IReadOnlyCollection<ValidationResult> results)
{
_results = results;
IsValid = results.Count == 0;

ValidateModule ??= await LoadValidateModule();

var invalidItems = IsInValidOnAddItem
? [new { Id = AddId, _results.First().ErrorMessage }]
: _results.Select(i => new { Id = i.MemberNames.FirstOrDefault(), i.ErrorMessage }).ToList();

var items = IsInValidOnAddItem
? [AddId]
: Files.Select(i => i.ValidateId).ToList();

var addId = IsInValidOnAddItem ? null : AddId;
await ValidateModule.InvokeVoidAsync("executeUpload", items, invalidItems, addId);
}
Comment on lines +172 to +189
Copy link

Copilot AI Dec 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new validation functionality added to CardUpload (ToggleMessage, ShowValidResult, RemoveValidResult methods) lacks test coverage. Similar functionality in AvatarUpload has comprehensive test coverage in test/UnitTest/Components/UploadAvatarTest.cs (lines 224-287). Consider adding similar tests to ensure the validation features work correctly.

Copilot uses AI. Check for mistakes.

private bool IsInValidOnAddItem => Files.Count == 0 && _results.Count > 0;

/// <summary>
/// <inheritdoc/>
/// </summary>
/// <returns></returns>
protected override ValueTask ShowValidResult() => ValueTask.CompletedTask;

/// <summary>
/// <inheritdoc/>
/// </summary>
/// <param name="validateId"></param>
/// <returns></returns>
protected override async ValueTask RemoveValidResult(string? validateId = null)
{
if (!string.IsNullOrEmpty(validateId))
{
await base.RemoveValidResult(validateId);
}
}

private string? AddId => $"{Id}_new";

Copy link

Copilot AI Dec 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The CardUpload component is missing a DisposeAsync override to clean up validation resources, unlike AvatarUpload which implements it at lines 230-250 in AvatarUpload.razor.cs. This override should call ValidateModule.InvokeVoidAsync("disposeUpload", items) to properly clean up JavaScript validation resources when the component is disposed. Consider adding it after the AddId property.

Suggested change
/// <summary>
/// <inheritdoc/>
/// </summary>
/// <returns></returns>
public override async ValueTask DisposeAsync()
{
if (ValidateModule != null)
{
await ValidateModule.InvokeVoidAsync("disposeUpload", items);
}
await base.DisposeAsync();
}

Copilot uses AI. Check for mistakes.
private async Task OnCardFileDelete(UploadFile item)
{
await OnFileDelete(item);
Expand Down
8 changes: 6 additions & 2 deletions src/BootstrapBlazor/Components/Upload/InputUpload.razor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
.upload .upload-body.is-avatar .upload-item:not(.is-form):not(.is-valid):not(.is-invalid):hover,
.upload .upload-body.is-avatar .upload-item:not(.is-form).is-valid,
.upload .upload-body.is-card .upload-item.is-valid,
.upload .upload-body.is-card .upload-item:not(.disabled):hover {
.upload .upload-body.is-card .upload-item:not(.disabled):not(.is-valid):not(.is-invalid):hover {
border-color: var(--bb-upload-body-list-item-hover-color);
}

Expand Down Expand Up @@ -194,10 +194,14 @@
display: block;
}

.upload .upload-body.is-card .is-invalid .upload-item-body {
.upload .upload-body.is-card .upload-item.is-invalid {
border-color: var(--bs-danger);
}

.upload .upload-body.is-card .upload-item.is-valid {
border-color: var(--bs-success);
}

.upload .upload-body.is-card .upload-item-body {
border-radius: var(--bs-border-radius);
width: var(--bb-upload-card-item-width);
Expand Down
6 changes: 5 additions & 1 deletion src/BootstrapBlazor/Components/Upload/UploadBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,11 @@ protected async Task OnFileChange(InputFileChangeEventArgs args)
await OnAllFileUploaded(items);
}

if (ValueType.IsAssignableTo(typeof(IEnumerable<IBrowserFile>)))
if (ValueType.IsAssignableTo(typeof(IEnumerable<UploadFile>)))
{
CurrentValue = (TValue)(object)items;
}
else if (ValueType.IsAssignableTo(typeof(IEnumerable<IBrowserFile>)))
{
CurrentValue = (TValue)(object)items.Select(f => f.File).ToList();
}
Expand Down
3 changes: 2 additions & 1 deletion src/BootstrapBlazor/Components/ValidateForm/ValidateForm.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Licensed to the .NET Foundation under one or more agreements.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the Apache 2.0 License
// See the LICENSE file in the project root for more information.
// Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone
Expand Down Expand Up @@ -508,6 +508,7 @@ private async Task ValidateAsync(IValidateComponent validator, ValidationContext
else
{
// 未选择文件
propertyValue = null;
ValidateDataAnnotations(propertyValue, context, messages, pi);
}

Expand Down
Loading