From dece8a7665a34e31afb972e27f3e98659049a89d Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Fri, 6 Jun 2025 11:56:49 +0800 Subject: [PATCH 1/9] =?UTF-8?q?refactor:=20=E8=8E=B7=E5=BE=97=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=89=A9=E5=B1=95=E5=90=8D=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Upload/UploadPreviewList.razor.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/BootstrapBlazor/Components/Upload/UploadPreviewList.razor.cs b/src/BootstrapBlazor/Components/Upload/UploadPreviewList.razor.cs index 05806121dce..9dc247b2651 100644 --- a/src/BootstrapBlazor/Components/Upload/UploadPreviewList.razor.cs +++ b/src/BootstrapBlazor/Components/Upload/UploadPreviewList.razor.cs @@ -252,17 +252,17 @@ private async Task OnClickCancel(UploadFile item) private string? GetFileFormatClassString(UploadFile item) { var builder = CssBuilder.Default("file-icon"); - var fileExtension = Path.GetExtension(item.OriginFileName ?? item.FileName); + var fileExtension = Path.GetExtension(item.GetFileName()); if (!string.IsNullOrEmpty(fileExtension)) { fileExtension = fileExtension.ToLowerInvariant(); + var icon = OnGetFileFormat?.Invoke(fileExtension) ?? GetFileExtensions(fileExtension); + builder.AddClass(icon); } - var icon = OnGetFileFormat?.Invoke(fileExtension) ?? GetFileExtensions(fileExtension); - builder.AddClass(icon); return builder.Build(); } - private string? GetFileExtensions(string? fileExtension) => fileExtension switch + private string? GetFileExtensions(string fileExtension) => fileExtension switch { ".csv" or ".xls" or ".xlsx" => FileIconExcel, ".doc" or ".docx" or ".dot" or ".dotx" => FileIconDocx, From 83be2fa1662cc7f92eed6f1885b4cc6ac3abbf68 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Fri, 6 Jun 2025 12:05:32 +0800 Subject: [PATCH 2/9] =?UTF-8?q?test:=20=E6=B5=8B=E8=AF=95=E5=8D=95?= =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Upload/UploadPreviewList.razor.cs | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/src/BootstrapBlazor/Components/Upload/UploadPreviewList.razor.cs b/src/BootstrapBlazor/Components/Upload/UploadPreviewList.razor.cs index 9dc247b2651..090f18b6202 100644 --- a/src/BootstrapBlazor/Components/Upload/UploadPreviewList.razor.cs +++ b/src/BootstrapBlazor/Components/Upload/UploadPreviewList.razor.cs @@ -262,18 +262,5 @@ private async Task OnClickCancel(UploadFile item) return builder.Build(); } - private string? GetFileExtensions(string fileExtension) => fileExtension switch - { - ".csv" or ".xls" or ".xlsx" => FileIconExcel, - ".doc" or ".docx" or ".dot" or ".dotx" => FileIconDocx, - ".ppt" or ".pptx" => FileIconPPT, - ".wav" or ".mp3" => FileIconAudio, - ".mp4" or ".mov" or ".mkv" => FileIconVideo, - ".cs" or ".html" or ".vb" => FileIconCode, - ".pdf" => FileIconPdf, - ".zip" or ".rar" or ".iso" => FileIconZip, - ".txt" or ".log" => FileIconArchive, - ".jpg" or ".jpeg" or ".png" or ".bmp" or ".gif" => FileIconImage, - _ => FileIconFile - }; + private string? GetFileExtensions(string fileExtension) => FileIconFile; } From c1dde8cdce5c78637f97aa31d81cf77a5f66b084 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Fri, 6 Jun 2025 12:11:24 +0800 Subject: [PATCH 3/9] =?UTF-8?q?Revert=20"test:=20=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 83be2fa1662cc7f92eed6f1885b4cc6ac3abbf68. --- .../Components/Upload/UploadPreviewList.razor.cs | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/Components/Upload/UploadPreviewList.razor.cs b/src/BootstrapBlazor/Components/Upload/UploadPreviewList.razor.cs index 090f18b6202..9dc247b2651 100644 --- a/src/BootstrapBlazor/Components/Upload/UploadPreviewList.razor.cs +++ b/src/BootstrapBlazor/Components/Upload/UploadPreviewList.razor.cs @@ -262,5 +262,18 @@ private async Task OnClickCancel(UploadFile item) return builder.Build(); } - private string? GetFileExtensions(string fileExtension) => FileIconFile; + private string? GetFileExtensions(string fileExtension) => fileExtension switch + { + ".csv" or ".xls" or ".xlsx" => FileIconExcel, + ".doc" or ".docx" or ".dot" or ".dotx" => FileIconDocx, + ".ppt" or ".pptx" => FileIconPPT, + ".wav" or ".mp3" => FileIconAudio, + ".mp4" or ".mov" or ".mkv" => FileIconVideo, + ".cs" or ".html" or ".vb" => FileIconCode, + ".pdf" => FileIconPdf, + ".zip" or ".rar" or ".iso" => FileIconZip, + ".txt" or ".log" => FileIconArchive, + ".jpg" or ".jpeg" or ".png" or ".bmp" or ".gif" => FileIconImage, + _ => FileIconFile + }; } From 667b17192c81e741663babb3149e13ffa975d693 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Fri, 6 Jun 2025 12:14:49 +0800 Subject: [PATCH 4/9] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=20codecov=20act?= =?UTF-8?q?ion=20=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/auto-pull-request-checks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/auto-pull-request-checks.yml b/.github/workflows/auto-pull-request-checks.yml index 642d30b36e6..184f9911030 100644 --- a/.github/workflows/auto-pull-request-checks.yml +++ b/.github/workflows/auto-pull-request-checks.yml @@ -25,6 +25,6 @@ jobs: dotnet test test/UnitTest --collect:"XPlat Code Coverage" - name: Upload to Codecov - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v5 with: token: ${{ secrets.CODECOV_TOKEN }} From a0c74c7d73ace6e17f65071b944508abe70a55fd Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Fri, 6 Jun 2025 12:16:16 +0800 Subject: [PATCH 5/9] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=94=B9=E5=8F=AF?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Upload/UploadPreviewList.razor.cs | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/src/BootstrapBlazor/Components/Upload/UploadPreviewList.razor.cs b/src/BootstrapBlazor/Components/Upload/UploadPreviewList.razor.cs index 9dc247b2651..3c4d9768416 100644 --- a/src/BootstrapBlazor/Components/Upload/UploadPreviewList.razor.cs +++ b/src/BootstrapBlazor/Components/Upload/UploadPreviewList.razor.cs @@ -262,18 +262,22 @@ private async Task OnClickCancel(UploadFile item) return builder.Build(); } - private string? GetFileExtensions(string fileExtension) => fileExtension switch + private string GetFileExtensions(string fileExtension) { - ".csv" or ".xls" or ".xlsx" => FileIconExcel, - ".doc" or ".docx" or ".dot" or ".dotx" => FileIconDocx, - ".ppt" or ".pptx" => FileIconPPT, - ".wav" or ".mp3" => FileIconAudio, - ".mp4" or ".mov" or ".mkv" => FileIconVideo, - ".cs" or ".html" or ".vb" => FileIconCode, - ".pdf" => FileIconPdf, - ".zip" or ".rar" or ".iso" => FileIconZip, - ".txt" or ".log" => FileIconArchive, - ".jpg" or ".jpeg" or ".png" or ".bmp" or ".gif" => FileIconImage, - _ => FileIconFile - }; + var extension = fileExtension switch + { + ".csv" or ".xls" or ".xlsx" => FileIconExcel, + ".doc" or ".docx" or ".dot" or ".dotx" => FileIconDocx, + ".ppt" or ".pptx" => FileIconPPT, + ".wav" or ".mp3" => FileIconAudio, + ".mp4" or ".mov" or ".mkv" => FileIconVideo, + ".cs" or ".html" or ".vb" => FileIconCode, + ".pdf" => FileIconPdf, + ".zip" or ".rar" or ".iso" => FileIconZip, + ".txt" or ".log" => FileIconArchive, + ".jpg" or ".jpeg" or ".png" or ".bmp" or ".gif" => FileIconImage, + _ => FileIconFile + }; + return extension!; + } } From 9d16a5dae12ed3c734f45e9d1ba60ba37f3f11d5 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Fri, 6 Jun 2025 12:24:41 +0800 Subject: [PATCH 6/9] =?UTF-8?q?test:=20=E5=A2=9E=E5=8A=A0=20Flags=20?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/auto-pull-request-checks.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/auto-pull-request-checks.yml b/.github/workflows/auto-pull-request-checks.yml index 184f9911030..a1d9b6196f0 100644 --- a/.github/workflows/auto-pull-request-checks.yml +++ b/.github/workflows/auto-pull-request-checks.yml @@ -28,3 +28,4 @@ jobs: uses: codecov/codecov-action@v5 with: token: ${{ secrets.CODECOV_TOKEN }} + flags: BB From 88dd246f82ce76c036713066cd882352f019c4bc Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Fri, 6 Jun 2025 12:27:49 +0800 Subject: [PATCH 7/9] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=20action=20?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index df0b71c01ff..976b4eba015 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,7 +32,7 @@ jobs: dotnet test test/UnitTest --collect:"XPlat Code Coverage" - name: Upload to Codecov - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v5 with: token: ${{ secrets.CODECOV_TOKEN }} From cc9efd44966441eae64d573801965b3986ea0ebc Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Fri, 6 Jun 2025 12:40:29 +0800 Subject: [PATCH 8/9] =?UTF-8?q?revert:=20=E6=81=A2=E5=A4=8D=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Upload/UploadPreviewList.razor.cs | 30 ++++++++----------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/src/BootstrapBlazor/Components/Upload/UploadPreviewList.razor.cs b/src/BootstrapBlazor/Components/Upload/UploadPreviewList.razor.cs index 3c4d9768416..9dc247b2651 100644 --- a/src/BootstrapBlazor/Components/Upload/UploadPreviewList.razor.cs +++ b/src/BootstrapBlazor/Components/Upload/UploadPreviewList.razor.cs @@ -262,22 +262,18 @@ private async Task OnClickCancel(UploadFile item) return builder.Build(); } - private string GetFileExtensions(string fileExtension) + private string? GetFileExtensions(string fileExtension) => fileExtension switch { - var extension = fileExtension switch - { - ".csv" or ".xls" or ".xlsx" => FileIconExcel, - ".doc" or ".docx" or ".dot" or ".dotx" => FileIconDocx, - ".ppt" or ".pptx" => FileIconPPT, - ".wav" or ".mp3" => FileIconAudio, - ".mp4" or ".mov" or ".mkv" => FileIconVideo, - ".cs" or ".html" or ".vb" => FileIconCode, - ".pdf" => FileIconPdf, - ".zip" or ".rar" or ".iso" => FileIconZip, - ".txt" or ".log" => FileIconArchive, - ".jpg" or ".jpeg" or ".png" or ".bmp" or ".gif" => FileIconImage, - _ => FileIconFile - }; - return extension!; - } + ".csv" or ".xls" or ".xlsx" => FileIconExcel, + ".doc" or ".docx" or ".dot" or ".dotx" => FileIconDocx, + ".ppt" or ".pptx" => FileIconPPT, + ".wav" or ".mp3" => FileIconAudio, + ".mp4" or ".mov" or ".mkv" => FileIconVideo, + ".cs" or ".html" or ".vb" => FileIconCode, + ".pdf" => FileIconPdf, + ".zip" or ".rar" or ".iso" => FileIconZip, + ".txt" or ".log" => FileIconArchive, + ".jpg" or ".jpeg" or ".png" or ".bmp" or ".gif" => FileIconImage, + _ => FileIconFile + }; } From 7209371697debc9b2748b7dde89fa02038e41a94 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Fri, 6 Jun 2025 12:40:46 +0800 Subject: [PATCH 9/9] =?UTF-8?q?test:=20=E6=9B=B4=E6=96=B0=E5=8D=95?= =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/UnitTest/Components/UploadButtonTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/UnitTest/Components/UploadButtonTest.cs b/test/UnitTest/Components/UploadButtonTest.cs index 73394a539d8..f5d15d31332 100644 --- a/test/UnitTest/Components/UploadButtonTest.cs +++ b/test/UnitTest/Components/UploadButtonTest.cs @@ -362,6 +362,7 @@ public void ButtonUpload_OnGetFileFormat_Ok() new() { FileName = "1.doc" }, new() { FileName = "1.docx" }, new() { FileName = "1.dot" }, + new() { FileName = "1.dotx" }, new() { FileName = "1.ppt" }, new() { FileName = "1.pptx" }, new() { FileName = "1.wav" }, @@ -397,7 +398,6 @@ public void ButtonUpload_OnGetFileFormat_Ok() cut.Contains("fa-file-archive"); cut.Contains("fa-file-text"); cut.Contains("fa-file-image"); - cut.Contains("fa-file-archive"); cut.Contains("fa-file"); cut.SetParametersAndRender(pb =>