From c2da5b7c860e7bb5454fc1dc44ed093c8a4b1764 Mon Sep 17 00:00:00 2001 From: Argo-AscioTech Date: Tue, 21 Nov 2023 15:38:16 +0800 Subject: [PATCH 1/8] =?UTF-8?q?doc:=20=E6=9B=B4=E6=96=B0=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor.Server/Locales/zh.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor.Server/Locales/zh.json b/src/BootstrapBlazor.Server/Locales/zh.json index 7efebfc9250..5978c3232fe 100644 --- a/src/BootstrapBlazor.Server/Locales/zh.json +++ b/src/BootstrapBlazor.Server/Locales/zh.json @@ -4822,7 +4822,7 @@ "WidthP3": "通过设置按钮 IsShow 参数来控制是否显示按钮", "AllowResizingTitle": "允许列调整", "AllowResizingIntro": "通过指定 AllowResizing 设置表格列允许调整宽度", - "AllowResizingDesc": "注意: Table 父容器有有效宽度值时 Table 才会出现滚动条", + "AllowResizingDesc": "注意: Table 父容器有有效宽度值时 Table 才会出现滚动条,可通过设置 TableName 参数开启本地化存储列宽功能,即通过拖拽后列宽下次打开时会保持", "WidthButtonText1": "明细", "WidthButtonText2": "编辑", "WidthButtonText3": "权限", From f7eb896bca6b3f70f39ce1235c2007b7c34c9fb6 Mon Sep 17 00:00:00 2001 From: Argo-AscioTech Date: Tue, 21 Nov 2023 15:42:59 +0800 Subject: [PATCH 2/8] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=94=B9=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Table/Table.razor.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.cs b/src/BootstrapBlazor/Components/Table/Table.razor.cs index 49abdff5767..6d1040061ee 100644 --- a/src/BootstrapBlazor/Components/Table/Table.razor.cs +++ b/src/BootstrapBlazor/Components/Table/Table.razor.cs @@ -579,7 +579,7 @@ public void ExpandDetailRow(TItem item) /// 获得/设置 表格名称 默认 null 用于列宽持久化功能 /// [Parameter] - public string? TableName { get; set; } + public string? ClientTableName { get; set; } [CascadingParameter] [NotNull] @@ -836,14 +836,14 @@ protected override async Task OnAfterRenderAsync(bool firstRender) ? $"width: {_localStorageTableWidth.Value}px;" : null; - private string? GetTableName(bool hasHeader) => hasHeader ? TableName : null; + private string? GetTableName(bool hasHeader) => hasHeader ? ClientTableName : null; private async Task> ReloadColumnWidth() { IEnumerable? ret = null; - if (!string.IsNullOrEmpty(TableName) && AllowResizing) + if (!string.IsNullOrEmpty(ClientTableName) && AllowResizing) { - var jsonData = await InvokeAsync("reloadColumnWidth", Id, TableName); + var jsonData = await InvokeAsync("reloadColumnWidth", Id, ClientTableName); if (!string.IsNullOrEmpty(jsonData)) { try From 21cfa5b15872da4276f09f094e026b039f84b0d5 Mon Sep 17 00:00:00 2001 From: Argo-AscioTech Date: Tue, 21 Nov 2023 15:43:06 +0800 Subject: [PATCH 3/8] =?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 --- .../Components/Samples/Table/TablesColumnResizing.razor | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/BootstrapBlazor.Server/Components/Samples/Table/TablesColumnResizing.razor b/src/BootstrapBlazor.Server/Components/Samples/Table/TablesColumnResizing.razor index 53486308361..61584043850 100644 --- a/src/BootstrapBlazor.Server/Components/Samples/Table/TablesColumnResizing.razor +++ b/src/BootstrapBlazor.Server/Components/Samples/Table/TablesColumnResizing.razor @@ -46,7 +46,8 @@ Name="AllowResizing">

@((MarkupString)Localizer["AllowResizingDesc"].Value)

