Skip to content

Commit 2914daf

Browse files
committed
feat: 完善 Validate 逻辑
1 parent 1e589b6 commit 2914daf

File tree

1 file changed

+10
-12
lines changed

1 file changed

+10
-12
lines changed

src/BootstrapBlazor/Components/Upload/UploadBase.cs

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -276,26 +276,24 @@ public override void ToggleMessage(IEnumerable<ValidationResult> results)
276276
{
277277
if (FieldIdentifier != null)
278278
{
279-
var messages = results.Where(item => item.MemberNames.Any(m => UploadFiles.Any(f => f.ValidateId?.Equals(m, StringComparison.OrdinalIgnoreCase) ?? false)));
280-
if (messages.Any())
279+
var messages = results.Where(item => item.MemberNames.Any(m => m == FieldIdentifier.Value.FieldName)).ToList();
280+
if (messages.Count == 0)
281281
{
282+
messages = results.Where(item => item.MemberNames.Any(m =>
283+
UploadFiles.Any(f => f.ValidateId?.Equals(m, StringComparison.OrdinalIgnoreCase) ?? false)))
284+
.ToList();
285+
}
286+
if (messages.Count > 0)
287+
{
288+
ErrorMessage = messages.First().ErrorMessage;
282289
IsValid = false;
283-
284-
// TODO: 提示
285-
//if (CurrentFile != null)
286-
//{
287-
// var msg = messages.FirstOrDefault(m => m.MemberNames.Any(f => f.Equals(CurrentFile.ValidateId, StringComparison.OrdinalIgnoreCase)));
288-
// if (msg != null)
289-
// {
290-
// ErrorMessage = msg.ErrorMessage;
291-
// }
292-
//}
293290
}
294291
else
295292
{
296293
ErrorMessage = null;
297294
IsValid = true;
298295
}
296+
299297
OnValidate(IsValid);
300298
}
301299
}

0 commit comments

Comments
 (0)