From 4dfd3880dd9919e3b0a70a314c808d9e928d7b8d Mon Sep 17 00:00:00 2001
From: Tony <6914529@qq.com>
Date: Thu, 12 Mar 2026 10:29:38 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0SelectToday=E5=8F=82?=
=?UTF-8?q?=E6=95=B0=EF=BC=8C=E7=94=A8=E4=BA=8E=E5=BD=93=E7=BB=84=E4=BB=B6?=
=?UTF-8?q?=E6=9C=89=E8=AE=BE=E5=AE=9A=E6=9C=80=E5=B0=8F=E5=80=BC=E6=97=B6?=
=?UTF-8?q?=EF=BC=8C=E8=AE=A9=E5=85=B6=E5=8F=AF=E4=BB=A5=E9=BB=98=E8=AE=A4?=
=?UTF-8?q?=E5=BD=93=E5=A4=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
添加SelectToday参数，用于当组件有设定最小值时，让其可以默认当天
---
.../DateTimePicker/DateTimePicker.razor.cs | 10 +++++-
.../UnitTest/Components/DateTimePickerTest.cs | 34 +++++++++++++++++++
2 files changed, 43 insertions(+), 1 deletion(-)
diff --git a/src/BootstrapBlazor/Components/DateTimePicker/DateTimePicker.razor.cs b/src/BootstrapBlazor/Components/DateTimePicker/DateTimePicker.razor.cs
index a00945c8bc9..df7a2cb8968 100644
--- a/src/BootstrapBlazor/Components/DateTimePicker/DateTimePicker.razor.cs
+++ b/src/BootstrapBlazor/Components/DateTimePicker/DateTimePicker.razor.cs
@@ -287,6 +287,14 @@ public string? Format
[Parameter]
public bool ShowHolidays { get; set; }
+ ///
+ /// 获得/设置 是否选择今天 默认 false
+ /// Gets or sets Whether to Select Today. Default is false
+ ///
+ /// 当 Value 值为 null 且组件设置了 的值时，当前选中时间为当天， 不为空类型时此参数生效
+ [Parameter]
+ public bool SelectToday { get; set; }
+
///
/// 获取/设置 获得自定义禁用日期回调方法，默认 null 内部默认启用数据缓存 可通过 参数关闭
/// Gets or sets Callback Method to Get Custom Disabled Days. Default is null. Internal Default Enable Data Cache. Can be Closed via Parameter
@@ -373,7 +381,7 @@ protected override void OnParametersSet()
}
else
{
- SelectedValue = Value == null ? (MinValue ?? DateTime.MinValue) : (DateTime)(object)Value;
+ SelectedValue = Value == null ? ((SelectToday ? DateTime.Today : MinValue) ?? DateTime.MinValue) : (DateTime)(object)Value;
}
if (MinValue > SelectedValue)
diff --git a/test/UnitTest/Components/DateTimePickerTest.cs b/test/UnitTest/Components/DateTimePickerTest.cs
index 1c87db701f5..10a74c83fda 100644
--- a/test/UnitTest/Components/DateTimePickerTest.cs
+++ b/test/UnitTest/Components/DateTimePickerTest.cs
@@ -296,6 +296,40 @@ public void MinValue_Ok()
Assert.Equal(DateTime.Today, cut.Instance.Value.Date);
}
+ [Fact]
+ public void SelectToday_Ok()
+ {
+ var cut = Context.Render>(builder =>
+ {
+ builder.Add(a => a.Value, null);
+ builder.Add(a => a.SelectToday, true);
+ });
+ Assert.Null(cut.Instance.Value);
+
+ // 点击确定
+ var buttons = cut.FindAll(".picker-panel-footer button");
+ cut.InvokeAsync(() => buttons[1].Click());
+
+ Assert.Equal(DateTime.Today, cut.Instance.Value);
+
+
+ cut.Render(pb =>
+ {
+ pb.Add(a => a.MinValue, DateTime.Today.AddDays(-1));
+ pb.Add(a => a.SelectToday, true);
+ });
+ Assert.Equal(DateTime.Today, cut.Instance.Value);
+
+ cut.Render(pb =>
+ {
+ pb.Add(a => a.Value, DateTime.MinValue);
+ pb.Add(a => a.MinValue, DateTime.Today.AddDays(-1));
+ pb.Add(a => a.SelectToday, false);
+ });
+ Assert.Equal(DateTime.Today.AddDays(-1).Date, cut.Instance.Value?.Date);
+
+ }
+
[Fact]
public void OnTimeChanged_Ok()
{
From 3058c665c98f41f935475357ca84156c408f0126 Mon Sep 17 00:00:00 2001
From: Argo Zhang
Date: Fri, 13 Mar 2026 11:32:35 +0800
Subject: [PATCH 2/6] =?UTF-8?q?revert:=20=E6=92=A4=E9=94=80=E4=BB=A3?=
=?UTF-8?q?=E7=A0=81=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Components/DateTimePicker/DateTimePicker.razor.cs | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/src/BootstrapBlazor/Components/DateTimePicker/DateTimePicker.razor.cs b/src/BootstrapBlazor/Components/DateTimePicker/DateTimePicker.razor.cs
index df7a2cb8968..a00945c8bc9 100644
--- a/src/BootstrapBlazor/Components/DateTimePicker/DateTimePicker.razor.cs
+++ b/src/BootstrapBlazor/Components/DateTimePicker/DateTimePicker.razor.cs
@@ -287,14 +287,6 @@ public string? Format
[Parameter]
public bool ShowHolidays { get; set; }
- ///
- /// 获得/设置 是否选择今天 默认 false
- /// Gets or sets Whether to Select Today. Default is false
- ///
- /// 当 Value 值为 null 且组件设置了 的值时，当前选中时间为当天， 不为空类型时此参数生效
- [Parameter]
- public bool SelectToday { get; set; }
-
///
/// 获取/设置 获得自定义禁用日期回调方法，默认 null 内部默认启用数据缓存 可通过 参数关闭
/// Gets or sets Callback Method to Get Custom Disabled Days. Default is null. Internal Default Enable Data Cache. Can be Closed via Parameter
@@ -381,7 +373,7 @@ protected override void OnParametersSet()
}
else
{
- SelectedValue = Value == null ? ((SelectToday ? DateTime.Today : MinValue) ?? DateTime.MinValue) : (DateTime)(object)Value;
+ SelectedValue = Value == null ? (MinValue ?? DateTime.MinValue) : (DateTime)(object)Value;
}
if (MinValue > SelectedValue)
From 5695731636a6fb9b9f6f0f70bda03300b6800a5c Mon Sep 17 00:00:00 2001
From: Argo Zhang
Date: Fri, 13 Mar 2026 11:40:17 +0800
Subject: [PATCH 3/6] =?UTF-8?q?revert:=20=E6=92=A4=E9=94=80=E5=8D=95?=
=?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../UnitTest/Components/DateTimePickerTest.cs | 34 -------------------
1 file changed, 34 deletions(-)
diff --git a/test/UnitTest/Components/DateTimePickerTest.cs b/test/UnitTest/Components/DateTimePickerTest.cs
index 10a74c83fda..1c87db701f5 100644
--- a/test/UnitTest/Components/DateTimePickerTest.cs
+++ b/test/UnitTest/Components/DateTimePickerTest.cs
@@ -296,40 +296,6 @@ public void MinValue_Ok()
Assert.Equal(DateTime.Today, cut.Instance.Value.Date);
}
- [Fact]
- public void SelectToday_Ok()
- {
- var cut = Context.Render>(builder =>
- {
- builder.Add(a => a.Value, null);
- builder.Add(a => a.SelectToday, true);
- });
- Assert.Null(cut.Instance.Value);
-
- // 点击确定
- var buttons = cut.FindAll(".picker-panel-footer button");
- cut.InvokeAsync(() => buttons[1].Click());
-
- Assert.Equal(DateTime.Today, cut.Instance.Value);
-
-
- cut.Render(pb =>
- {
- pb.Add(a => a.MinValue, DateTime.Today.AddDays(-1));
- pb.Add(a => a.SelectToday, true);
- });
- Assert.Equal(DateTime.Today, cut.Instance.Value);
-
- cut.Render(pb =>
- {
- pb.Add(a => a.Value, DateTime.MinValue);
- pb.Add(a => a.MinValue, DateTime.Today.AddDays(-1));
- pb.Add(a => a.SelectToday, false);
- });
- Assert.Equal(DateTime.Today.AddDays(-1).Date, cut.Instance.Value?.Date);
-
- }
-
[Fact]
public void OnTimeChanged_Ok()
{
From dacf4cc34e07f298f75cf6295646d907847f4c80 Mon Sep 17 00:00:00 2001
From: Argo Zhang
Date: Sat, 14 Mar 2026 16:51:16 +0800
Subject: [PATCH 4/6] =?UTF-8?q?doc(FilterLogic):=20=E6=9B=B4=E6=96=B0?=
=?UTF-8?q?=E6=96=87=E6=A1=A3=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/BootstrapBlazor/Enums/FilterLogic.cs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/BootstrapBlazor/Enums/FilterLogic.cs b/src/BootstrapBlazor/Enums/FilterLogic.cs
index f35a49c2910..bccf1ea6341 100644
--- a/src/BootstrapBlazor/Enums/FilterLogic.cs
+++ b/src/BootstrapBlazor/Enums/FilterLogic.cs
@@ -9,20 +9,20 @@ namespace BootstrapBlazor.Components;
///
/// 逻辑运算符
-/// 逻辑运算符
+/// Logical operators
///
public enum FilterLogic
{
///
/// 并且
- /// 并且
+ /// And
///
[Description("并且")]
And,
///
/// 或者
- /// 或者
+ /// Or
///
[Description("或者")]
Or
From ec6fc5a97d1413581d07c09bd8e6ef8237a5dd55 Mon Sep 17 00:00:00 2001
From: Argo Zhang
Date: Sat, 14 Mar 2026 16:51:32 +0800
Subject: [PATCH 5/6] =?UTF-8?q?doc(Direction):=20=E6=9B=B4=E6=96=B0?=
=?UTF-8?q?=E6=96=87=E6=A1=A3=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/BootstrapBlazor/Enums/Direction.cs | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/BootstrapBlazor/Enums/Direction.cs b/src/BootstrapBlazor/Enums/Direction.cs
index 5816828f12b..0a677932170 100644
--- a/src/BootstrapBlazor/Enums/Direction.cs
+++ b/src/BootstrapBlazor/Enums/Direction.cs
@@ -14,29 +14,29 @@ namespace BootstrapBlazor.Components;
public enum Direction
{
///
- ///
- ///
+ /// 向下
+ /// Down
///
[Description("dropdown")]
Dropdown,
///
- /// Dropup
- /// Dropup
+ /// 向上
+ /// Up
///
[Description("dropup")]
Dropup,
///
- /// Dropleft
- /// Dropleft
+ /// 向左
+ /// Left
///
[Description("dropstart")]
Dropleft,
///
- /// Dropright
- /// Dropright
+ /// 向右
+ /// Right
///
[Description("dropend")]
Dropright
From 7c249d486009ed862df022e415d9d2a5fba61194 Mon Sep 17 00:00:00 2001
From: Argo Zhang
Date: Sat, 14 Mar 2026 16:51:49 +0800
Subject: [PATCH 6/6] =?UTF-8?q?doc(DateTimeRangeRenderMode):=20=E6=9B=B4?=
=?UTF-8?q?=E6=96=B0=E6=96=87=E6=A1=A3=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/BootstrapBlazor/Enums/DateTimeRangeRenderMode.cs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/BootstrapBlazor/Enums/DateTimeRangeRenderMode.cs b/src/BootstrapBlazor/Enums/DateTimeRangeRenderMode.cs
index 53e5791102b..3a748c64d5f 100644
--- a/src/BootstrapBlazor/Enums/DateTimeRangeRenderMode.cs
+++ b/src/BootstrapBlazor/Enums/DateTimeRangeRenderMode.cs
@@ -12,13 +12,13 @@ namespace BootstrapBlazor.Components;
public enum DateTimeRangeRenderMode
{
///
- /// Single Component Mode
- /// Single Component Mode
+ /// 单面板模式
+ /// Single Panel Mode
///
Single,
///
- /// Double Panel Mode
+ /// 双面板模式
/// Double Panel Mode
///
Double