From b697cdf4722c805fbc9cffc8b245fa6eb1a32ece Mon Sep 17 00:00:00 2001 From: Argo-AscioTech Date: Tue, 21 Nov 2023 15:43:13 +0800 Subject: [PATCH 4/8] =?UTF-8?q?doc:=20=E6=9B=B4=E6=96=B0=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor.Server/Locales/zh.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor.Server/Locales/zh.json b/src/BootstrapBlazor.Server/Locales/zh.json index 5978c3232fe..576d9a740ce 100644 --- a/src/BootstrapBlazor.Server/Locales/zh.json +++ b/src/BootstrapBlazor.Server/Locales/zh.json @@ -4822,7 +4822,7 @@ "WidthP3": "通过设置按钮 IsShow 参数来控制是否显示按钮", "AllowResizingTitle": "允许列调整", "AllowResizingIntro": "通过指定 AllowResizing 设置表格列允许调整宽度", - "AllowResizingDesc": "注意: Table 父容器有有效宽度值时 Table 才会出现滚动条,可通过设置 TableName 参数开启本地化存储列宽功能,即通过拖拽后列宽下次打开时会保持", + "AllowResizingDesc": "注意: Table 父容器有有效宽度值时 Table 才会出现滚动条,可通过设置 ClientTableName 参数开启本地化存储列宽功能,即通过拖拽后列宽下次打开时会保持", "WidthButtonText1": "明细", "WidthButtonText2": "编辑", "WidthButtonText3": "权限", From 3d69e2de73941a7610e4b15ea6690eb3dacd50a9 Mon Sep 17 00:00:00 2001 From: Argo-AscioTech Date: Tue, 21 Nov 2023 15:46:08 +0800 Subject: [PATCH 5/8] =?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 --- .../Components/Samples/Table/TablesColumnResizing.razor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor.Server/Components/Samples/Table/TablesColumnResizing.razor b/src/BootstrapBlazor.Server/Components/Samples/Table/TablesColumnResizing.razor index 61584043850..99c8e04ec33 100644 --- a/src/BootstrapBlazor.Server/Components/Samples/Table/TablesColumnResizing.razor +++ b/src/BootstrapBlazor.Server/Components/Samples/Table/TablesColumnResizing.razor @@ -44,7 +44,7 @@ -

@((MarkupString)Localizer["AllowResizingDesc"].Value)

+
@((MarkupString)Localizer["AllowResizingDesc"].Value)
Date: Tue, 21 Nov 2023 15:56:54 +0800 Subject: [PATCH 6/8] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=96=B0=20loader=20?= =?UTF-8?q?=E6=9F=A5=E6=89=BE=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Table/Table.razor.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.js b/src/BootstrapBlazor/Components/Table/Table.razor.js index f8de4374adb..a8f8f0dfbd7 100644 --- a/src/BootstrapBlazor/Components/Table/Table.razor.js +++ b/src/BootstrapBlazor/Components/Table/Table.razor.js @@ -579,10 +579,11 @@ export function sort(id) { export function load(id, method) { const table = Data.get(id) - const loader = table.el.querySelector('.table-loader') + const loader = [...table.el.children].find(el => el.classList.contains('table-loader'); if (method === 'show') { loader.classList.add('show') - } else { + } + else { loader.classList.remove('show') } } From 3798b29029f4a3fa05c5ad2bb1c10a6faff400b3 Mon Sep 17 00:00:00 2001 From: Argo-AscioTech Date: Tue, 21 Nov 2023 15:59:03 +0800 Subject: [PATCH 7/8] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=96=B0=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Table/Table.razor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.js b/src/BootstrapBlazor/Components/Table/Table.razor.js index a8f8f0dfbd7..b89443932cb 100644 --- a/src/BootstrapBlazor/Components/Table/Table.razor.js +++ b/src/BootstrapBlazor/Components/Table/Table.razor.js @@ -579,7 +579,7 @@ export function sort(id) { export function load(id, method) { const table = Data.get(id) - const loader = [...table.el.children].find(el => el.classList.contains('table-loader'); + const loader = [...table.el.children].find(el => el.classList.contains('table-loader')); if (method === 'show') { loader.classList.add('show') } From 63f1e086c796aa87caace4d41daf0c25bad19aea Mon Sep 17 00:00:00 2001 From: Argo-AscioTech Date: Tue, 21 Nov 2023 16:05:13 +0800 Subject: [PATCH 8/8] chore: bump version 8.0.3-beta3 --- 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 6878443d52e..afc237d8f3a 100644 --- a/src/BootstrapBlazor/BootstrapBlazor.csproj +++ b/src/BootstrapBlazor/BootstrapBlazor.csproj @@ -1,7 +1,7 @@ - 8.0.3-beta02 + 8.0.3-beta03