Skip to content

perf(RequiredValidator): call GetLocalizerErrorMessage after validate failed #4996

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
merged 7 commits into from
Dec 31, 2024
Merged

perf(RequiredValidator): call GetLocalizerErrorMessage after validate failed #4996

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1b25367
修复自定义必填验证【RequiredAttribute】通过后（返回 ValidationResult 集合为零时），RequiredVa…
AiYuZhen Dec 30, 2024
2a15b88
refactor: 增加 GetValidationResult 扩展方法
ArgoZhang Dec 31, 2024
3a5731c
refactor: 利用扩展方法重构代码
ArgoZhang Dec 31, 2024
036631a
chore: bump version 9.2.1-beta03
ArgoZhang Dec 31, 2024
7fdb501
refactor: 格式化命名空间
ArgoZhang Dec 31, 2024
30997f9
Merge branch 'main' into Feat_RequiredValidator
ArgoZhang Dec 31, 2024
2a3b559
test: 更新单元测试
ArgoZhang Dec 31, 2024
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
23 changes: 17 additions & 6 deletions src/BootstrapBlazor/Validators/RequiredValidator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using Microsoft.Extensions.Localization;
using System.Collections;
using System.Globalization;
using System.Security.AccessControl;

namespace BootstrapBlazor.Components;

Expand Down Expand Up @@ -53,17 +54,15 @@ public override void Validate(object? propertyValue, ValidationContext context,
ErrorMessage = l.Value;
}
}
var errorMessage = GetLocalizerErrorMessage(context, LocalizerFactory, Options);
var memberNames = string.IsNullOrEmpty(context.MemberName) ? null : new string[] { context.MemberName };
if (propertyValue == null)
{
results.Add(new ValidationResult(errorMessage, memberNames));
results.Add(CreateValidationResult(context));
}
else if (propertyValue is string val)
{
if (!AllowEmptyString && val == string.Empty)
{
results.Add(new ValidationResult(errorMessage, memberNames));
results.Add(CreateValidationResult(context));
}
}
else if (propertyValue is IEnumerable v)
Expand All @@ -72,14 +71,26 @@ public override void Validate(object? propertyValue, ValidationContext context,
var valid = enumerator.MoveNext();
if (!valid)
{
results.Add(new ValidationResult(errorMessage, memberNames));
results.Add(CreateValidationResult(context));
}
}
else if (propertyValue is DateTimeRangeValue dv && dv is { NullStart: null, NullEnd: null })
{
results.Add(new ValidationResult(errorMessage, memberNames));
results.Add(CreateValidationResult(context));
}
}
/// <summary>
/// 生成错误提示信息。
/// </summary>
/// <param name="context"></param>
/// <returns></returns>
private ValidationResult CreateValidationResult(ValidationContext context)
{
var errorMessage = GetLocalizerErrorMessage(context, LocalizerFactory, Options);
var memberNames = string.IsNullOrEmpty(context.MemberName) ? null : new string[] { context.MemberName };
return new ValidationResult(errorMessage, memberNames);
}


/// <summary>
/// 获得当前验证规则资源文件中 Key 格式
Expand Down
Loading