From 5d2ad17ab91c6cd1219ad7fc4a12edae4a65263b Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Thu, 20 Mar 2025 12:35:49 +0800 Subject: [PATCH 1/9] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=96=B0=E7=A4=BA?= =?UTF-8?q?=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Samples/AutoFills.razor | 37 +++++++++---------- .../Components/Samples/AutoFills.razor.cs | 11 +++++- 2 files changed, 28 insertions(+), 20 deletions(-) diff --git a/src/BootstrapBlazor.Server/Components/Samples/AutoFills.razor b/src/BootstrapBlazor.Server/Components/Samples/AutoFills.razor index d190cb37bff..b26943cb9db 100644 --- a/src/BootstrapBlazor.Server/Components/Samples/AutoFills.razor +++ b/src/BootstrapBlazor.Server/Components/Samples/AutoFills.razor @@ -87,10 +87,9 @@

1. 使用 OnQueryAsync 作为数据源

-
- +
+
@@ -103,19 +102,19 @@
-
- @if (Model4 != null) - { - - } -
+
+ @if (Model4 != null) + { + + } +

2. 使用 Items 作为数据源

-
-
- +
+ @@ -130,14 +129,14 @@
-
- @if (Model4 != null) - { - - } -
+
+ @if (Model5 != null) + { + + } +
diff --git a/src/BootstrapBlazor.Server/Components/Samples/AutoFills.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/AutoFills.razor.cs index f75b92cc280..e0c5051334e 100644 --- a/src/BootstrapBlazor.Server/Components/Samples/AutoFills.razor.cs +++ b/src/BootstrapBlazor.Server/Components/Samples/AutoFills.razor.cs @@ -22,6 +22,9 @@ partial class AutoFills [NotNull] private Foo Model4 { get; set; } = new(); + [NotNull] + private Foo Model5 { get; set; } = new(); + private static string? OnGetDisplayText(Foo? foo) => foo?.Name; [NotNull] @@ -36,6 +39,9 @@ partial class AutoFills [NotNull] private IEnumerable? Items4 { get; set; } + [NotNull] + private IEnumerable? Items5 { get; set; } + [Inject] [NotNull] private IStringLocalizer? LocalizerFoo { get; set; } @@ -58,6 +64,9 @@ protected override void OnInitialized() Items4 = Foo.GenerateFoo(LocalizerFoo); Model4 = Items3.First(); + + Items5 = Foo.GenerateFoo(LocalizerFoo); + Model5 = Items3.First(); } private Task> OnCustomFilter(string searchText) @@ -68,7 +77,7 @@ private Task> OnCustomFilter(string searchText) private Task> OnCustomVirtulizeFilter(string searchText) { - var items = string.IsNullOrEmpty(searchText) ? Items4 : Items4.Where(i => i.Name!.Contains(searchText)); + var items = string.IsNullOrEmpty(searchText) ? Items5 : Items5.Where(i => i.Name!.Contains(searchText)); return Task.FromResult(items); } From 35c38fdf9caf3599206065e8e9f31537af892595 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Thu, 20 Mar 2025 12:36:09 +0800 Subject: [PATCH 2/9] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=96=B0=20dom=20?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=20div?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AutoComplete/AutoComplete.razor | 40 ++++++++++--------- .../Components/AutoFill/AutoFill.razor | 10 ++--- 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/src/BootstrapBlazor/Components/AutoComplete/AutoComplete.razor b/src/BootstrapBlazor/Components/AutoComplete/AutoComplete.razor index fe0b8e712da..7cb4d6f865f 100644 --- a/src/BootstrapBlazor/Components/AutoComplete/AutoComplete.razor +++ b/src/BootstrapBlazor/Components/AutoComplete/AutoComplete.razor @@ -23,23 +23,25 @@ @code { RenderFragment RenderDropdown => - @
    - @foreach (var item in Rows) - { -
  • - @if (ItemTemplate == null) - { -
    @item
    - } - else - { - @ItemTemplate(item) - } -
    • - } - @if (ShowNoDataTip && Rows.Count == 0) - { -
  • @NoDataTip
    • - } -
; + @
+
+ @foreach (var item in Rows) + { +
+ @if (ItemTemplate == null) + { +
@item
+ } + else + { + @ItemTemplate(item) + } +
+ } + @if (ShowNoDataTip && Rows.Count == 0) + { +
@NoDataTip
+ } +
+
; } diff --git a/src/BootstrapBlazor/Components/AutoFill/AutoFill.razor b/src/BootstrapBlazor/Components/AutoFill/AutoFill.razor index d7200fcd4dd..abb093b0736 100644 --- a/src/BootstrapBlazor/Components/AutoFill/AutoFill.razor +++ b/src/BootstrapBlazor/Components/AutoFill/AutoFill.razor @@ -22,7 +22,7 @@ { } -
    +
    @if (IsVirtualize) {
    @@ -41,7 +41,7 @@ } else if (ShowNoDataTip && Rows.Count == 0) { -
  • @NoDataTip
    • +
    @NoDataTip
    } else { @@ -52,12 +52,12 @@ }
    } -
