From 286f7c1cec75521137389a0e65cda6f47d0344cb Mon Sep 17 00:00:00 2001 From: Argo-AscioTech Date: Fri, 27 Sep 2024 16:01:24 +0800 Subject: [PATCH 1/5] =?UTF-8?q?doc:=20=E6=9B=B4=E6=96=B0=E7=A4=BA=E4=BE=8B?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E9=99=90=E5=88=B6=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=205M?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Samples/Uploads.razor.cs | 4 ++-- src/BootstrapBlazor.Server/Locales/en-US.json | 4 ++-- src/BootstrapBlazor.Server/Locales/zh-CN.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/BootstrapBlazor.Server/Components/Samples/Uploads.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/Uploads.razor.cs index 79acd1d9617..a513509baf0 100644 --- a/src/BootstrapBlazor.Server/Components/Samples/Uploads.razor.cs +++ b/src/BootstrapBlazor.Server/Components/Samples/Uploads.razor.cs @@ -21,7 +21,7 @@ public sealed partial class Uploads private CancellationTokenSource? ReadToken { get; set; } - private static long MaxFileLength => 200 * 1024 * 1024; + private static long MaxFileLength => 5 * 1024 * 1024; private Person Foo1 { get; set; } = new Person(); @@ -184,7 +184,7 @@ private async Task OnCardUpload(UploadFile file) { if (file != null && file.File != null) { - // 服务器端验证当文件大于 2MB 时提示文件太大信息 + // 服务器端验证当文件大于 5MB 时提示文件太大信息 if (file.Size > MaxFileLength) { await ToastService.Information(Localizer["UploadsFileMsg"], Localizer["UploadsFileError"]); diff --git a/src/BootstrapBlazor.Server/Locales/en-US.json b/src/BootstrapBlazor.Server/Locales/en-US.json index 5d1c2a6d9fb..22488952715 100644 --- a/src/BootstrapBlazor.Server/Locales/en-US.json +++ b/src/BootstrapBlazor.Server/Locales/en-US.json @@ -3387,7 +3387,7 @@ "UploadPreCardStyleWasm": "Wasm mode ", "UploadPreCardStyleWasmSide": "It wasn't available in wasm mode, IWebHostEnvironment needed to save files to the server side by calling webapi interface, and so on", "UploadPreCardStyleLink": "Interested students can view their knowledge of Upload components through the wiki in the open source repository related resources of the [The portal]", - "UploadPreCardStyleValidation": "In this example, server-side verification prompts the file for too much prompt when the file size exceeds 200MB", + "UploadPreCardStyleValidation": "In this example, server-side verification prompts the file for too much prompt when the file size exceeds 5MB", "UploadPreCardStyleTips1": "In this example, the ShowProgress=true display upload progress bar", "UploadPreCardStyleTips2": "When you set up IsSingle, you can upload only one image or file", "UploadFileIconTitle": "The file icon", @@ -3425,7 +3425,7 @@ "UploadsFormatError": "The file format is incorrect", "UploadsAvatarMsg": "Avatar upload", "UploadsFileMsg": "Upload the file", - "UploadsFileError": "The file size is greater than 200MB", + "UploadsFileError": "The file size is greater than 5MB", "UploadsSaveFileError": "Failed to save the file", "UploadFile": "Upload the file", "UploadsWasmError": "Wasm mode does not implement saving code", diff --git a/src/BootstrapBlazor.Server/Locales/zh-CN.json b/src/BootstrapBlazor.Server/Locales/zh-CN.json index 08c3287b098..cf16ea7c3df 100644 --- a/src/BootstrapBlazor.Server/Locales/zh-CN.json +++ b/src/BootstrapBlazor.Server/Locales/zh-CN.json @@ -3387,7 +3387,7 @@ "UploadPreCardStyleWasm": "Wasm 模式", "UploadPreCardStyleWasmSide": "wasm 模式中无法使用 IWebHostEnvironment 需要调用 webapi 接口等形式将文件保存到服务器端", "UploadPreCardStyleLink": "有兴趣的同学可以通过开源仓库中的 wiki 文档中相关资源查看关于 Upload 组件的相关知识技巧 [传送门]", - "UploadPreCardStyleValidation": "本例中通过服务器端验证当文件大小超过 200MB 时，提示文件太大提示信息", + "UploadPreCardStyleValidation": "本例中通过服务器端验证当文件大小超过 5MB 时，提示文件太大提示信息", "UploadPreCardStyleTips1": "本例中设置 ShowProgress=true 显示上传进度条", "UploadPreCardStyleTips2": "设置 IsSingle 时，仅可以上传一张图片或者文件", "UploadFileIconTitle": "文件图标", @@ -3425,7 +3425,7 @@ "UploadsFormatError": "文件格式不正确", "UploadsAvatarMsg": "头像上传", "UploadsFileMsg": "上传文件", - "UploadsFileError": "文件大小超过 200MB", + "UploadsFileError": "文件大小超过 5MB", "UploadsSaveFileError": "保存文件失败", "UploadFile": "上传文件", "UploadsWasmError": "Wasm 模式未实现保存代码", From 87985498f6bb7fd77a7a2f173ccf94180539f784 Mon Sep 17 00:00:00 2001 From: Argo-AscioTech Date: Fri, 27 Sep 2024 16:01:40 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=20AutoResetWhenI?= =?UTF-8?q?nvalid=20=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Upload/CardUpload.razor.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/BootstrapBlazor/Components/Upload/CardUpload.razor.cs b/src/BootstrapBlazor/Components/Upload/CardUpload.razor.cs index 4b1461b6628..b0b12424108 100644 --- a/src/BootstrapBlazor/Components/Upload/CardUpload.razor.cs +++ b/src/BootstrapBlazor/Components/Upload/CardUpload.razor.cs @@ -101,6 +101,12 @@ public partial class CardUpload [Parameter] public bool IsUploadButtonAtFirst { get; set; } + /// + /// 获得/设置 上传非法时是否重置 默认 false + /// + [Parameter] + public bool AutoResetWhenInvalid { get; set; } + [Inject] [NotNull] private IIconTheme? IconTheme { get; set; } From 67f1e7684dad7ba0562666188239db4233d04aa4 Mon Sep 17 00:00:00 2001 From: Argo-AscioTech Date: Fri, 27 Sep 2024 16:13:42 +0800 Subject: [PATCH 3/5] =?UTF-8?q?doc:=20=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Upload/ButtonUploadBase.cs | 3 ++- src/BootstrapBlazor/Components/Upload/UploadBase.cs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/BootstrapBlazor/Components/Upload/ButtonUploadBase.cs b/src/BootstrapBlazor/Components/Upload/ButtonUploadBase.cs index ca063b0ac5a..2678415e6f4 100644 --- a/src/BootstrapBlazor/Components/Upload/ButtonUploadBase.cs +++ b/src/BootstrapBlazor/Components/Upload/ButtonUploadBase.cs @@ -214,7 +214,8 @@ protected override async Task OnFileChange(InputFileChangeEventArgs args) } file.Uploaded = true; } - //触发ValueChange，以支持bing-value + + //触发 ValueChange，以支持 bind-value await base.OnFileChange(args); } diff --git a/src/BootstrapBlazor/Components/Upload/UploadBase.cs b/src/BootstrapBlazor/Components/Upload/UploadBase.cs index 36336a58884..f160c6eef3e 100644 --- a/src/BootstrapBlazor/Components/Upload/UploadBase.cs +++ b/src/BootstrapBlazor/Components/Upload/UploadBase.cs @@ -102,7 +102,7 @@ protected virtual async Task OnFileDelete(UploadFile item) } /// - /// + /// 上传文件改变时回调此方法 /// /// /// From dbeec637efb87849ad1d7b1ce28dbac5d9bdc156 Mon Sep 17 00:00:00 2001 From: Argo-AscioTech Date: Fri, 27 Sep 2024 16:13:53 +0800 Subject: [PATCH 4/5] =?UTF-8?q?Revert=20"feat:=20=E5=A2=9E=E5=8A=A0=20Auto?= =?UTF-8?q?ResetWhenInvalid=20=E5=8F=82=E6=95=B0"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 87985498f6bb7fd77a7a2f173ccf94180539f784. --- src/BootstrapBlazor/Components/Upload/CardUpload.razor.cs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/BootstrapBlazor/Components/Upload/CardUpload.razor.cs b/src/BootstrapBlazor/Components/Upload/CardUpload.razor.cs index b0b12424108..4b1461b6628 100644 --- a/src/BootstrapBlazor/Components/Upload/CardUpload.razor.cs +++ b/src/BootstrapBlazor/Components/Upload/CardUpload.razor.cs @@ -101,12 +101,6 @@ public partial class CardUpload [Parameter] public bool IsUploadButtonAtFirst { get; set; } - /// - /// 获得/设置 上传非法时是否重置 默认 false - /// - [Parameter] - public bool AutoResetWhenInvalid { get; set; } - [Inject] [NotNull] private IIconTheme? IconTheme { get; set; } From b164ddb06c63e34e2805a6885e6fbf5687cffcf7 Mon Sep 17 00:00:00 2001 From: Argo-AscioTech Date: Fri, 27 Sep 2024 16:27:44 +0800 Subject: [PATCH 5/5] chore: bump version 8.10.1 --- src/BootstrapBlazor/BootstrapBlazor.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj index e0161cf7d29..f481b948e34 100644 --- a/src/BootstrapBlazor/BootstrapBlazor.csproj +++ b/src/BootstrapBlazor/BootstrapBlazor.csproj @@ -1,7 +1,7 @@ - 8.9.4-beta06 + 8.10.1