From 706c655311edd492c9af6eebacf9455680d242a1 Mon Sep 17 00:00:00 2001 From: Argo-Tianyi Date: Thu, 8 Sep 2022 11:05:24 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=20ShowUploadList?= =?UTF-8?q?=20=E5=8F=82=E6=95=B0=E6=8E=A7=E5=88=B6=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8A=E4=BC=A0=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Upload/ButtonUpload.razor | 79 ++++++++++--------- .../Components/Upload/ButtonUpload.razor.cs | 14 +++- .../Components/Upload/ButtonUploadBase.cs | 6 ++ 3 files changed, 60 insertions(+), 39 deletions(-) diff --git a/src/BootstrapBlazor/Components/Upload/ButtonUpload.razor b/src/BootstrapBlazor/Components/Upload/ButtonUpload.razor index 01405d60e..c1dde072f 100644 --- a/src/BootstrapBlazor/Components/Upload/ButtonUpload.razor +++ b/src/BootstrapBlazor/Components/Upload/ButtonUpload.razor @@ -8,47 +8,50 @@ }
diff --git a/src/BootstrapBlazor/Components/Upload/ButtonUpload.razor.cs b/src/BootstrapBlazor/Components/Upload/ButtonUpload.razor.cs index 601b096b5..b87a08535 100644 --- a/src/BootstrapBlazor/Components/Upload/ButtonUpload.razor.cs +++ b/src/BootstrapBlazor/Components/Upload/ButtonUpload.razor.cs @@ -9,7 +9,7 @@ namespace BootstrapBlazor.Components; /// /// /// -public sealed partial class ButtonUpload +public partial class ButtonUpload { private bool IsUploadButtonDisabled => IsDisabled || (IsSingle && UploadFiles.Any()); @@ -29,6 +29,12 @@ public sealed partial class ButtonUpload [Parameter] public string BrowserButtonClass { get; set; } = "btn-primary"; + /// + /// 获得/设置 是否显示上传列表 默认 true + /// + [Parameter] + public bool ShowUploadFileList { get; set; } = true; + /// /// 获得/设置 浏览按钮显示文字 /// @@ -49,4 +55,10 @@ public sealed partial class ButtonUpload BrowserButtonText ??= Localizer[nameof(BrowserButtonText)]; } + + /// + /// + /// + /// + protected override bool ShouldAddUploadFiles() => ShowUploadFileList; } diff --git a/src/BootstrapBlazor/Components/Upload/ButtonUploadBase.cs b/src/BootstrapBlazor/Components/Upload/ButtonUploadBase.cs index 18c620a6d..45e91f65e 100644 --- a/src/BootstrapBlazor/Components/Upload/ButtonUploadBase.cs +++ b/src/BootstrapBlazor/Components/Upload/ButtonUploadBase.cs @@ -102,6 +102,12 @@ public abstract class ButtonUploadBase : SingleUploadBase } } + /// + /// 判断是否将上传文件添加到 UploadFiles 集合中 + /// + /// + protected virtual bool ShouldAddUploadFiles() => true; + private void Update(UploadFile file) { if (GetShowProgress(file)) -- Gitee From 992074b26e4a54b4dc8d7cb23f8f826655d5c22a Mon Sep 17 00:00:00 2001 From: Argo-Tianyi Date: Thu, 8 Sep 2022 11:05:37 +0800 Subject: [PATCH 2/4] =?UTF-8?q?doc:=20=E6=9B=B4=E6=96=B0=E7=A4=BA=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor.Shared/Samples/Uploads.razor | 2 +- src/BootstrapBlazor/BootstrapBlazor.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BootstrapBlazor.Shared/Samples/Uploads.razor b/src/BootstrapBlazor.Shared/Samples/Uploads.razor index b98c86a3c..805423033 100644 --- a/src/BootstrapBlazor.Shared/Samples/Uploads.razor +++ b/src/BootstrapBlazor.Shared/Samples/Uploads.razor @@ -46,7 +46,7 @@

@((MarkupString)Localizer["ClickUploadP1"].Value)

- +

@((MarkupString)Localizer["ClickUploadP2"].Value)

diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj index 48c46c042..fcfe60317 100644 --- a/src/BootstrapBlazor/BootstrapBlazor.csproj +++ b/src/BootstrapBlazor/BootstrapBlazor.csproj @@ -1,7 +1,7 @@ - 6.9.17 + 6.9.18-beta01 -- Gitee From 3505ccd90a134cf73a5581393fc3edbf19a3bebe Mon Sep 17 00:00:00 2001 From: Argo-Lenovo Date: Thu, 8 Sep 2022 13:09:23 +0800 Subject: [PATCH 3/4] =?UTF-8?q?doc:=20=E6=9B=B4=E6=96=B0=E7=A4=BA=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor.Shared/Locales/en.json | 1 + src/BootstrapBlazor.Shared/Locales/zh.json | 1 + src/BootstrapBlazor.Shared/Samples/Uploads.razor | 4 +++- src/BootstrapBlazor.Shared/Samples/Uploads.razor.cs | 5 +++++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/BootstrapBlazor.Shared/Locales/en.json b/src/BootstrapBlazor.Shared/Locales/en.json index 09edad296..f3d074366 100644 --- a/src/BootstrapBlazor.Shared/Locales/en.json +++ b/src/BootstrapBlazor.Shared/Locales/en.json @@ -1802,6 +1802,7 @@ "ClickUploadIntro": "The ButtonUpload components, classic styles, user click button to pop up the file selection box.", "ClickUploadP1": "Click on the browse button select file upload, in this case set IsMultiple-true multiple-selectable file can be uploaded", "ClickUploadP2": "When you set up IsSingle, you can upload only one image or file", + "ClickUploadP3ShowUploadList": "Set ShowUploadList value to false as normal button", "UploadedFilesTitle": "A list of files has been uploaded", "UploadedFilesIntro": "Use DefaultFileList to set up uploaded content", "UploadFolderTitle": "Upload a folder", diff --git a/src/BootstrapBlazor.Shared/Locales/zh.json b/src/BootstrapBlazor.Shared/Locales/zh.json index 3090ce01e..8060c3d33 100644 --- a/src/BootstrapBlazor.Shared/Locales/zh.json +++ b/src/BootstrapBlazor.Shared/Locales/zh.json @@ -1804,6 +1804,7 @@ "ClickUploadIntro": "ButtonUpload 组件，经典款式，用户点击按钮弹出文件选择框。", "ClickUploadP1": "点击 浏览按钮 选择文件上传，本例中设置 IsMultiple=true 可多选文件进行上传", "ClickUploadP2": "设置 IsSingle 时，仅可以上传一张图片或者文件", + "ClickUploadP3ShowUploadList": "设置 ShowUploadList 值为 false 组件即与普通按钮一样，可自行处理上传文件逻辑", "UploadedFilesTitle": "已上传文件列表", "UploadedFilesIntro": "使用 DefaultFileList 设置已上传的内容", "UploadFolderTitle": "上传文件夹", diff --git a/src/BootstrapBlazor.Shared/Samples/Uploads.razor b/src/BootstrapBlazor.Shared/Samples/Uploads.razor index 805423033..82b330929 100644 --- a/src/BootstrapBlazor.Shared/Samples/Uploads.razor +++ b/src/BootstrapBlazor.Shared/Samples/Uploads.razor @@ -46,11 +46,13 @@

@((MarkupString)Localizer["ClickUploadP1"].Value)

- +

@((MarkupString)Localizer["ClickUploadP2"].Value)

+

@((MarkupString)Localizer["ClickUploadP3ShowUploadList"].Value)

+ diff --git a/src/BootstrapBlazor.Shared/Samples/Uploads.razor.cs b/src/BootstrapBlazor.Shared/Samples/Uploads.razor.cs index 61bb9acc1..f19330708 100644 --- a/src/BootstrapBlazor.Shared/Samples/Uploads.razor.cs +++ b/src/BootstrapBlazor.Shared/Samples/Uploads.razor.cs @@ -78,6 +78,11 @@ public sealed partial class Uploads : IDisposable } } + private async Task OnClickToUploadNoUploadList(UploadFile file) + { + await ToastService.Success("Upload", $"{file.OriginFileName} uploaded success."); + } + private CancellationTokenSource? UploadFolderToken { get; set; } private async Task OnUploadFolder(UploadFile file) { -- Gitee From db33c68d1b157c068472746a741970b888afae3d Mon Sep 17 00:00:00 2001 From: Argo-Lenovo Date: Thu, 8 Sep 2022 13:09:40 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Upload/ButtonUpload.razor.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/BootstrapBlazor/Components/Upload/ButtonUpload.razor.cs b/src/BootstrapBlazor/Components/Upload/ButtonUpload.razor.cs index b87a08535..17732dcef 100644 --- a/src/BootstrapBlazor/Components/Upload/ButtonUpload.razor.cs +++ b/src/BootstrapBlazor/Components/Upload/ButtonUpload.razor.cs @@ -13,8 +13,8 @@ public partial class ButtonUpload { private bool IsUploadButtonDisabled => IsDisabled || (IsSingle && UploadFiles.Any()); - private string? BrowserButtonClassString => CssBuilder.Default("btn btn-browser") - .AddClass(BrowserButtonClass) + private string? BrowserButtonClassString => CssBuilder.Default("btn-browser") + .AddClass(BrowserButtonClass, !string.IsNullOrEmpty(BrowserButtonClass)) .Build(); /// @@ -24,10 +24,10 @@ public partial class ButtonUpload public string BrowserButtonIcon { get; set; } = "fa-regular fa-folder-open"; /// - /// 获得/设置 上传按钮样式 默认 btn-primary + /// 获得/设置 上传按钮样式 默认 null 使用 Button 默认 Color Primary /// [Parameter] - public string BrowserButtonClass { get; set; } = "btn-primary"; + public string? BrowserButtonClass { get; set; } /// /// 获得/设置 是否显示上传列表 默认 true -- Gitee