+
@code { RenderFragment RenderRow => item => - @
  • + @
    @if (ItemTemplate != null) { @ItemTemplate(item) @@ -66,7 +66,7 @@ {
    @GetDisplayText(item)
    } -
    • ; + ; RenderFragment RenderPlaceHolderRow => context => @
    From 242f0811936c196f7ce5c4884048abe00ee464ba Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Thu, 20 Mar 2025 12:36:27 +0800 Subject: [PATCH 3/9] =?UTF-8?q?refactor:=20=E4=BF=AE=E5=A4=8D=20offset=20?= =?UTF-8?q?=E5=A4=B1=E6=95=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AutoComplete/AutoComplete.razor.js | 19 +++++++++++++++++++ .../AutoComplete/PopoverCompleteBase.cs | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/Components/AutoComplete/AutoComplete.razor.js b/src/BootstrapBlazor/Components/AutoComplete/AutoComplete.razor.js index 3b7e8557f35..1300fdd8b0d 100644 --- a/src/BootstrapBlazor/Components/AutoComplete/AutoComplete.razor.js +++ b/src/BootstrapBlazor/Components/AutoComplete/AutoComplete.razor.js @@ -16,6 +16,25 @@ export function init(id, invoke) { if (isPopover) { ac.popover = Popover.init(el, { toggleClass: '[data-bs-toggle="bb.dropdown"]' }); } + else { + const extraClass = input.getAttribute('data-bs-custom-class'); + if (extraClass) { + menu.classList.add(...extraClass.split(' ')) + } + const offset = input.getAttribute('data-bs-offset'); + if (offset) { + const [x, y] = offset.split(','); + const xValue = parseFloat(x); + const yValue = parseFloat(y); + + if (xValue > 0) { + menu.style.setProperty('margin-left', `${xValue}px`); + } + if (yValue > 0) { + menu.style.setProperty('margin-top', `${yValue}px`); + } + } + } // debounce const duration = parseInt(input.getAttribute('data-bb-debounce') || '0'); diff --git a/src/BootstrapBlazor/Components/AutoComplete/PopoverCompleteBase.cs b/src/BootstrapBlazor/Components/AutoComplete/PopoverCompleteBase.cs index 466a54973b3..eaef94daa1b 100644 --- a/src/BootstrapBlazor/Components/AutoComplete/PopoverCompleteBase.cs +++ b/src/BootstrapBlazor/Components/AutoComplete/PopoverCompleteBase.cs @@ -155,7 +155,7 @@ protected override void OnParametersSet() { base.OnParametersSet(); - Offset ??= "[0, 10]"; + Offset ??= "[0, 6]"; } /// From 3d204406fd458383fe3f23d1af76f06d77f3562a Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Thu, 20 Mar 2025 12:55:00 +0800 Subject: [PATCH 4/9] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=96=B0=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Samples/AutoFills.razor | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/BootstrapBlazor.Server/Components/Samples/AutoFills.razor b/src/BootstrapBlazor.Server/Components/Samples/AutoFills.razor index b26943cb9db..bac344794ff 100644 --- a/src/BootstrapBlazor.Server/Components/Samples/AutoFills.razor +++ b/src/BootstrapBlazor.Server/Components/Samples/AutoFills.razor @@ -9,7 +9,7 @@
    @((MarkupString)@Localizer["NormalDesc"].Value)
    -
    @@ -32,7 +32,7 @@
    @((MarkupString)Localizer["CustomFilterDesc"].Value)
    + OnGetDisplayText="OnGetDisplayText">
    @@ -54,7 +54,7 @@
    @((MarkupString)@Localizer["ShowDropdownListOnFocusDesc"].Value)
    - +
    From 4516f0f5b81f764efd93f72fd9f8b819898016bf Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Thu, 20 Mar 2025 12:57:06 +0800 Subject: [PATCH 5/9] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=96=B0=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/AutoComplete/AutoComplete.razor.cs | 1 - src/BootstrapBlazor/Components/AutoFill/AutoFill.razor.cs | 1 - 2 files changed, 2 deletions(-) diff --git a/src/BootstrapBlazor/Components/AutoComplete/AutoComplete.razor.cs b/src/BootstrapBlazor/Components/AutoComplete/AutoComplete.razor.cs index e61dc7c9859..fd9784285cf 100644 --- a/src/BootstrapBlazor/Components/AutoComplete/AutoComplete.razor.cs +++ b/src/BootstrapBlazor/Components/AutoComplete/AutoComplete.razor.cs @@ -16,7 +16,6 @@ public partial class AutoComplete /// Gets the component style ///
    private string? ClassString => CssBuilder.Default("auto-complete") - .AddClassFromAttributes(AdditionalAttributes) .Build(); /// diff --git a/src/BootstrapBlazor/Components/AutoFill/AutoFill.razor.cs b/src/BootstrapBlazor/Components/AutoFill/AutoFill.razor.cs index e2d07b6dde0..b08c419ca25 100644 --- a/src/BootstrapBlazor/Components/AutoFill/AutoFill.razor.cs +++ b/src/BootstrapBlazor/Components/AutoFill/AutoFill.razor.cs @@ -19,7 +19,6 @@ public partial class AutoFill /// private string? ClassString => CssBuilder.Default("auto-complete auto-fill") .AddClass("is-clearable", IsClearable) - .AddClassFromAttributes(AdditionalAttributes) .Build(); /// From 01aefee366bb763f40a6f48c5ecf429efcf5f736 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Thu, 20 Mar 2025 14:32:39 +0800 Subject: [PATCH 6/9] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=96=B0=E6=B8=85?= =?UTF-8?q?=E7=A9=BA=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/AutoFill/AutoFill.razor.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/BootstrapBlazor/Components/AutoFill/AutoFill.razor.cs b/src/BootstrapBlazor/Components/AutoFill/AutoFill.razor.cs index b08c419ca25..1fc6ad0f3f3 100644 --- a/src/BootstrapBlazor/Components/AutoFill/AutoFill.razor.cs +++ b/src/BootstrapBlazor/Components/AutoFill/AutoFill.razor.cs @@ -196,6 +196,10 @@ private async Task OnClearValue() await OnClearAsync(); } CurrentValue = default; + _displayText = null; + _filterItems = null; + _searchText = null; + if (OnQueryAsync != null) { await _virtualizeElement.RefreshDataAsync(); From 9752bf47ce6ad49b1bb17db74becb3f08f1a040a Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Thu, 20 Mar 2025 15:33:14 +0800 Subject: [PATCH 7/9] =?UTF-8?q?refactor:=20=E5=A2=9E=E5=8A=A0=E5=8D=A0?= =?UTF-8?q?=E4=BD=8D=E7=AC=A6=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/AutoFill/AutoFill.razor | 2 +- src/BootstrapBlazor/Components/AutoFill/AutoFill.razor.cs | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/Components/AutoFill/AutoFill.razor b/src/BootstrapBlazor/Components/AutoFill/AutoFill.razor index abb093b0736..796198fd49e 100644 --- a/src/BootstrapBlazor/Components/AutoFill/AutoFill.razor +++ b/src/BootstrapBlazor/Components/AutoFill/AutoFill.razor @@ -69,7 +69,7 @@
    ; RenderFragment RenderPlaceHolderRow => context => - @
    + @
    ; } diff --git a/src/BootstrapBlazor/Components/AutoFill/AutoFill.razor.cs b/src/BootstrapBlazor/Components/AutoFill/AutoFill.razor.cs index 1fc6ad0f3f3..cb377078ea0 100644 --- a/src/BootstrapBlazor/Components/AutoFill/AutoFill.razor.cs +++ b/src/BootstrapBlazor/Components/AutoFill/AutoFill.razor.cs @@ -160,6 +160,10 @@ public partial class AutoFill .AddClass($"text-danger", IsValid.HasValue && !IsValid.Value) .Build(); + private string? PlaceHolderStyleString => RowHeight > 50f + ? CssBuilder.Default().AddStyle("height", $"{RowHeight}px").Build() + : null; + /// /// /// From e0f4b7ec32e9ed04a2ef5f74fcbf6de5a8840032 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Thu, 20 Mar 2025 15:33:39 +0800 Subject: [PATCH 8/9] =?UTF-8?q?perf:=20=E6=8F=90=E9=AB=98=E6=80=A7?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/AutoFill/AutoFill.razor.cs | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/src/BootstrapBlazor/Components/AutoFill/AutoFill.razor.cs b/src/BootstrapBlazor/Components/AutoFill/AutoFill.razor.cs index cb377078ea0..dcb7178e0d0 100644 --- a/src/BootstrapBlazor/Components/AutoFill/AutoFill.razor.cs +++ b/src/BootstrapBlazor/Components/AutoFill/AutoFill.razor.cs @@ -103,14 +103,14 @@ public partial class AutoFill /// /// Effective when is set to true. [Parameter] - public float RowHeight { get; set; } = 33f; + public float RowHeight { get; set; } = 50f; /// - /// Gets or sets the overscan count for virtual scrolling. Default is 4. + /// Gets or sets the overscan count for virtual scrolling. Default is 3. /// /// Effective when is set to true. [Parameter] - public int OverscanCount { get; set; } = 4; + public int OverscanCount { get; set; } = 3; /// /// Gets or sets the callback method for loading virtualized items. @@ -181,6 +181,14 @@ protected override void OnParametersSet() Items ??= []; } + private bool _render = true; + + /// + /// + /// + /// + protected override bool ShouldRender() => _render; + private bool IsNullable() => !ValueType.IsValueType || NullableUnderlyingType != null; /// @@ -229,14 +237,13 @@ private async Task OnClickItem(TValue val) private List Rows => _filterItems ?? [.. Items]; - private int _totalCount; - private async ValueTask> LoadItems(ItemsProviderRequest request) { - var count = _totalCount == 0 ? request.Count : Math.Min(request.Count, _totalCount - request.StartIndex); - var data = await OnQueryAsync(new() { StartIndex = request.StartIndex, Count = count, SearchText = _searchText }); + _render = false; + var data = await OnQueryAsync(new() { StartIndex = request.StartIndex, Count = request.Count, SearchText = _searchText }); + _render = true; - _totalCount = data.TotalCount; + var _totalCount = data.TotalCount; var items = data.Items ?? []; return new ItemsProviderResult(items, _totalCount); } From 849e9f5f2e23b374a0946b1cb9c20ca8b8dc13fc Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Thu, 20 Mar 2025 15:34:19 +0800 Subject: [PATCH 9/9] chore: bump version 9.5.0-beta09 --- 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 5206e2197c2..cbdf8dfb073 100644 --- a/src/BootstrapBlazor/BootstrapBlazor.csproj +++ b/src/BootstrapBlazor/BootstrapBlazor.csproj @@ -1,7 +1,7 @@  - 9.5.0-beta08 + 9.5.0-beta09