diff --git a/src/BootstrapBlazor.Shared/Samples/Table/TablesEdit.razor b/src/BootstrapBlazor.Shared/Samples/Table/TablesEdit.razor index b0b2dc2ce405d56ac4eb1e3debf17ebf13beeb67..6b5a27535be97906acd4c1e29c8999a5ef9eb29b 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 80a73b1a9b5e78b1af6c764dec28ab06e7558346..87f1d1b883dacc011d2b9e4996c7044977e5697a 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}" }); diff --git a/src/BootstrapBlazor/Components/Dialog/EditDialog.razor b/src/BootstrapBlazor/Components/Dialog/EditDialog.razor index 411104afde94ed59ae8c5519dc5a60e6089c6cf2..8a190b299e25aca92ef1e1dfa571a45ee4e6a279 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) +
+ - } else { diff --git a/src/BootstrapBlazor/Components/Input/BootstrapInput.razor b/src/BootstrapBlazor/Components/Input/BootstrapInput.razor index 104b711c10bc2f274537b9ee025fa8852fcc4a86..b2c61ae1c2b5fdfe65b442e5ece3afa73531e444 100644 --- a/src/BootstrapBlazor/Components/Input/BootstrapInput.razor +++ b/src/BootstrapBlazor/Components/Input/BootstrapInput.razor @@ -8,7 +8,3 @@ } - - - @ChildContent - diff --git a/src/BootstrapBlazor/Components/Upload/CardUpload.razor b/src/BootstrapBlazor/Components/Upload/CardUpload.razor index 93d902f1850ce3503801289dec00f2af1bd96007..10f97439b2ea0a503d55dc12ae63edc0365a0fb5 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) { - }
- diff --git a/src/BootstrapBlazor/wwwroot/modules/upload.js b/src/BootstrapBlazor/wwwroot/modules/upload.js index 1c670e192bf625b1a136d4979ec79b2e9eff93a4..acf281744f08c5ee3e802802cc782616428e9d65 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');