From eaab90e90a03fc9e3191de68af09816f147f15dc Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Sat, 27 Sep 2025 14:51:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(Table):=20=E5=8F=8C=E5=87=BB=E8=A1=A8?= =?UTF-8?q?=E5=A4=B4=E8=87=AA=E5=8A=A8=E8=B0=83=E6=95=B4=E5=88=97=E5=AE=BD?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=9C=A8=E8=A1=A8=E6=A0=BC=E6=9C=89=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E8=A1=8C=E6=97=B6=E4=B8=8D=E8=83=BD=E6=AD=A3=E5=B8=B8?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=20#6797?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Initial plan * Implemented fix for multiple dialog scrolling issue Co-authored-by: ArgoZhang <22001478+ArgoZhang@users.noreply.github.com> * fix: 多级弹窗窗体内滚动 * Revert "Implemented fix for multiple dialog scrolling issue" This reverts commit 42c41361d01c12745d41157d84028a336c87d3e6. * chore: bump version 9.10.3 --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: ArgoZhang <22001478+ArgoZhang@users.noreply.github.com> Co-authored-by: Argo Zhang --- src/BootstrapBlazor/BootstrapBlazor.csproj | 2 +- src/BootstrapBlazor/Components/Dialog/Dialog.razor.cs | 5 +++++ src/BootstrapBlazor/Components/Table/Table.razor.js | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj index 917abf50715..36199d92bab 100644 --- a/src/BootstrapBlazor/BootstrapBlazor.csproj +++ b/src/BootstrapBlazor/BootstrapBlazor.csproj @@ -1,7 +1,7 @@  - 9.10.2 + 9.10.3 diff --git a/src/BootstrapBlazor/Components/Dialog/Dialog.razor.cs b/src/BootstrapBlazor/Components/Dialog/Dialog.razor.cs index 679fd8a1b22..5b3f3969e53 100644 --- a/src/BootstrapBlazor/Components/Dialog/Dialog.razor.cs +++ b/src/BootstrapBlazor/Components/Dialog/Dialog.razor.cs @@ -166,6 +166,11 @@ private async Task Show(DialogOption option) private static RenderFragment RenderDialog(int index, Dictionary parameter) => builder => { + if (index > 0) + { + parameter[nameof(ModalDialog.IsScrolling)] = true; + } + builder.OpenComponent(100 + index); builder.AddMultipleAttributes(101 + index, parameter); builder.SetKey(parameter); diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.js b/src/BootstrapBlazor/Components/Table/Table.razor.js index e5c8753bcf4..35b5bf13077 100644 --- a/src/BootstrapBlazor/Components/Table/Table.razor.js +++ b/src/BootstrapBlazor/Components/Table/Table.razor.js @@ -715,10 +715,10 @@ const autoFitColumnWidth = async (table, col) => { const index = indexOfCol(col); let rows = null; if (table.thead) { - rows = table.body.querySelectorAll('table > tbody > tr'); + rows = table.body.querySelectorAll('table > tbody > tr:not(.is-detail)'); } else { - rows = table.tables[0].querySelectorAll('table > tbody > tr'); + rows = table.tables[0].querySelectorAll('table > tbody > tr:not(.is-detail)'); } let maxWidth = 0; From 6baef74d42282235869c6397069b8d51e685171c Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sun, 28 Sep 2025 16:25:15 +0800 Subject: [PATCH 2/2] chore: bump version 9.11.0-beta01 --- 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 36199d92bab..39c6bf406a0 100644 --- a/src/BootstrapBlazor/BootstrapBlazor.csproj +++ b/src/BootstrapBlazor/BootstrapBlazor.csproj @@ -1,7 +1,7 @@  - 9.10.3 + 9.11.0-beta01