From e1374317de519fbe60025724a21046c0ff62ff47 Mon Sep 17 00:00:00 2001
From: zhangpeihang <948869991@qq.com>
Date: Wed, 19 Jul 2023 17:01:04 +0800
Subject: [PATCH 01/20] =?UTF-8?q?doc:=20=E6=8B=86=E5=88=86=20tablecolumn?=
=?UTF-8?q?=20=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Extensions/MenusLocalizerExtensions.cs | 35 +++++++++
.../Samples/Table/TablesColumn.razor | 76 -------------------
.../Samples/Table/TablesColumnAlign.razor | 15 ++++
.../Table/TablesColumnBreakPoint.razor | 20 +++++
.../Samples/Table/TablesColumnCheckbox.razor | 25 ++++++
.../Samples/Table/TablesColumnDrag.razor | 14 ++++
.../Samples/Table/TablesColumnFomatter.razor | 15 ++++
.../Samples/Table/TablesColumnList.razor | 14 ++++
.../Samples/Table/TablesColumnResizing.razor | 14 ++++
9 files changed, 152 insertions(+), 76 deletions(-)
create mode 100644 src/BootstrapBlazor.Shared/Samples/Table/TablesColumnAlign.razor
create mode 100644 src/BootstrapBlazor.Shared/Samples/Table/TablesColumnBreakPoint.razor
create mode 100644 src/BootstrapBlazor.Shared/Samples/Table/TablesColumnCheckbox.razor
create mode 100644 src/BootstrapBlazor.Shared/Samples/Table/TablesColumnDrag.razor
create mode 100644 src/BootstrapBlazor.Shared/Samples/Table/TablesColumnFomatter.razor
create mode 100644 src/BootstrapBlazor.Shared/Samples/Table/TablesColumnList.razor
create mode 100644 src/BootstrapBlazor.Shared/Samples/Table/TablesColumnResizing.razor
diff --git a/src/BootstrapBlazor.Shared/Extensions/MenusLocalizerExtensions.cs b/src/BootstrapBlazor.Shared/Extensions/MenusLocalizerExtensions.cs
index 49e1ad272..c8116196d 100644
--- a/src/BootstrapBlazor.Shared/Extensions/MenusLocalizerExtensions.cs
+++ b/src/BootstrapBlazor.Shared/Extensions/MenusLocalizerExtensions.cs
@@ -671,6 +671,41 @@ internal static class MenusLocalizerExtensions
Url = "tables/column"
},
new()
+ {
+ Text = "列选择",
+ Url = "tables/column/checkbox"
+ },
+ new()
+ {
+ Text = Localizer["TableColumn"],
+ Url = "tables/column/drag"
+ },
+ new()
+ {
+ Text = "动态列宽",
+ Url = "tables/column/resieing"
+ },
+ new()
+ {
+ Text = "自定义显示/隐藏列",
+ Url = "tables/column/list"
+ },
+ new()
+ {
+ Text = "根据屏幕宽度自动显示/隐藏列",
+ Url = "tables/column/breakpoint"
+ },
+ new()
+ {
+ Text = "列对齐",
+ Url = "tables/column/align"
+ },
+ new()
+ {
+ Text = "列格式",
+ Url = "tables/column/fomatter"
+ },
+ new()
{
Text = Localizer["TableCell"],
Url = "tables/cell"
diff --git a/src/BootstrapBlazor.Shared/Samples/Table/TablesColumn.razor b/src/BootstrapBlazor.Shared/Samples/Table/TablesColumn.razor
index 5646b8488..4324dbd56 100644
--- a/src/BootstrapBlazor.Shared/Samples/Table/TablesColumn.razor
+++ b/src/BootstrapBlazor.Shared/Samples/Table/TablesColumn.razor
@@ -13,24 +13,6 @@
@((MarkupString)Localizer["ColumnTextDesc"].Value)
-
-
-
-
-
-
-
-
-
-
- @((MarkupString)Localizer["FormatterP1"].Value)
- @((MarkupString)Localizer["FormatterP2"].Value)
-
-
-
- @((MarkupString)Localizer["AlignP1"].Value)
- @((MarkupString)Localizer["AlignP2"].Value)
-
-
-
- @((MarkupString)Localizer["ShownWithBreakPointP1"].Value)
-
- - @((MarkupString)Localizer["ShownWithBreakPointLi1"].Value)
- - @((MarkupString)Localizer["ShownWithBreakPointLi2"].Value)
- - @((MarkupString)Localizer["ShownWithBreakPointLi3"].Value)
- - @((MarkupString)Localizer["ShownWithBreakPointLi4"].Value)
- - @((MarkupString)Localizer["ShownWithBreakPointLi5"].Value)
-
- @((MarkupString)Localizer["ShownWithBreakPointP2"].Value)
- @((MarkupString)Localizer["ShownWithBreakPointP3"].Value)
- @((MarkupString)Localizer["ShownWithBreakPointP4"].Value)
-
-
-
- @((MarkupString)Localizer["VisibleP1"].Value)
- @((MarkupString)Localizer["VisibleP2"].Value)
- @((MarkupString)Localizer["VisibleP3"].Value)
- @((MarkupString)Localizer["VisibleP4"].Value)
- @((MarkupString)Localizer["ResetVisibleColumnsDesc"].Value)
-
-
-
- @((MarkupString)Localizer["AllowResizingDesc"].Value)
-
-
-
- @((MarkupString)Localizer["AllowDragOrderDesc"].Value)
-
-
Localizer
+@inject IOptionsMonitor WebsiteOption
+
+@Localizer["TablesColumnTitle"]
+
+@Localizer["TablesColumnDescription"]
+
+
+ @((MarkupString)Localizer["AlignP1"].Value)
+ @((MarkupString)Localizer["AlignP2"].Value)
+
diff --git a/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnBreakPoint.razor b/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnBreakPoint.razor
new file mode 100644
index 000000000..e563fce9e
--- /dev/null
+++ b/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnBreakPoint.razor
@@ -0,0 +1,20 @@
+@page "/tables/column/breakpoint"
+@inject IStringLocalizer Localizer
+@inject IOptionsMonitor WebsiteOption
+
+
+ @((MarkupString)Localizer["ShownWithBreakPointP1"].Value)
+
+ - @((MarkupString)Localizer["ShownWithBreakPointLi1"].Value)
+ - @((MarkupString)Localizer["ShownWithBreakPointLi2"].Value)
+ - @((MarkupString)Localizer["ShownWithBreakPointLi3"].Value)
+ - @((MarkupString)Localizer["ShownWithBreakPointLi4"].Value)
+ - @((MarkupString)Localizer["ShownWithBreakPointLi5"].Value)
+
+ @((MarkupString)Localizer["ShownWithBreakPointP2"].Value)
+ @((MarkupString)Localizer["ShownWithBreakPointP3"].Value)
+ @((MarkupString)Localizer["ShownWithBreakPointP4"].Value)
+
diff --git a/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnCheckbox.razor b/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnCheckbox.razor
new file mode 100644
index 000000000..0e212b7ec
--- /dev/null
+++ b/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnCheckbox.razor
@@ -0,0 +1,25 @@
+@page "/tables/column/checkbox"
+@inject IStringLocalizer Localizer
+@inject IOptionsMonitor WebsiteOption
+
+@Localizer["TablesColumnTitle"]
+
+@Localizer["TablesColumnDescription"]
+
+
+
+
+
+
+
+
+
diff --git a/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnDrag.razor b/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnDrag.razor
new file mode 100644
index 000000000..e04afa920
--- /dev/null
+++ b/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnDrag.razor
@@ -0,0 +1,14 @@
+@page "/tables/column/drag"
+@inject IStringLocalizer Localizer
+@inject IOptionsMonitor WebsiteOption
+
+@Localizer["TablesColumnTitle"]
+
+@Localizer["TablesColumnDescription"]
+
+
+ @((MarkupString)Localizer["AllowDragOrderDesc"].Value)
+
diff --git a/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnFomatter.razor b/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnFomatter.razor
new file mode 100644
index 000000000..6a5eb377d
--- /dev/null
+++ b/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnFomatter.razor
@@ -0,0 +1,15 @@
+@page "/tables/column/fomatter"
+@inject IStringLocalizer Localizer
+@inject IOptionsMonitor WebsiteOption
+
+@Localizer["TablesColumnTitle"]
+
+@Localizer["TablesColumnDescription"]
+
+
+ @((MarkupString)Localizer["FormatterP1"].Value)
+ @((MarkupString)Localizer["FormatterP2"].Value)
+
diff --git a/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnList.razor b/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnList.razor
new file mode 100644
index 000000000..c96b0afe0
--- /dev/null
+++ b/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnList.razor
@@ -0,0 +1,14 @@
+@page "/tables/column/list"
+@inject IStringLocalizer Localizer
+@inject IOptionsMonitor WebsiteOption
+
+
+ @((MarkupString)Localizer["VisibleP1"].Value)
+ @((MarkupString)Localizer["VisibleP2"].Value)
+ @((MarkupString)Localizer["VisibleP3"].Value)
+ @((MarkupString)Localizer["VisibleP4"].Value)
+ @((MarkupString)Localizer["ResetVisibleColumnsDesc"].Value)
+
diff --git a/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnResizing.razor b/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnResizing.razor
new file mode 100644
index 000000000..7c51e8d85
--- /dev/null
+++ b/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnResizing.razor
@@ -0,0 +1,14 @@
+@page "/tables/column/resieing"
+@inject IStringLocalizer Localizer
+@inject IOptionsMonitor WebsiteOption
+
+@Localizer["TablesColumnTitle"]
+
+@Localizer["TablesColumnDescription"]
+
+
+ @((MarkupString)Localizer["AllowResizingDesc"].Value)
+
--
Gitee
From c89cd16577f7adfc6dd0c98ffb111cd0c31dc304 Mon Sep 17 00:00:00 2001
From: Argo-AscioTech
Date: Thu, 20 Jul 2023 00:14:29 +0800
Subject: [PATCH 02/20] =?UTF-8?q?doc:=20=E6=9B=B4=E6=94=B9=E8=B5=84?=
=?UTF-8?q?=E6=BA=90=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/BootstrapBlazor.Shared/Locales/zh.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/BootstrapBlazor.Shared/Locales/zh.json b/src/BootstrapBlazor.Shared/Locales/zh.json
index c867b4bf5..39dade6fc 100644
--- a/src/BootstrapBlazor.Shared/Locales/zh.json
+++ b/src/BootstrapBlazor.Shared/Locales/zh.json
@@ -5025,7 +5025,7 @@
"TableFilter": "筛选和排序",
"TableFixHeader": "固定表头",
"TableHeaderGroup": "表头分组",
- "TableFixColumn": "固定列",
+ "TableFixColumn": "列固定",
"TablePage": "分页功能",
"TableToolbar": "工具栏",
"TableEdit": "表单维护",
--
Gitee
From 800ac05c71c4993265177db1ede9d99563f4b6c6 Mon Sep 17 00:00:00 2001
From: Argo-AscioTech
Date: Thu, 20 Jul 2023 00:14:41 +0800
Subject: [PATCH 03/20] =?UTF-8?q?doc:=20=E6=9B=B4=E6=96=B0=E5=88=97?=
=?UTF-8?q?=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Extensions/MenusLocalizerExtensions.cs | 21 +++++++------------
1 file changed, 8 insertions(+), 13 deletions(-)
diff --git a/src/BootstrapBlazor.Shared/Extensions/MenusLocalizerExtensions.cs b/src/BootstrapBlazor.Shared/Extensions/MenusLocalizerExtensions.cs
index c8116196d..abba246fd 100644
--- a/src/BootstrapBlazor.Shared/Extensions/MenusLocalizerExtensions.cs
+++ b/src/BootstrapBlazor.Shared/Extensions/MenusLocalizerExtensions.cs
@@ -677,25 +677,20 @@ internal static class MenusLocalizerExtensions
},
new()
{
- Text = Localizer["TableColumn"],
+ Text = "列拖动",
Url = "tables/column/drag"
},
new()
{
- Text = "动态列宽",
+ Text = "列宽调整",
Url = "tables/column/resieing"
},
new()
{
- Text = "自定义显示/隐藏列",
+ Text = "列显示/隐藏",
Url = "tables/column/list"
},
new()
- {
- Text = "根据屏幕宽度自动显示/隐藏列",
- Url = "tables/column/breakpoint"
- },
- new()
{
Text = "列对齐",
Url = "tables/column/align"
@@ -706,6 +701,11 @@ internal static class MenusLocalizerExtensions
Url = "tables/column/fomatter"
},
new()
+ {
+ Text = Localizer["TableFixColumn"],
+ Url = "tables/fix-column"
+ },
+ new()
{
Text = Localizer["TableCell"],
Url = "tables/cell"
@@ -756,11 +756,6 @@ internal static class MenusLocalizerExtensions
Url = "tables/multi-header"
},
new()
- {
- Text = Localizer["TableFixColumn"],
- Url = "tables/fix-column"
- },
- new()
{
Text = Localizer["TablePage"],
Url = "tables/pages"
--
Gitee
From 4a0ce634bafcbb2edad99876a433ed33cf8ad577 Mon Sep 17 00:00:00 2001
From: zhangpeihang <948869991@qq.com>
Date: Thu, 20 Jul 2023 09:36:16 +0800
Subject: [PATCH 04/20] =?UTF-8?q?doc:=20=E6=8B=86=E5=88=86=20tablecolumn?=
=?UTF-8?q?=20=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Extensions/MenusLocalizerExtensions.cs | 15 ++++++++++
.../Samples/Table/TablesColumn.razor | 28 -------------------
.../Samples/Table/TablesColumnCopy.razor | 14 ++++++++++
.../Samples/Table/TablesColumnGenerate.razor | 22 +++++++++++++++
.../Samples/Table/TablesColumnTemplate.razor | 13 +++++++++
5 files changed, 64 insertions(+), 28 deletions(-)
create mode 100644 src/BootstrapBlazor.Shared/Samples/Table/TablesColumnCopy.razor
create mode 100644 src/BootstrapBlazor.Shared/Samples/Table/TablesColumnGenerate.razor
create mode 100644 src/BootstrapBlazor.Shared/Samples/Table/TablesColumnTemplate.razor
diff --git a/src/BootstrapBlazor.Shared/Extensions/MenusLocalizerExtensions.cs b/src/BootstrapBlazor.Shared/Extensions/MenusLocalizerExtensions.cs
index abba246fd..704266b4e 100644
--- a/src/BootstrapBlazor.Shared/Extensions/MenusLocalizerExtensions.cs
+++ b/src/BootstrapBlazor.Shared/Extensions/MenusLocalizerExtensions.cs
@@ -699,6 +699,21 @@ internal static class MenusLocalizerExtensions
{
Text = "列格式",
Url = "tables/column/fomatter"
+ },
+ new()
+ {
+ Text = "复制列",
+ Url = "tables/column/copy"
+ },
+ new()
+ {
+ Text = "列模板",
+ Url = "tables/column/template"
+ },
+ new()
+ {
+ Text = "生成列",
+ Url = "tables/column/generate"
},
new()
{
diff --git a/src/BootstrapBlazor.Shared/Samples/Table/TablesColumn.razor b/src/BootstrapBlazor.Shared/Samples/Table/TablesColumn.razor
index 4324dbd56..b89cb18a9 100644
--- a/src/BootstrapBlazor.Shared/Samples/Table/TablesColumn.razor
+++ b/src/BootstrapBlazor.Shared/Samples/Table/TablesColumn.razor
@@ -35,34 +35,6 @@
-
- @((MarkupString)Localizer["ShowCopyColumnDesc"].Value)
-
-
-
-
-
-
-
- @((MarkupString)Localizer["AutoGenerateColumnsP1"].Value)
-
- - @((MarkupString)Localizer["AutoGenerateColumnsLi1"].Value)
- - @((MarkupString)Localizer["AutoGenerateColumnsLi2"].Value)
- - @((MarkupString)string.Format(Localizer["AutoGenerateColumnsLi3"].Value, WebsiteOption.CurrentValue.BootstrapBlazorLink))
-
- @((MarkupString)Localizer["AutoGenerateColumnsP2"].Value)
-
-
-
Localizer
+@inject IOptionsMonitor WebsiteOption
+
+@Localizer["TablesColumnTitle"]
+
+@Localizer["TablesColumnDescription"]
+
+
+ @((MarkupString)Localizer["ShowCopyColumnDesc"].Value)
+
diff --git a/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnGenerate.razor b/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnGenerate.razor
new file mode 100644
index 000000000..fdca9c664
--- /dev/null
+++ b/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnGenerate.razor
@@ -0,0 +1,22 @@
+@page "/tables/column/generate"
+@inject IStringLocalizer Localizer
+@inject IOptionsMonitor WebsiteOption
+
+@Localizer["TablesColumnTitle"]
+
+@Localizer["TablesColumnDescription"]
+
+
+
+ @((MarkupString)Localizer["AutoGenerateColumnsP1"].Value)
+
+ - @((MarkupString)Localizer["AutoGenerateColumnsLi1"].Value)
+ - @((MarkupString)Localizer["AutoGenerateColumnsLi2"].Value)
+ - @((MarkupString)string.Format(Localizer["AutoGenerateColumnsLi3"].Value, WebsiteOption.CurrentValue.BootstrapBlazorLink))
+
+ @((MarkupString)Localizer["AutoGenerateColumnsP2"].Value)
+
+
diff --git a/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnTemplate.razor b/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnTemplate.razor
new file mode 100644
index 000000000..2c33aa771
--- /dev/null
+++ b/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnTemplate.razor
@@ -0,0 +1,13 @@
+@page "/tables/column/template"
+@inject IStringLocalizer Localizer
+@inject IOptionsMonitor WebsiteOption
+
+@Localizer["TablesColumnTitle"]
+
+@Localizer["TablesColumnDescription"]
+
+
+
--
Gitee
From 07a53fba151e8a325710ffda77b6cbf301f84f32 Mon Sep 17 00:00:00 2001
From: zhangpeihang <948869991@qq.com>
Date: Thu, 20 Jul 2023 09:43:39 +0800
Subject: [PATCH 05/20] =?UTF-8?q?doc:=20=E6=8B=86=E5=88=86=20tablecolumn?=
=?UTF-8?q?=20=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Extensions/MenusLocalizerExtensions.cs | 5 +++
.../Samples/Table/TablesColumn.razor | 36 -------------------
.../Table/TablesColumnBreakPoint.razor | 4 +++
.../Table/TablesColumnColumnCreating.razor | 21 +++++++++++
.../Samples/Table/TablesColumnList.razor | 4 +++
.../Samples/Table/TablesColumnResizing.razor | 9 +++++
.../Samples/Table/TablesColumnTemplate.razor | 13 +++++++
7 files changed, 56 insertions(+), 36 deletions(-)
create mode 100644 src/BootstrapBlazor.Shared/Samples/Table/TablesColumnColumnCreating.razor
diff --git a/src/BootstrapBlazor.Shared/Extensions/MenusLocalizerExtensions.cs b/src/BootstrapBlazor.Shared/Extensions/MenusLocalizerExtensions.cs
index 704266b4e..c24351f6d 100644
--- a/src/BootstrapBlazor.Shared/Extensions/MenusLocalizerExtensions.cs
+++ b/src/BootstrapBlazor.Shared/Extensions/MenusLocalizerExtensions.cs
@@ -714,6 +714,11 @@ internal static class MenusLocalizerExtensions
{
Text = "生成列",
Url = "tables/column/generate"
+ },
+ new()
+ {
+ Text = "当前列设置",
+ Url = "tables/column/columncreating"
},
new()
{
diff --git a/src/BootstrapBlazor.Shared/Samples/Table/TablesColumn.razor b/src/BootstrapBlazor.Shared/Samples/Table/TablesColumn.razor
index b89cb18a9..049793d69 100644
--- a/src/BootstrapBlazor.Shared/Samples/Table/TablesColumn.razor
+++ b/src/BootstrapBlazor.Shared/Samples/Table/TablesColumn.razor
@@ -13,42 +13,6 @@
@((MarkupString)Localizer["ColumnTextDesc"].Value)
-
- @((MarkupString)Localizer["WidthP1"].Value)
- @((MarkupString)Localizer["WidthP2"].Value)
- @((MarkupString)Localizer["WidthP3"].Value)
-
-
-
- @((MarkupString)Localizer["TableColumnP1"].Value)
- @((MarkupString)Localizer["TableColumnP2"].Value)
- @((MarkupString)Localizer["TableColumnP3"].Value)
-
- - @((MarkupString)Localizer["TableColumnli1"].Value)
- - @((MarkupString)Localizer["TableColumnli2"].Value)
-
-
-
-
-
- @((MarkupString)Localizer["OnColumnCreatingP1"].Value)
-
- - @Localizer["OnColumnCreatingLi1"]
- - @((MarkupString)Localizer["OnColumnCreatingLi2"].Value)
-
- @((MarkupString)Localizer["OnColumnCreatingP2"].Value)
-
-
-
Localizer
@inject IOptionsMonitor WebsiteOption
+@Localizer["TablesColumnTitle"]
+
+@Localizer["TablesColumnDescription"]
+
Localizer
+@inject IOptionsMonitor WebsiteOption
+
+@Localizer["TablesColumnTitle"]
+
+@Localizer["TablesColumnDescription"]
+
+
+
+ @((MarkupString)Localizer["OnColumnCreatingP1"].Value)
+
+ - @Localizer["OnColumnCreatingLi1"]
+ - @((MarkupString)Localizer["OnColumnCreatingLi2"].Value)
+
+ @((MarkupString)Localizer["OnColumnCreatingP2"].Value)
+
+
diff --git a/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnList.razor b/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnList.razor
index c96b0afe0..289e202ff 100644
--- a/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnList.razor
+++ b/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnList.razor
@@ -2,6 +2,10 @@
@inject IStringLocalizer Localizer
@inject IOptionsMonitor WebsiteOption
+@Localizer["TablesColumnTitle"]
+
+@Localizer["TablesColumnDescription"]
+
@Localizer["TablesColumnDescription"]
+
+ @((MarkupString)Localizer["WidthP1"].Value)
+ @((MarkupString)Localizer["WidthP2"].Value)
+ @((MarkupString)Localizer["WidthP3"].Value)
+
+
@Localizer["TablesColumnDescription"]
+
+ @((MarkupString)Localizer["TableColumnP1"].Value)
+ @((MarkupString)Localizer["TableColumnP2"].Value)
+ @((MarkupString)Localizer["TableColumnP3"].Value)
+
+ - @((MarkupString)Localizer["TableColumnli1"].Value)
+ - @((MarkupString)Localizer["TableColumnli2"].Value)
+
+
+
Date: Thu, 20 Jul 2023 13:06:45 +0800
Subject: [PATCH 06/20] =?UTF-8?q?doc:=20=E4=BF=AE=E6=94=B9=E6=96=87?=
=?UTF-8?q?=E4=BB=B6=E5=90=8D=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../{TablesColumnCheckbox.razor => TablesColumnSelection.razor} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename src/BootstrapBlazor.Shared/Samples/Table/{TablesColumnCheckbox.razor => TablesColumnSelection.razor} (95%)
diff --git a/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnCheckbox.razor b/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnSelection.razor
similarity index 95%
rename from src/BootstrapBlazor.Shared/Samples/Table/TablesColumnCheckbox.razor
rename to src/BootstrapBlazor.Shared/Samples/Table/TablesColumnSelection.razor
index 0e212b7ec..10e56f5b2 100644
--- a/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnCheckbox.razor
+++ b/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnSelection.razor
@@ -1,4 +1,4 @@
-@page "/tables/column/checkbox"
+@page "/tables/column/selection"
@inject IStringLocalizer Localizer
@inject IOptionsMonitor WebsiteOption
--
Gitee
From 9374a52455a27ad9c63bad2a59721377c7145973 Mon Sep 17 00:00:00 2001
From: zhangpeihang <948869991@qq.com>
Date: Thu, 20 Jul 2023 13:07:11 +0800
Subject: [PATCH 07/20] =?UTF-8?q?doc:=20=E6=B7=BB=E5=8A=A0=E6=96=B0?=
=?UTF-8?q?=E5=A2=9E=E8=8F=9C=E5=8D=95=E8=B5=84=E6=BA=90=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Extensions/MenusLocalizerExtensions.cs | 22 +++++++++----------
src/BootstrapBlazor.Shared/Locales/en.json | 10 +++++++++
src/BootstrapBlazor.Shared/Locales/zh.json | 10 +++++++++
3 files changed, 31 insertions(+), 11 deletions(-)
diff --git a/src/BootstrapBlazor.Shared/Extensions/MenusLocalizerExtensions.cs b/src/BootstrapBlazor.Shared/Extensions/MenusLocalizerExtensions.cs
index c24351f6d..55ff51fc0 100644
--- a/src/BootstrapBlazor.Shared/Extensions/MenusLocalizerExtensions.cs
+++ b/src/BootstrapBlazor.Shared/Extensions/MenusLocalizerExtensions.cs
@@ -672,52 +672,52 @@ internal static class MenusLocalizerExtensions
},
new()
{
- Text = "列选择",
- Url = "tables/column/checkbox"
+ Text = Localizer["TableColumnSelection"],
+ Url = "tables/column/selection"
},
new()
{
- Text = "列拖动",
+ Text = Localizer["TableColumnDrag"],
Url = "tables/column/drag"
},
new()
{
- Text = "列宽调整",
+ Text = Localizer["TableColumnResieing"],
Url = "tables/column/resieing"
},
new()
{
- Text = "列显示/隐藏",
+ Text = Localizer["TableColumnList"],
Url = "tables/column/list"
},
new()
{
- Text = "列对齐",
+ Text = Localizer["TableColumnAlign"],
Url = "tables/column/align"
},
new()
{
- Text = "列格式",
+ Text = Localizer["TableColumnFomatter"],
Url = "tables/column/fomatter"
},
new()
{
- Text = "复制列",
+ Text = Localizer["TableColumnCopy"],
Url = "tables/column/copy"
},
new()
{
- Text = "列模板",
+ Text = Localizer["TableColumnTemplate"],
Url = "tables/column/template"
},
new()
{
- Text = "生成列",
+ Text = Localizer["TableColumnGenerate"],
Url = "tables/column/generate"
},
new()
{
- Text = "当前列设置",
+ Text = Localizer["TableColumnColumnCreating"],
Url = "tables/column/columncreating"
},
new()
diff --git a/src/BootstrapBlazor.Shared/Locales/en.json b/src/BootstrapBlazor.Shared/Locales/en.json
index 7cf885730..274836973 100644
--- a/src/BootstrapBlazor.Shared/Locales/en.json
+++ b/src/BootstrapBlazor.Shared/Locales/en.json
@@ -5008,6 +5008,16 @@
"TableBase": "Base",
"TableRow": "Row",
"TableColumn": "Column",
+ "TableColumnSelection": "Column Selection",
+ "TableColumnDrag": "Column Dragging",
+ "TableColumnResieing": "Column width Adjustment",
+ "TableColumnList": "Columns Show/Hide",
+ "TableColumnAlign": "Column Alignment",
+ "TableColumnFomatter": "Column Format",
+ "TableColumnCopy": "Column Replication",
+ "TableColumnTemplate": "Column Template",
+ "TableColumnGenerate": "Automatically Generate Columns",
+ "TableColumnColumnCreating": "Current Column Settings",
"TableCell": "Cell",
"TableDetail": "Detail",
"TableDynamic": "Dynamic",
diff --git a/src/BootstrapBlazor.Shared/Locales/zh.json b/src/BootstrapBlazor.Shared/Locales/zh.json
index 39dade6fc..4df5b4fbf 100644
--- a/src/BootstrapBlazor.Shared/Locales/zh.json
+++ b/src/BootstrapBlazor.Shared/Locales/zh.json
@@ -5017,6 +5017,16 @@
"TableBase": "基本功能",
"TableRow": "行设置",
"TableColumn": "列设置",
+ "TableColumnSelection": "列选择",
+ "TableColumnDrag": "列拖动",
+ "TableColumnResieing": "列宽调整",
+ "TableColumnList": "列显示/隐藏",
+ "TableColumnAlign": "列对齐",
+ "TableColumnFomatter": "列对齐",
+ "TableColumnCopy": "列复制",
+ "TableColumnTemplate": "列模板",
+ "TableColumnGenerate": "自动生成列",
+ "TableColumnColumnCreating": "当前列设置",
"TableCell": "单元格",
"TableDetail": "明细行",
"TableDynamic": "动态表格",
--
Gitee
From 3133a2e822ba1097e5fd26ca723512de2e16e552 Mon Sep 17 00:00:00 2001
From: Argo Zhang
Date: Wed, 19 Jul 2023 18:57:59 +0800
Subject: [PATCH 08/20] fix(Tab): should not rerender tabitem when close
preview tabitem (#1589)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* fix: 修复关闭 Tab 导致其他标签页重刷问题
* test: 更新单元测试
* refactor: 重构 Tab 渲染逻辑
* test: 补充单元测试
* chore: bump version 7.8.9
* test: 更新单元测试
* test: 更新单元测试
---
src/BootstrapBlazor/BootstrapBlazor.csproj | 2 +-
src/BootstrapBlazor/Components/Tab/Tab.razor | 12 +++----
test/UnitTest/Components/LinkButtonTest.cs | 7 ++--
test/UnitTest/Components/ListViewTest.cs | 3 --
test/UnitTest/Components/TabTest.cs | 35 ++++++++++++++++++--
test/UnitTest/Components/TableTest.cs | 7 ++--
6 files changed, 50 insertions(+), 16 deletions(-)
diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj
index 5249614ca..e84e10fc4 100644
--- a/src/BootstrapBlazor/BootstrapBlazor.csproj
+++ b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
- 7.8.8
+ 7.8.9
diff --git a/src/BootstrapBlazor/Components/Tab/Tab.razor b/src/BootstrapBlazor/Components/Tab/Tab.razor
index bfd91958a..e7b5e906c 100644
--- a/src/BootstrapBlazor/Components/Tab/Tab.razor
+++ b/src/BootstrapBlazor/Components/Tab/Tab.razor
@@ -95,7 +95,9 @@ else
{
foreach (var item in Items)
{
- @RenderTabItem(item)
+
+ @RenderTabItem(item)
+
}
}
@@ -105,9 +107,7 @@ else
@code {
RenderFragment RenderTabItem => item =>
- @
-
- @RenderTabItemContent(item)
-
-
;
+ @
+ @RenderTabItemContent(item)
+ ;
}
diff --git a/test/UnitTest/Components/LinkButtonTest.cs b/test/UnitTest/Components/LinkButtonTest.cs
index 817160495..b3e7e775e 100644
--- a/test/UnitTest/Components/LinkButtonTest.cs
+++ b/test/UnitTest/Components/LinkButtonTest.cs
@@ -81,8 +81,11 @@ public class LinkButtonTest : BootstrapBlazorTestBase
var click = false;
var cut = Context.RenderComponent(builder => builder.Add(s => s.OnClick, () => click = true));
- cut.Find("a").Click();
- Assert.True(click);
+ cut.InvokeAsync(() =>
+ {
+ cut.Find("a").Click();
+ Assert.True(click);
+ });
}
[Fact]
diff --git a/test/UnitTest/Components/ListViewTest.cs b/test/UnitTest/Components/ListViewTest.cs
index 9061ebdd4..e86a115b6 100644
--- a/test/UnitTest/Components/ListViewTest.cs
+++ b/test/UnitTest/Components/ListViewTest.cs
@@ -113,10 +113,7 @@ public class ListViewTest : BootstrapBlazorTestBase
pb.Add(a => a.PageItems, 2);
});
Assert.True(query);
-
- query = false;
cut.InvokeAsync(() => cut.Instance.QueryAsync());
- Assert.True(query);
}
[Fact]
diff --git a/test/UnitTest/Components/TabTest.cs b/test/UnitTest/Components/TabTest.cs
index 2384788ce..489e1d754 100644
--- a/test/UnitTest/Components/TabTest.cs
+++ b/test/UnitTest/Components/TabTest.cs
@@ -317,7 +317,7 @@ public class TabTest : TabTestBase
}
[Fact]
- public void IsOnlyRenderActiveTab_Ok()
+ public void IsOnlyRenderActiveTab_True()
{
var cut = Context.RenderComponent(pb =>
{
@@ -337,12 +337,43 @@ public class TabTest : TabTestBase
pb.Add(a => a.ChildContent, "Tab2-Content");
});
});
- Assert.Equal(1, cut.FindAll(".tabs-body-content").Count);
+ Assert.Contains("Tab1-Content", cut.Markup);
+ Assert.DoesNotContain("Tab2-Content", cut.Markup);
+ Assert.DoesNotContain("tabs-body-content", cut.Markup);
// 提高代码覆盖率
cut.InvokeAsync(() => cut.Instance.CloseOtherTabs());
}
+ [Fact]
+ public void IsOnlyRenderActiveTab_False()
+ {
+ var cut = Context.RenderComponent(pb =>
+ {
+ pb.Add(a => a.AdditionalAssemblies, new Assembly[] { GetType().Assembly });
+ pb.Add(a => a.IsOnlyRenderActiveTab, false);
+ pb.AddChildContent(pb =>
+ {
+ pb.Add(a => a.Text, "Tab1");
+ pb.Add(a => a.Url, "/Cat");
+ pb.Add(a => a.ChildContent, "Tab1-Content");
+ });
+ pb.AddChildContent(pb =>
+ {
+ pb.Add(a => a.Text, "Tab2");
+ pb.Add(a => a.Url, "/");
+ pb.Add(a => a.Closable, false);
+ pb.Add(a => a.ChildContent, "Tab2-Content");
+ });
+ });
+
+ cut.InvokeAsync(() =>
+ {
+ var count = cut.FindAll("tabs-body-content").Count;
+ Assert.Equal(2, count);
+ });
+ }
+
[Fact]
public void IsLazyLoadTabItem_Ok()
{
diff --git a/test/UnitTest/Components/TableTest.cs b/test/UnitTest/Components/TableTest.cs
index 120079559..d1c4adb1f 100644
--- a/test/UnitTest/Components/TableTest.cs
+++ b/test/UnitTest/Components/TableTest.cs
@@ -6747,8 +6747,11 @@ public class TableTest : TableTestBase
});
var table = cut.FindComponent>();
- cut.InvokeAsync(() => table.Instance.DragColumnCallback(1, 0));
- Assert.Equal("Address", name);
+ cut.InvokeAsync(async () =>
+ {
+ await table.Instance.DragColumnCallback(1, 0);
+ Assert.Equal("Address", name);
+ });
cut.InvokeAsync(async () =>
{
--
Gitee
From 2fefec16f295398f10a7a3b98ab8f31ff414bea8 Mon Sep 17 00:00:00 2001
From: Argo Zhang
Date: Thu, 20 Jul 2023 00:47:34 +0800
Subject: [PATCH 09/20] feat(TableFooterCell): add FormatString/Formatter
parameter (#1591)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* feat: TableFooterCell 增加格式化参数
* test: 增加单元测试
* chore: bump version 7.8.10-beta01
---
src/BootstrapBlazor/BootstrapBlazor.csproj | 2 +-
.../Components/Table/TableFooterCell.razor | 4 +-
.../Components/Table/TableFooterCell.razor.cs | 66 +++++++++++++++----
.../Components/TableFooterCellTest.cs | 46 +++++++++++--
4 files changed, 97 insertions(+), 21 deletions(-)
diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj
index e84e10fc4..0f7fb416b 100644
--- a/src/BootstrapBlazor/BootstrapBlazor.csproj
+++ b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
- 7.8.9
+ 7.8.10-beta01
diff --git a/src/BootstrapBlazor/Components/Table/TableFooterCell.razor b/src/BootstrapBlazor/Components/Table/TableFooterCell.razor
index d5411b067..fa7a09acc 100644
--- a/src/BootstrapBlazor/Components/Table/TableFooterCell.razor
+++ b/src/BootstrapBlazor/Components/Table/TableFooterCell.razor
@@ -3,11 +3,11 @@
@if (IsMobileMode)
{
- @GetText()
+ @Value
}
else
{
- @GetText()
+ @Value
|
}
diff --git a/src/BootstrapBlazor/Components/Table/TableFooterCell.razor.cs b/src/BootstrapBlazor/Components/Table/TableFooterCell.razor.cs
index b475906c6..f178dab9a 100644
--- a/src/BootstrapBlazor/Components/Table/TableFooterCell.razor.cs
+++ b/src/BootstrapBlazor/Components/Table/TableFooterCell.razor.cs
@@ -31,6 +31,18 @@ public partial class TableFooterCell
[Parameter]
public Alignment Align { get; set; }
+ ///
+ /// 获得/设置 格式化字符串 如时间类型设置 yyyy-MM-dd
+ ///
+ [Parameter]
+ public string? FormatString { get; set; }
+
+ ///
+ /// 获得/设置 列格式化回调委托
+ ///
+ [Parameter]
+ public Func>? Formatter { get; set; }
+
///
/// 获得/设置 聚合方法枚举 默认 Sum
///
@@ -61,7 +73,16 @@ public partial class TableFooterCell
[CascadingParameter(Name = "TableFooterContext")]
private object? DataSource { get; set; }
- private string? GetText() => Text ?? (GetCount(DataSource) == 0 ? "0" : (GetCountValue() ?? GetAggegateValue()));
+ private string? Value { get; set; }
+
+ ///
+ ///
+ ///
+ ///
+ protected override async Task OnParametersSetAsync()
+ {
+ Value = Text ?? (GetCount(DataSource) == 0 ? "0" : (GetCountValue() ?? await GetAggregateValue()));
+ }
///
/// 解析 Count Aggregate
@@ -91,9 +112,9 @@ public partial class TableFooterCell
return v;
}
- private string? GetAggegateValue()
+ private async Task GetAggregateValue()
{
- return Aggregate == AggregateType.Customer ? AggregateCustomerValue() : AggregateNumberValue();
+ return Aggregate == AggregateType.Customer ? AggregateCustomerValue() : await AggregateNumberValue();
string? AggregateCustomerValue()
{
@@ -105,7 +126,7 @@ public partial class TableFooterCell
return v;
}
- string? AggregateNumberValue()
+ async Task AggregateNumberValue()
{
string? v = null;
if (!string.IsNullOrEmpty(Field) && DataSource != null)
@@ -123,9 +144,9 @@ public partial class TableFooterCell
// Count 属性类型
var propertyType = propertyInfo.PropertyType;
- // 构建 Aggegate
+ // 构建 Aggregate
// @context.Sum(i => i.Count)
- var aggegateMethod = Aggregate switch
+ var aggregateMethod = Aggregate switch
{
AggregateType.Average => propertyType.Name switch
{
@@ -139,19 +160,19 @@ public partial class TableFooterCell
_ => GetType().GetMethod(nameof(CreateAggregateLambda), BindingFlags.NonPublic | BindingFlags.Static)!
.MakeGenericMethod(propertyType)
};
- if (aggegateMethod != null)
+ if (aggregateMethod != null)
{
- v = AggregateMethodInvoker(aggegateMethod, type, modelType, propertyType);
+ v = await AggregateMethodInvoker(aggregateMethod, type, modelType, propertyType);
}
}
}
return v;
}
- string? AggregateMethodInvoker(MethodInfo aggegateMethod, Type type, Type modelType, Type propertyType)
+ async Task AggregateMethodInvoker(MethodInfo aggregateMethod, Type type, Type modelType, Type propertyType)
{
string? v = null;
- var invoker = aggegateMethod.Invoke(null, new object[] { Aggregate, type, modelType, propertyType });
+ var invoker = aggregateMethod.Invoke(null, new object[] { Aggregate, type, modelType, propertyType });
if (invoker != null)
{
// 构建 Selector
@@ -166,16 +187,33 @@ public partial class TableFooterCell
if (invoker is Delegate d)
{
var val = d.DynamicInvoke(DataSource, selector);
- if (val != null)
- {
- v = val.ToString();
- }
+ v = await GetValue(val);
}
}
}
}
return v;
}
+
+ async Task GetValue(object? val)
+ {
+ string? ret = null;
+ if (Formatter != null)
+ {
+ // 格式化回调委托
+ ret = await Formatter(val);
+ }
+ else if (!string.IsNullOrEmpty(FormatString))
+ {
+ // 格式化字符串
+ ret = Utility.Format(val, FormatString);
+ }
+ else
+ {
+ ret = val?.ToString();
+ }
+ return ret;
+ }
}
///
diff --git a/test/UnitTest/Components/TableFooterCellTest.cs b/test/UnitTest/Components/TableFooterCellTest.cs
index e880b6bbe..a9e54e118 100644
--- a/test/UnitTest/Components/TableFooterCellTest.cs
+++ b/test/UnitTest/Components/TableFooterCellTest.cs
@@ -6,7 +6,7 @@ using BootstrapBlazor.Shared;
namespace UnitTest.Components;
-public class TableFooterCellTest : TestBase
+public class TableFooterCellTest : BootstrapBlazorTestBase
{
[Theory]
[InlineData(true)]
@@ -115,7 +115,7 @@ public class TableFooterCellTest : TestBase
[InlineData(AggregateType.Count, "3")]
[InlineData(AggregateType.Max, "3")]
[InlineData(AggregateType.Min, "1")]
- public void Aggegate_Ok(AggregateType aggregate, string expected)
+ public void Aggregate_Ok(AggregateType aggregate, string expected)
{
var ds = new List()
{
@@ -134,7 +134,7 @@ public class TableFooterCellTest : TestBase
}
[Fact]
- public void Aggegate_Customer()
+ public void Aggregate_Customer()
{
var ds = new List()
{
@@ -157,7 +157,7 @@ public class TableFooterCellTest : TestBase
}
[Fact]
- public void Aggegate_Empty()
+ public void Aggregate_Empty()
{
var ds = new List()
{
@@ -271,6 +271,44 @@ public class TableFooterCellTest : TestBase
});
}
+ [Fact]
+ public void FormatString_Ok()
+ {
+ var ds = new List()
+ {
+ new() { DecimalCount = 1.1m },
+ new() { DecimalCount = 2.2m },
+ new() { DecimalCount = 3.3m },
+ };
+ var cut = Context.RenderComponent(pb =>
+ {
+ pb.AddCascadingValue
///
- protected override Task InvokeInitAsync() => InvokeVoidAsync("init", Id, Target ?? "");
+ protected override Task InvokeInitAsync() => InvokeVoidAsync("init", Id, Target);
}
diff --git a/src/BootstrapBlazor/Components/GoTop/GoTop.razor.js b/src/BootstrapBlazor/Components/GoTop/GoTop.razor.js
index a554f9213..b0be28424 100644
--- a/src/BootstrapBlazor/Components/GoTop/GoTop.razor.js
+++ b/src/BootstrapBlazor/Components/GoTop/GoTop.razor.js
@@ -1,6 +1,14 @@
import Data from "../../modules/data.js?v=$version"
import EventHandler from "../../modules/event-handler.js?v=$version"
+const getScrollElement = el => {
+ let ele = el
+ while (ele && ele.scrollHeight <= ele.clientHeight) {
+ ele = ele.parentNode
+ }
+ return ele || window
+}
+
export function init(id, target) {
const el = document.getElementById(id)
if (el === null) {
@@ -12,7 +20,8 @@ export function init(id, target) {
go.tip = new bootstrap.Tooltip(el)
EventHandler.on(el, 'click', e => {
e.preventDefault();
- const element = document.querySelector(target) || window
+
+ const element = (target && document.querySelector(target)) || getScrollElement(el)
element.scrollTop = 0
go.tip.hide()
})
--
Gitee
From 204e9c08ba0f264a8207e0cc6bfd1231413d25d4 Mon Sep 17 00:00:00 2001
From: Argo-AscioTech
Date: Thu, 20 Jul 2023 17:01:49 +0800
Subject: [PATCH 11/20] =?UTF-8?q?refactor:=20=E7=A7=BB=E5=8A=A8=E8=87=AA?=
=?UTF-8?q?=E5=AE=9A=E4=B9=89=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../{Samples/Table => Components}/CustomerFilter.razor | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename src/BootstrapBlazor.Shared/{Samples/Table => Components}/CustomerFilter.razor (100%)
diff --git a/src/BootstrapBlazor.Shared/Samples/Table/CustomerFilter.razor b/src/BootstrapBlazor.Shared/Components/CustomerFilter.razor
similarity index 100%
rename from src/BootstrapBlazor.Shared/Samples/Table/CustomerFilter.razor
rename to src/BootstrapBlazor.Shared/Components/CustomerFilter.razor
--
Gitee
From c2e12f97ee421147c9fbfcd8e255e45ca00244f5 Mon Sep 17 00:00:00 2001
From: Argo-AscioTech
Date: Thu, 20 Jul 2023 17:02:14 +0800
Subject: [PATCH 12/20] =?UTF-8?q?doc:=20=E5=90=88=E5=B9=B6=E5=88=97?=
=?UTF-8?q?=E9=80=89=E6=8B=A9=E7=A4=BA=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Extensions/MenusLocalizerExtensions.cs | 5 ----
src/BootstrapBlazor.Shared/Locales/en.json | 1 -
src/BootstrapBlazor.Shared/Locales/zh.json | 1 -
.../Samples/Table/TablesColumn.razor | 18 +++++++++++++
.../Samples/Table/TablesColumnSelection.razor | 25 -------------------
5 files changed, 18 insertions(+), 32 deletions(-)
delete mode 100644 src/BootstrapBlazor.Shared/Samples/Table/TablesColumnSelection.razor
diff --git a/src/BootstrapBlazor.Shared/Extensions/MenusLocalizerExtensions.cs b/src/BootstrapBlazor.Shared/Extensions/MenusLocalizerExtensions.cs
index 55ff51fc0..e59c102ba 100644
--- a/src/BootstrapBlazor.Shared/Extensions/MenusLocalizerExtensions.cs
+++ b/src/BootstrapBlazor.Shared/Extensions/MenusLocalizerExtensions.cs
@@ -671,11 +671,6 @@ internal static class MenusLocalizerExtensions
Url = "tables/column"
},
new()
- {
- Text = Localizer["TableColumnSelection"],
- Url = "tables/column/selection"
- },
- new()
{
Text = Localizer["TableColumnDrag"],
Url = "tables/column/drag"
diff --git a/src/BootstrapBlazor.Shared/Locales/en.json b/src/BootstrapBlazor.Shared/Locales/en.json
index 274836973..f94674c84 100644
--- a/src/BootstrapBlazor.Shared/Locales/en.json
+++ b/src/BootstrapBlazor.Shared/Locales/en.json
@@ -5008,7 +5008,6 @@
"TableBase": "Base",
"TableRow": "Row",
"TableColumn": "Column",
- "TableColumnSelection": "Column Selection",
"TableColumnDrag": "Column Dragging",
"TableColumnResieing": "Column width Adjustment",
"TableColumnList": "Columns Show/Hide",
diff --git a/src/BootstrapBlazor.Shared/Locales/zh.json b/src/BootstrapBlazor.Shared/Locales/zh.json
index 4df5b4fbf..81ef54506 100644
--- a/src/BootstrapBlazor.Shared/Locales/zh.json
+++ b/src/BootstrapBlazor.Shared/Locales/zh.json
@@ -5017,7 +5017,6 @@
"TableBase": "基本功能",
"TableRow": "行设置",
"TableColumn": "列设置",
- "TableColumnSelection": "列选择",
"TableColumnDrag": "列拖动",
"TableColumnResieing": "列宽调整",
"TableColumnList": "列显示/隐藏",
diff --git a/src/BootstrapBlazor.Shared/Samples/Table/TablesColumn.razor b/src/BootstrapBlazor.Shared/Samples/Table/TablesColumn.razor
index 049793d69..2230fdfa4 100644
--- a/src/BootstrapBlazor.Shared/Samples/Table/TablesColumn.razor
+++ b/src/BootstrapBlazor.Shared/Samples/Table/TablesColumn.razor
@@ -13,6 +13,24 @@
@((MarkupString)Localizer["ColumnTextDesc"].Value)
+
+
+
+
+
+
+
+
+
Localizer
-@inject IOptionsMonitor WebsiteOption
-
-@Localizer["TablesColumnTitle"]
-
-@Localizer["TablesColumnDescription"]
-
-
-
-
-
-
-
-
-
--
Gitee
From 2ad8ff2f2623d1a12a9ac1fa65ff8c5102b0c428 Mon Sep 17 00:00:00 2001
From: Argo-AscioTech
Date: Thu, 20 Jul 2023 17:13:14 +0800
Subject: [PATCH 13/20] =?UTF-8?q?doc:=20=E6=9B=B4=E6=AD=A3=E5=8D=95?=
=?UTF-8?q?=E8=AF=8D=E6=8B=BC=E5=86=99=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Extensions/MenusLocalizerExtensions.cs | 4 ++--
src/BootstrapBlazor.Shared/Locales/en.json | 2 +-
src/BootstrapBlazor.Shared/Locales/zh.json | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/BootstrapBlazor.Shared/Extensions/MenusLocalizerExtensions.cs b/src/BootstrapBlazor.Shared/Extensions/MenusLocalizerExtensions.cs
index e59c102ba..d16fd730e 100644
--- a/src/BootstrapBlazor.Shared/Extensions/MenusLocalizerExtensions.cs
+++ b/src/BootstrapBlazor.Shared/Extensions/MenusLocalizerExtensions.cs
@@ -677,8 +677,8 @@ internal static class MenusLocalizerExtensions
},
new()
{
- Text = Localizer["TableColumnResieing"],
- Url = "tables/column/resieing"
+ Text = Localizer["TableColumnResizing"],
+ Url = "tables/column/resizing"
},
new()
{
diff --git a/src/BootstrapBlazor.Shared/Locales/en.json b/src/BootstrapBlazor.Shared/Locales/en.json
index f94674c84..c40c94766 100644
--- a/src/BootstrapBlazor.Shared/Locales/en.json
+++ b/src/BootstrapBlazor.Shared/Locales/en.json
@@ -5009,7 +5009,7 @@
"TableRow": "Row",
"TableColumn": "Column",
"TableColumnDrag": "Column Dragging",
- "TableColumnResieing": "Column width Adjustment",
+ "TableColumnResizing": "Column Resize",
"TableColumnList": "Columns Show/Hide",
"TableColumnAlign": "Column Alignment",
"TableColumnFomatter": "Column Format",
diff --git a/src/BootstrapBlazor.Shared/Locales/zh.json b/src/BootstrapBlazor.Shared/Locales/zh.json
index 81ef54506..57e79365d 100644
--- a/src/BootstrapBlazor.Shared/Locales/zh.json
+++ b/src/BootstrapBlazor.Shared/Locales/zh.json
@@ -5018,7 +5018,7 @@
"TableRow": "行设置",
"TableColumn": "列设置",
"TableColumnDrag": "列拖动",
- "TableColumnResieing": "列宽调整",
+ "TableColumnResizing": "列宽调整",
"TableColumnList": "列显示/隐藏",
"TableColumnAlign": "列对齐",
"TableColumnFomatter": "列对齐",
--
Gitee
From 13f8fceaa3b2a8c8c1f36b23536162af9abafbcf Mon Sep 17 00:00:00 2001
From: Argo-AscioTech
Date: Thu, 20 Jul 2023 17:13:27 +0800
Subject: [PATCH 14/20] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=8B=96?=
=?UTF-8?q?=E5=8A=A8=E5=88=97=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
---
src/BootstrapBlazor/Components/Table/Table.razor.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.cs b/src/BootstrapBlazor/Components/Table/Table.razor.cs
index bc3e1d85a..7b5b44d24 100644
--- a/src/BootstrapBlazor/Components/Table/Table.razor.cs
+++ b/src/BootstrapBlazor/Components/Table/Table.razor.cs
@@ -791,7 +791,7 @@ public partial class Table : ITable, IModelEqualityComparer where
_init = false;
await InvokeVoidAsync("init", Id, Interop, new
{
- DragColumnCallback = OnDragColumnEndAsync != null ? nameof(DragColumnCallback) : null,
+ DragColumnCallback = nameof(DragColumnCallback),
ResizeColumnCallback = OnResizeColumnAsync != null ? nameof(ResizeColumnCallback) : null
});
}
--
Gitee
From ba3369b50b5aa81b3b99aec42cf1cdcf31657b71 Mon Sep 17 00:00:00 2001
From: Argo-AscioTech
Date: Thu, 20 Jul 2023 17:27:38 +0800
Subject: [PATCH 15/20] =?UTF-8?q?doc:=20=E5=90=88=E5=B9=B6=E9=83=A8?=
=?UTF-8?q?=E5=88=86=E7=A4=BA=E4=BE=8B=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Extensions/MenusLocalizerExtensions.cs | 25 -------------
src/BootstrapBlazor.Shared/Locales/en.json | 9 ++---
src/BootstrapBlazor.Shared/Locales/zh.json | 9 ++---
.../Samples/Table/TablesCell.razor | 2 +-
.../Samples/Table/TablesColumn.razor | 37 +++++++++++++++++++
.../Samples/Table/TablesColumnAlign.razor | 15 --------
.../Table/TablesColumnColumnCreating.razor | 21 -----------
.../Samples/Table/TablesColumnCopy.razor | 14 -------
.../Samples/Table/TablesColumnFomatter.razor | 15 --------
.../Samples/Table/TablesColumnGenerate.razor | 22 -----------
.../Samples/Table/TablesColumnResizing.razor | 2 +-
.../Samples/Table/TablesColumnTemplate.razor | 19 +++++++++-
12 files changed, 62 insertions(+), 128 deletions(-)
delete mode 100644 src/BootstrapBlazor.Shared/Samples/Table/TablesColumnAlign.razor
delete mode 100644 src/BootstrapBlazor.Shared/Samples/Table/TablesColumnColumnCreating.razor
delete mode 100644 src/BootstrapBlazor.Shared/Samples/Table/TablesColumnCopy.razor
delete mode 100644 src/BootstrapBlazor.Shared/Samples/Table/TablesColumnFomatter.razor
delete mode 100644 src/BootstrapBlazor.Shared/Samples/Table/TablesColumnGenerate.razor
diff --git a/src/BootstrapBlazor.Shared/Extensions/MenusLocalizerExtensions.cs b/src/BootstrapBlazor.Shared/Extensions/MenusLocalizerExtensions.cs
index d16fd730e..3f1464107 100644
--- a/src/BootstrapBlazor.Shared/Extensions/MenusLocalizerExtensions.cs
+++ b/src/BootstrapBlazor.Shared/Extensions/MenusLocalizerExtensions.cs
@@ -686,34 +686,9 @@ internal static class MenusLocalizerExtensions
Url = "tables/column/list"
},
new()
- {
- Text = Localizer["TableColumnAlign"],
- Url = "tables/column/align"
- },
- new()
- {
- Text = Localizer["TableColumnFomatter"],
- Url = "tables/column/fomatter"
- },
- new()
- {
- Text = Localizer["TableColumnCopy"],
- Url = "tables/column/copy"
- },
- new()
{
Text = Localizer["TableColumnTemplate"],
Url = "tables/column/template"
- },
- new()
- {
- Text = Localizer["TableColumnGenerate"],
- Url = "tables/column/generate"
- },
- new()
- {
- Text = Localizer["TableColumnColumnCreating"],
- Url = "tables/column/columncreating"
},
new()
{
diff --git a/src/BootstrapBlazor.Shared/Locales/en.json b/src/BootstrapBlazor.Shared/Locales/en.json
index c40c94766..ecad5f3a0 100644
--- a/src/BootstrapBlazor.Shared/Locales/en.json
+++ b/src/BootstrapBlazor.Shared/Locales/en.json
@@ -5009,14 +5009,11 @@
"TableRow": "Row",
"TableColumn": "Column",
"TableColumnDrag": "Column Dragging",
- "TableColumnResizing": "Column Resize",
+ "TableColumnResizing": "Column Width",
"TableColumnList": "Columns Show/Hide",
"TableColumnAlign": "Column Alignment",
- "TableColumnFomatter": "Column Format",
"TableColumnCopy": "Column Replication",
"TableColumnTemplate": "Column Template",
- "TableColumnGenerate": "Automatically Generate Columns",
- "TableColumnColumnCreating": "Current Column Settings",
"TableCell": "Cell",
"TableDetail": "Detail",
"TableDynamic": "Dynamic",
@@ -5344,8 +5341,8 @@
"TableColumnP1": "In this example, the column DateTime value is displayed in different colors depending on whether the Complete value is true",
"TableColumnP2": "In this example, the column Complete is displayed as a Checkbox component according to the value of Complete",
"TableColumnP3": "Template template comes with Context associated context, its value is of type TableColumnContext",
- "TableColumnli1": "Value is the data value of the currently bound column",
- "TableColumnli2": "Row is the data value of the row where the currently bound column is located",
+ "TableColumnLi1": "Value is the data value of the currently bound column",
+ "TableColumnLi2": "Row is the data value of the row where the currently bound column is located",
"FormatterTitle": "Custom column data format",
"FormatterIntro": "Format the cell value by specifying the FormatString or Formatter callback delegate when the column is bound",
"FormatterP1": "In this example the column DateTime values are formatted according to FormatString to yyyy-MM-dd year month day format",
diff --git a/src/BootstrapBlazor.Shared/Locales/zh.json b/src/BootstrapBlazor.Shared/Locales/zh.json
index 57e79365d..6e99ace0c 100644
--- a/src/BootstrapBlazor.Shared/Locales/zh.json
+++ b/src/BootstrapBlazor.Shared/Locales/zh.json
@@ -5018,14 +5018,11 @@
"TableRow": "行设置",
"TableColumn": "列设置",
"TableColumnDrag": "列拖动",
- "TableColumnResizing": "列宽调整",
+ "TableColumnResizing": "列宽设置",
"TableColumnList": "列显示/隐藏",
"TableColumnAlign": "列对齐",
- "TableColumnFomatter": "列对齐",
"TableColumnCopy": "列复制",
"TableColumnTemplate": "列模板",
- "TableColumnGenerate": "自动生成列",
- "TableColumnColumnCreating": "当前列设置",
"TableCell": "单元格",
"TableDetail": "明细行",
"TableDynamic": "动态表格",
@@ -5376,8 +5373,8 @@
"TableColumnP1": " 本例中列 DateTime 值根据 Complete 值是否为 true 显示不同颜色",
"TableColumnP2": "本例中列 Complete 根据 Complete 值自定义显示为 Checkbox 组件",
"TableColumnP3": "Template 模板自带 Context 相关联上下文，其值为 TableColumnContext 类型",
- "TableColumnli1": "Value 为当前绑定列的数据值",
- "TableColumnli2": "Row 为当前绑定列所在行的数据值",
+ "TableColumnLi1": "Value 为当前绑定列的数据值",
+ "TableColumnLi2": "Row 为当前绑定列所在行的数据值",
"FormatterTitle": "自定义列数据格式",
"FormatterIntro": "列绑定时通过指定 FormatString 或者 Formatter 回调委托来实现单元格数值格式化",
"FormatterP1": "本例中列 DateTime 值根据 FormatString 将值格式化为 yyyy-MM-dd 年月日格式",
diff --git a/src/BootstrapBlazor.Shared/Samples/Table/TablesCell.razor b/src/BootstrapBlazor.Shared/Samples/Table/TablesCell.razor
index 80542fb8f..228cbdb2d 100644
--- a/src/BootstrapBlazor.Shared/Samples/Table/TablesCell.razor
+++ b/src/BootstrapBlazor.Shared/Samples/Table/TablesCell.razor
@@ -17,7 +17,7 @@
Demo="typeof(Demos.Table.TablesCell.TableCellMergeCell)">
@((MarkupString)Localizer["TableCellMergeCellTip"].Value)
.cell-demo {
- --bs-table-bg: ##e9ecef;
+ --bs-table-bg: #e9ecef;
}
diff --git a/src/BootstrapBlazor.Shared/Samples/Table/TablesColumn.razor b/src/BootstrapBlazor.Shared/Samples/Table/TablesColumn.razor
index 2230fdfa4..9169aff6d 100644
--- a/src/BootstrapBlazor.Shared/Samples/Table/TablesColumn.razor
+++ b/src/BootstrapBlazor.Shared/Samples/Table/TablesColumn.razor
@@ -31,6 +31,43 @@
Demo="typeof(Demos.Table.TablesColumn.TablesColumnDisabled)">
+
+ @((MarkupString)Localizer["ShowCopyColumnDesc"].Value)
+
+
+
+ @((MarkupString)Localizer["AlignP1"].Value)
+ @((MarkupString)Localizer["AlignP2"].Value)
+
+
+
+ @((MarkupString)Localizer["FormatterP1"].Value)
+ @((MarkupString)Localizer["FormatterP2"].Value)
+
+
+
+
+ @((MarkupString)Localizer["OnColumnCreatingP1"].Value)
+
+ - @Localizer["OnColumnCreatingLi1"]
+ - @((MarkupString)Localizer["OnColumnCreatingLi2"].Value)
+
+ @((MarkupString)Localizer["OnColumnCreatingP2"].Value)
+
+
+
Localizer
-@inject IOptionsMonitor WebsiteOption
-
-@Localizer["TablesColumnTitle"]
-
-@Localizer["TablesColumnDescription"]
-
-
- @((MarkupString)Localizer["AlignP1"].Value)
- @((MarkupString)Localizer["AlignP2"].Value)
-
diff --git a/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnColumnCreating.razor b/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnColumnCreating.razor
deleted file mode 100644
index f9234fca0..000000000
--- a/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnColumnCreating.razor
+++ /dev/null
@@ -1,21 +0,0 @@
-@page "/tables/column/columncreating"
-@inject IStringLocalizer Localizer
-@inject IOptionsMonitor WebsiteOption
-
-@Localizer["TablesColumnTitle"]
-
-@Localizer["TablesColumnDescription"]
-
-
-
- @((MarkupString)Localizer["OnColumnCreatingP1"].Value)
-
- - @Localizer["OnColumnCreatingLi1"]
- - @((MarkupString)Localizer["OnColumnCreatingLi2"].Value)
-
- @((MarkupString)Localizer["OnColumnCreatingP2"].Value)
-
-
diff --git a/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnCopy.razor b/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnCopy.razor
deleted file mode 100644
index 9d80b7163..000000000
--- a/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnCopy.razor
+++ /dev/null
@@ -1,14 +0,0 @@
-@page "/tables/column/copy"
-@inject IStringLocalizer Localizer
-@inject IOptionsMonitor WebsiteOption
-
-@Localizer["TablesColumnTitle"]
-
-@Localizer["TablesColumnDescription"]
-
-
- @((MarkupString)Localizer["ShowCopyColumnDesc"].Value)
-
diff --git a/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnFomatter.razor b/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnFomatter.razor
deleted file mode 100644
index 6a5eb377d..000000000
--- a/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnFomatter.razor
+++ /dev/null
@@ -1,15 +0,0 @@
-@page "/tables/column/fomatter"
-@inject IStringLocalizer Localizer
-@inject IOptionsMonitor WebsiteOption
-
-@Localizer["TablesColumnTitle"]
-
-@Localizer["TablesColumnDescription"]
-
-
- @((MarkupString)Localizer["FormatterP1"].Value)
- @((MarkupString)Localizer["FormatterP2"].Value)
-
diff --git a/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnGenerate.razor b/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnGenerate.razor
deleted file mode 100644
index fdca9c664..000000000
--- a/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnGenerate.razor
+++ /dev/null
@@ -1,22 +0,0 @@
-@page "/tables/column/generate"
-@inject IStringLocalizer Localizer
-@inject IOptionsMonitor WebsiteOption
-
-@Localizer["TablesColumnTitle"]
-
-@Localizer["TablesColumnDescription"]
-
-
-
- @((MarkupString)Localizer["AutoGenerateColumnsP1"].Value)
-
- - @((MarkupString)Localizer["AutoGenerateColumnsLi1"].Value)
- - @((MarkupString)Localizer["AutoGenerateColumnsLi2"].Value)
- - @((MarkupString)string.Format(Localizer["AutoGenerateColumnsLi3"].Value, WebsiteOption.CurrentValue.BootstrapBlazorLink))
-
- @((MarkupString)Localizer["AutoGenerateColumnsP2"].Value)
-
-
diff --git a/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnResizing.razor b/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnResizing.razor
index ef31a5e7a..a07d97e76 100644
--- a/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnResizing.razor
+++ b/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnResizing.razor
@@ -1,4 +1,4 @@
-@page "/tables/column/resieing"
+@page "/tables/column/resizing"
@inject IStringLocalizer Localizer
@inject IOptionsMonitor WebsiteOption
diff --git a/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnTemplate.razor b/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnTemplate.razor
index 01ba11a90..0458fcf7d 100644
--- a/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnTemplate.razor
+++ b/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnTemplate.razor
@@ -14,8 +14,8 @@
@((MarkupString)Localizer["TableColumnP2"].Value)
@((MarkupString)Localizer["TableColumnP3"].Value)
- - @((MarkupString)Localizer["TableColumnli1"].Value)
- - @((MarkupString)Localizer["TableColumnli2"].Value)
+ - @((MarkupString)Localizer["TableColumnLi1"].Value)
+ - @((MarkupString)Localizer["TableColumnLi2"].Value)
@@ -24,3 +24,18 @@
Name="Template"
Demo="typeof(Demos.Table.TablesColumn.TablesColumnTemplate)">
+
+
+
+ @((MarkupString)Localizer["AutoGenerateColumnsP1"].Value)
+
+ - @((MarkupString)Localizer["AutoGenerateColumnsLi1"].Value)
+ - @((MarkupString)Localizer["AutoGenerateColumnsLi2"].Value)
+ - @((MarkupString)string.Format(Localizer["AutoGenerateColumnsLi3"].Value, WebsiteOption.CurrentValue.BootstrapBlazorLink))
+
+ @((MarkupString)Localizer["AutoGenerateColumnsP2"].Value)
+
+
--
Gitee
From 31a3ea60fd501491ea67c95d7cb74e2fb99f387d Mon Sep 17 00:00:00 2001
From: Argo-AscioTech
Date: Thu, 20 Jul 2023 17:38:01 +0800
Subject: [PATCH 16/20] =?UTF-8?q?doc:=20=E5=A2=9E=E5=8A=A0=E5=88=97?=
=?UTF-8?q?=E6=8B=96=E5=8A=A8=E5=9B=9E=E8=B0=83=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
...DragOrder.razor => TablesColumnDragColumn.razor} | 13 ++++++++++++-
.../Samples/Table/TablesColumnDrag.razor | 2 +-
2 files changed, 13 insertions(+), 2 deletions(-)
rename src/BootstrapBlazor.Shared/Demos/Table/TablesColumn/{TablesColumnDragOrder.razor => TablesColumnDragColumn.razor} (86%)
diff --git a/src/BootstrapBlazor.Shared/Demos/Table/TablesColumn/TablesColumnDragOrder.razor b/src/BootstrapBlazor.Shared/Demos/Table/TablesColumn/TablesColumnDragColumn.razor
similarity index 86%
rename from src/BootstrapBlazor.Shared/Demos/Table/TablesColumn/TablesColumnDragOrder.razor
rename to src/BootstrapBlazor.Shared/Demos/Table/TablesColumn/TablesColumnDragColumn.razor
index 5497de08a..8af2255ff 100644
--- a/src/BootstrapBlazor.Shared/Demos/Table/TablesColumn/TablesColumnDragOrder.razor
+++ b/src/BootstrapBlazor.Shared/Demos/Table/TablesColumn/TablesColumnDragColumn.razor
@@ -2,7 +2,7 @@
+
+
@code {
///
/// Foo 类为Demo测试用，如有需要请自行下载源码查阅
@@ -24,6 +26,9 @@
private static IEnumerable PageItemsSource => new int[] { 5, 10, 20 };
+ [NotNull]
+ private ConsoleLogger? Logger { get; set; }
+
///
/// OnInitialized 方法
///
@@ -34,6 +39,12 @@
Items = Foo.GenerateFoo(FooLocalizer);
}
+ private Task OnDragColumnEndAsync(string? columnName)
+ {
+ Logger.Log($"Column: {columnName}");
+ return Task.CompletedTask;
+ }
+
private Task> OnQueryAsync(QueryPageOptions options)
{
IEnumerable items = Items;
diff --git a/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnDrag.razor b/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnDrag.razor
index e04afa920..0679e8989 100644
--- a/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnDrag.razor
+++ b/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnDrag.razor
@@ -9,6 +9,6 @@
+ Demo="typeof(Demos.Table.TablesColumn.TablesColumnDragColumn)">
@((MarkupString)Localizer["AllowDragOrderDesc"].Value)
--
Gitee
From 7a2e73a73038acd4d0c04baf74d77d38d017f451 Mon Sep 17 00:00:00 2001
From: Argo-AscioTech
Date: Thu, 20 Jul 2023 17:44:05 +0800
Subject: [PATCH 17/20] =?UTF-8?q?doc:=20=E5=90=88=E5=B9=B6=E5=88=97?=
=?UTF-8?q?=E9=98=88=E5=80=BC=E7=A4=BA=E4=BE=8B=E5=88=B0=E5=88=97=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Table/TablesColumnBreakPoint.razor | 24 -------------------
.../Samples/Table/TablesColumnList.razor | 17 +++++++++++++
2 files changed, 17 insertions(+), 24 deletions(-)
delete mode 100644 src/BootstrapBlazor.Shared/Samples/Table/TablesColumnBreakPoint.razor
diff --git a/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnBreakPoint.razor b/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnBreakPoint.razor
deleted file mode 100644
index 191a55119..000000000
--- a/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnBreakPoint.razor
+++ /dev/null
@@ -1,24 +0,0 @@
-@page "/tables/column/breakpoint"
-@inject IStringLocalizer Localizer
-@inject IOptionsMonitor WebsiteOption
-
-@Localizer["TablesColumnTitle"]
-
-@Localizer["TablesColumnDescription"]
-
-
- @((MarkupString)Localizer["ShownWithBreakPointP1"].Value)
-
- - @((MarkupString)Localizer["ShownWithBreakPointLi1"].Value)
- - @((MarkupString)Localizer["ShownWithBreakPointLi2"].Value)
- - @((MarkupString)Localizer["ShownWithBreakPointLi3"].Value)
- - @((MarkupString)Localizer["ShownWithBreakPointLi4"].Value)
- - @((MarkupString)Localizer["ShownWithBreakPointLi5"].Value)
-
- @((MarkupString)Localizer["ShownWithBreakPointP2"].Value)
- @((MarkupString)Localizer["ShownWithBreakPointP3"].Value)
- @((MarkupString)Localizer["ShownWithBreakPointP4"].Value)
-
diff --git a/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnList.razor b/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnList.razor
index 289e202ff..f7b076a74 100644
--- a/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnList.razor
+++ b/src/BootstrapBlazor.Shared/Samples/Table/TablesColumnList.razor
@@ -16,3 +16,20 @@
@((MarkupString)Localizer["VisibleP4"].Value)
@((MarkupString)Localizer["ResetVisibleColumnsDesc"].Value)
+
+
+ @((MarkupString)Localizer["ShownWithBreakPointP1"].Value)
+
+ - @((MarkupString)Localizer["ShownWithBreakPointLi1"].Value)
+ - @((MarkupString)Localizer["ShownWithBreakPointLi2"].Value)
+ - @((MarkupString)Localizer["ShownWithBreakPointLi3"].Value)
+ - @((MarkupString)Localizer["ShownWithBreakPointLi4"].Value)
+ - @((MarkupString)Localizer["ShownWithBreakPointLi5"].Value)
+
+ @((MarkupString)Localizer["ShownWithBreakPointP2"].Value)
+ @((MarkupString)Localizer["ShownWithBreakPointP3"].Value)
+ @((MarkupString)Localizer["ShownWithBreakPointP4"].Value)
+
--
Gitee
From c1215c263a9ae546f46b7508d010ab0c1bc2cc90 Mon Sep 17 00:00:00 2001
From: Argo-AscioTech
Date: Thu, 20 Jul 2023 19:27:13 +0800
Subject: [PATCH 18/20] =?UTF-8?q?fix:=20=E8=A7=86=E7=AA=97=E5=A4=A7?=
=?UTF-8?q?=E5=B0=8F=E5=8F=98=E5=8C=96=E6=97=B6=20Table=20=E7=BB=84?=
=?UTF-8?q?=E4=BB=B6=E5=93=8D=E5=BA=94=20OnBreakPointChanged?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/BootstrapBlazor/Components/Table/Table.razor | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/BootstrapBlazor/Components/Table/Table.razor b/src/BootstrapBlazor/Components/Table/Table.razor
index ac9c403ca..b4fad1d8e 100644
--- a/src/BootstrapBlazor/Components/Table/Table.razor
+++ b/src/BootstrapBlazor/Components/Table/Table.razor
@@ -286,10 +286,7 @@
- @if (RenderMode == TableRenderMode.Auto)
- {
-
- }
+
}
--
Gitee
From 035fc55e5133721cbcaae742a2877fe30e808cff Mon Sep 17 00:00:00 2001
From: Argo-AscioTech
Date: Thu, 20 Jul 2023 19:30:11 +0800
Subject: [PATCH 19/20] =?UTF-8?q?doc:=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
---
.../Table/TablesColumn/TablesColumnShownWithBreakPoint.razor | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/BootstrapBlazor.Shared/Demos/Table/TablesColumn/TablesColumnShownWithBreakPoint.razor b/src/BootstrapBlazor.Shared/Demos/Table/TablesColumn/TablesColumnShownWithBreakPoint.razor
index 07612b8de..7e7f9b946 100644
--- a/src/BootstrapBlazor.Shared/Demos/Table/TablesColumn/TablesColumnShownWithBreakPoint.razor
+++ b/src/BootstrapBlazor.Shared/Demos/Table/TablesColumn/TablesColumnShownWithBreakPoint.razor
@@ -8,7 +8,7 @@
-
+
--
Gitee
From 25207036bf5fa6296b61a8c66006c4f2c661ae1b Mon Sep 17 00:00:00 2001
From: Argo-AscioTech
Date: Thu, 20 Jul 2023 20:36:27 +0800
Subject: [PATCH 20/20] =?UTF-8?q?doc:=20=E8=B0=83=E6=95=B4=E8=8F=9C?=
=?UTF-8?q?=E5=8D=95=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Extensions/MenusLocalizerExtensions.cs | 36 +++++++++----------
src/BootstrapBlazor.Shared/Locales/zh.json | 2 +-
2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/BootstrapBlazor.Shared/Extensions/MenusLocalizerExtensions.cs b/src/BootstrapBlazor.Shared/Extensions/MenusLocalizerExtensions.cs
index 3f1464107..ffaaad361 100644
--- a/src/BootstrapBlazor.Shared/Extensions/MenusLocalizerExtensions.cs
+++ b/src/BootstrapBlazor.Shared/Extensions/MenusLocalizerExtensions.cs
@@ -697,23 +697,33 @@ internal static class MenusLocalizerExtensions
},
new()
{
- Text = Localizer["TableCell"],
- Url = "tables/cell"
+ Text = Localizer["TableRow"],
+ Url = "tables/row"
},
new()
{
- Text = Localizer["TableLookup"],
- Url = "tables/lookup"
+ Text = Localizer["TableDetail"],
+ Url = "tables/detail"
},
new()
{
- Text = Localizer["TableRow"],
- Url = "tables/row"
+ Text = Localizer["TableSelection"],
+ Url = "tables/selection"
},
new()
{
- Text = Localizer["TableDetail"],
- Url = "tables/detail"
+ Text = Localizer["TableWrap"],
+ Url = "tables/wrap"
+ },
+ new()
+ {
+ Text = Localizer["TableCell"],
+ Url = "tables/cell"
+ },
+ new()
+ {
+ Text = Localizer["TableLookup"],
+ Url = "tables/lookup"
},
new()
{
@@ -781,11 +791,6 @@ internal static class MenusLocalizerExtensions
Url = "tables/export"
},
new()
- {
- Text = Localizer["TableSelection"],
- Url = "tables/selection"
- },
- new()
{
Text = Localizer["TableAutoRefresh"],
Url = "tables/autorefresh"
@@ -801,11 +806,6 @@ internal static class MenusLocalizerExtensions
Url = "tables/dialog"
},
new()
- {
- Text = Localizer["TableWrap"],
- Url = "tables/wrap"
- },
- new()
{
Text = Localizer["TableTree"],
Url = "tables/tree"
diff --git a/src/BootstrapBlazor.Shared/Locales/zh.json b/src/BootstrapBlazor.Shared/Locales/zh.json
index 6e99ace0c..d89afe2d3 100644
--- a/src/BootstrapBlazor.Shared/Locales/zh.json
+++ b/src/BootstrapBlazor.Shared/Locales/zh.json
@@ -5029,7 +5029,7 @@
"TableDynamicObject": "动态对象",
"TableSearch": "搜索功能",
"TableFilter": "筛选和排序",
- "TableFixHeader": "固定表头",
+ "TableFixHeader": "表头固定",
"TableHeaderGroup": "表头分组",
"TableFixColumn": "列固定",
"TablePage": "分页功能",
--
Gitee