From 71ec75c7455cd1ebee740f555bbbedb6d0d181ae Mon Sep 17 00:00:00 2001 From: Argo-Asicotech Date: Tue, 11 Oct 2022 16:28:13 -0700 Subject: [PATCH 1/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/Table/TablesEdit.razor | 4 ++-- src/BootstrapBlazor.Shared/Samples/Table/TablesEdit.razor.cs | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/BootstrapBlazor.Shared/Samples/Table/TablesEdit.razor b/src/BootstrapBlazor.Shared/Samples/Table/TablesEdit.razor index b0b2dc2ce..6b5a27535 100644 --- a/src/BootstrapBlazor.Shared/Samples/Table/TablesEdit.razor +++ b/src/BootstrapBlazor.Shared/Samples/Table/TablesEdit.razor @@ -21,10 +21,10 @@
- +
- +
diff --git a/src/BootstrapBlazor.Shared/Samples/Table/TablesEdit.razor.cs b/src/BootstrapBlazor.Shared/Samples/Table/TablesEdit.razor.cs index 80a73b1a9..87f1d1b88 100644 --- a/src/BootstrapBlazor.Shared/Samples/Table/TablesEdit.razor.cs +++ b/src/BootstrapBlazor.Shared/Samples/Table/TablesEdit.razor.cs @@ -42,6 +42,8 @@ public partial class TablesEdit private string DataServiceUrl => $"{WebsiteOption.CurrentValue.BootstrapBlazorLink}/wikis/Table%20%E7%BB%84%E4%BB%B6%E6%95%B0%E6%8D%AE%E6%9C%8D%E5%8A%A1%E4%BB%8B%E7%BB%8D?sort_id=3207977"; + private string? PlaceHolderString { get; set; } + /// /// OnInitialized 方法 /// @@ -55,6 +57,8 @@ public partial class TablesEdit BindItems = Foo.GenerateFoo(LocalizerFoo).Take(5).ToList(); CustomerDataService = new FooDataService(LocalizerFoo); + + PlaceHolderString ??= Localizer["P4"]; } private static Task OnAddAsync() => Task.FromResult(new Foo() { DateTime = DateTime.Now, Address = $"Custom address {DateTime.Now.Second}" }); -- Gitee From 195198f00891430f1a834617629ba6e2651dc9b9 Mon Sep 17 00:00:00 2001 From: Argo-Asicotech Date: Tue, 11 Oct 2022 16:29:29 -0700 Subject: [PATCH 2/4] =?UTF-8?q?refactor:=20=E6=A0=BC=E5=BC=8F=E5=8C=96?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Dialog/EditDialog.razor | 16 ++++++++-------- .../Components/Input/BootstrapInput.razor | 4 ---- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/BootstrapBlazor/Components/Dialog/EditDialog.razor b/src/BootstrapBlazor/Components/Dialog/EditDialog.razor index 411104afd..8a190b299 100644 --- a/src/BootstrapBlazor/Components/Dialog/EditDialog.razor +++ b/src/BootstrapBlazor/Components/Dialog/EditDialog.razor @@ -6,15 +6,15 @@ @if (BodyTemplate != null) {
- @BodyTemplate.Invoke(Model) + @BodyTemplate(Model) +
+
+ @if (!IsTracking) + { +
-
- @if (!IsTracking) - { -
} else { diff --git a/src/BootstrapBlazor/Components/Input/BootstrapInput.razor b/src/BootstrapBlazor/Components/Input/BootstrapInput.razor index 104b711c1..b2c61ae1c 100644 --- a/src/BootstrapBlazor/Components/Input/BootstrapInput.razor +++ b/src/BootstrapBlazor/Components/Input/BootstrapInput.razor @@ -8,7 +8,3 @@ } - - - @ChildContent - -- Gitee From fb97e44344dedc79579a1c93682ffff56d336e31 Mon Sep 17 00:00:00 2001 From: Argo-Asicotech Date: Tue, 11 Oct 2022 16:56:12 -0700 Subject: [PATCH 3/4] =?UTF-8?q?doc:=20=E5=A2=9E=E5=8A=A0=20aria=20?= =?UTF-8?q?=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Upload/CardUpload.razor | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/BootstrapBlazor/Components/Upload/CardUpload.razor b/src/BootstrapBlazor/Components/Upload/CardUpload.razor index 93d902f18..10f97439b 100644 --- a/src/BootstrapBlazor/Components/Upload/CardUpload.razor +++ b/src/BootstrapBlazor/Components/Upload/CardUpload.razor @@ -14,7 +14,7 @@
@if (IsImage(item)) { - + prevUrl } else { @@ -24,17 +24,18 @@
@GetFileName(item) (@item.Size.ToFileSizeString())
- @if(ShowDownloadButton) { - }
- -- Gitee From 94811164d0f01d9aa2fdc505d32d5d1618abd795 Mon Sep 17 00:00:00 2001 From: Argo-Asicotech Date: Tue, 11 Oct 2022 16:56:53 -0700 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=8C=89=E9=92=AE=E6=97=A0=E6=B3=95=E5=A4=9A?= =?UTF-8?q?=E6=AC=A1=E8=A7=A6=E5=8F=91=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/wwwroot/modules/upload.js | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/BootstrapBlazor/wwwroot/modules/upload.js b/src/BootstrapBlazor/wwwroot/modules/upload.js index 1c670e192..acf281744 100644 --- a/src/BootstrapBlazor/wwwroot/modules/upload.js +++ b/src/BootstrapBlazor/wwwroot/modules/upload.js @@ -4,17 +4,13 @@ import BlazorComponent from "./base/blazor-component.js" class Upload extends BlazorComponent { _init() { this._inputFile = this._element.querySelector('[type="file"]') - this._browserButton = this._element.querySelector('.btn-browser') - this._setListeners() } _setListeners() { - if (this._browserButton !== null) { - EventHandler.on(this._browserButton, 'click', () => { - this._inputFile.click() - }) - } + EventHandler.on(this._element, 'click', '.btn-browser', () => { + this._inputFile.click() + }) //阻止浏览器默认行为 EventHandler.on(document, "dragleave", e => { @@ -41,7 +37,7 @@ class Upload extends BlazorComponent { } this._inputFile.files = e.dataTransfer.files; - const event = new Event('change', {bubbles: true}); + const event = new Event('change', { bubbles: true }); this._inputFile.dispatchEvent(event); } catch (e) { console.error(e); @@ -50,13 +46,13 @@ class Upload extends BlazorComponent { EventHandler.on(this._element, 'paste', e => { this._inputFile.files = e.clipboardData.files; - const event = new Event('change', {bubbles: true}); + const event = new Event('change', { bubbles: true }); this._inputFile.dispatchEvent(event); }); } _dispose() { - EventHandler.off(this._browserButton, 'click') + EventHandler.off(this._element, 'click', '.btn-browser') EventHandler.off(document, 'dragleave'); EventHandler.off(document, 'drop'); EventHandler.off(document, 'dragenter'); -- Gitee