Skip to content

Commit d82ddbe

Browse files
authored
feat(CardUpload): adjust IconTemplate order (#7025)
* refactor: 调整 IconTemplate 优先级别 * test: 更新单元测试消除警告信息 * test: 调整单元测试
1 parent c132947 commit d82ddbe

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

src/BootstrapBlazor/Components/Upload/CardUpload.razor

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
{
1717
<div @key="@item" class="@GetItemClassString(item)">
1818
<div class="upload-item-body">
19-
@if (item.IsImage(AllowExtensions, CanPreviewCallback))
19+
@if (IconTemplate != null)
2020
{
21-
<img class="upload-item-body-image" alt="prevUrl" src="@item.PrevUrl" @onclick="() => OnClickZoom(item)" />
21+
@IconTemplate(item)
2222
}
23-
else if (IconTemplate != null)
23+
else if (item.IsImage(AllowExtensions, CanPreviewCallback))
2424
{
25-
@IconTemplate(item)
25+
<img class="upload-item-body-image" alt="prevUrl" src="@item.PrevUrl" @onclick="() => OnClickZoom(item)" />
2626
}
2727
else
2828
{

test/UnitTest/Components/UploadCardTest.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ public async Task CardUpload_Ok()
5454

5555
cut.SetParametersAndRender(pb =>
5656
{
57+
pb.Add(a => a.IconTemplate, (RenderFragment<UploadFile>?)null);
5758
pb.Add(a => a.OnZoomAsync, file =>
5859
{
5960
zoom = true;

test/UnitTest/Converters/JsonDescriptionEnumConverterTest.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ public void ColumnVisibleItemConverter_Ok()
6161
Assert.Equal("{\"name\":\"name\",\"visible\":true}", json);
6262

6363
var item1 = JsonSerializer.Deserialize<ColumnVisibleItem>(json);
64+
Assert.NotNull(item1);
6465
Assert.Equal("name", item1.Name);
6566
Assert.True(item1.Visible);
6667
}

0 commit comments

Comments
 (0)