refactor: 重命名回调方法

ArgoZhang · ArgoZhang · commit 853f04b58a26 · 2024-09-29T08:30:56.000+08:00
diff --git a/src/BootstrapBlazor.Server/Components/Samples/DateTimePickers.razor b/src/BootstrapBlazor.Server/Components/Samples/DateTimePickers.razor
@@ -208,13 +208,13 @@
         <div class="col-12 col-sm-6">
             <DateTimePicker ViewMode="DatePickerViewMode.DateTime" DisplayText="@Localizer["DisableDayCallbackAllowNullDisplayText"]"
                             ShowLabel="true" @bind-Value="@_disabledNullValue"
-                            OnGetMonthDisabledDaysCallback="OnGetMonthDisabledWeekendsCallback">
+                            OnGetDisabledDaysCallback="OnGetDisabledWeekendsCallback">
             </DateTimePicker>
         </div>
         <div class="col-12 col-sm-6">
             <DateTimePicker ViewMode="DatePickerViewMode.DateTime" DisplayText="@Localizer["DisableDayCallbackNotAllowNullDisplayText"]"
                             ShowLabel="true" @bind-Value="@_disabledValue"
-                            OnGetMonthDisabledDaysCallback="OnGetMonthDisabledTodayCallback">
+                            OnGetDisabledDaysCallback="OnGetDisabledTodayCallback">
             </DateTimePicker>
         </div>
     </div>
diff --git a/src/BootstrapBlazor.Server/Components/Samples/DateTimePickers.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/DateTimePickers.razor.cs
@@ -95,7 +95,7 @@ private string BindValueString
     private DateTime? _disabledNullValue = DateTime.Today;
     private DateTime _disabledValue = DateTime.Today;
 
-    private async Task<List<DateTime>> OnGetMonthDisabledWeekendsCallback(DateTime start, DateTime end)
+    private async Task<List<DateTime>> OnGetDisabledWeekendsCallback(DateTime start, DateTime end)
     {
         var ret = new List<DateTime>();
         if (_disableWeekend)
@@ -122,7 +122,7 @@ private async Task<List<DateTime>> OnGetMonthDisabledWeekendsCallback(DateTime s
         return ret;
     }
 
-    private async Task<List<DateTime>> OnGetMonthDisabledTodayCallback(DateTime start, DateTime end)
+    private async Task<List<DateTime>> OnGetDisabledTodayCallback(DateTime start, DateTime end)
     {
         // 模拟异步延迟
         await Task.Delay(100);
diff --git a/src/BootstrapBlazor/Components/DateTimePicker/DatePickerBody.razor.cs b/src/BootstrapBlazor/Components/DateTimePicker/DatePickerBody.razor.cs
@@ -376,16 +376,16 @@ public bool AllowNull
     private DateTimeRange? Ranger { get; set; }
 
     /// <summary>
-    /// 获取/设置 获得月自定义禁用日期回调方法，默认 null 内部默认启用数据缓存 可通过 <see cref="EnableGetMonthDisabledDaysCache"/> 参数关闭
+    /// 获取/设置 获得月自定义禁用日期回调方法，默认 null 内部默认启用数据缓存 可通过 <see cref="EnableDisabledDaysCache"/> 参数关闭
     /// </summary>
     [Parameter]
-    public Func<DateTime, DateTime, Task<List<DateTime>>>? OnGetMonthDisabledDaysCallback { get; set; }
+    public Func<DateTime, DateTime, Task<List<DateTime>>>? OnGetDisabledDaysCallback { get; set; }
 
     /// <summary>
     /// 获得/设置 是否启用获得年自定义禁用日期缓存
     /// </summary>
     [Parameter]
-    public bool EnableGetMonthDisabledDaysCache { get; set; } = true;
+    public bool EnableDisabledDaysCache { get; set; } = true;
 
     [Inject]
     [NotNull]
@@ -524,16 +524,16 @@ protected override async Task OnParametersSetAsync()
 
     private async Task UpdateDisabledDaysCache(bool force)
     {
-        if (OnGetMonthDisabledDaysCallback != null)
+        if (OnGetDisabledDaysCallback != null)
         {
             var key = $"{StartDate:yyyyMMdd}-{EndDate:yyyyMMdd}";
-            if (force && EnableGetMonthDisabledDaysCache == false)
+            if (force && EnableDisabledDaysCache == false)
             {
                 _monthDisabledDaysCache.Remove(key);
             }
             if (!_monthDisabledDaysCache.TryGetValue(key, out var disabledDays))
             {
-                disabledDays = await OnGetMonthDisabledDaysCallback(StartDate, EndDate);
+                disabledDays = await OnGetDisabledDaysCallback(StartDate, EndDate);
                 _monthDisabledDaysCache.Add(key, disabledDays);
             }
         }
diff --git a/src/BootstrapBlazor/Components/DateTimePicker/DateTimePicker.razor b/src/BootstrapBlazor/Components/DateTimePicker/DateTimePicker.razor
@@ -18,8 +18,8 @@
                     ShowLunar="ShowLunar" ShowSolarTerm="ShowSolarTerm" ShowFestivals="ShowFestivals" ShowHolidays="ShowHolidays"
                     OnConfirm="OnConfirm" OnClear="OnClear" MinValue="MinValue" MaxValue="MaxValue"
                     AutoClose="AutoClose" ViewMode="ViewMode" DayTemplate="DayTemplate!" DayDisabledTemplate="DayDisabledTemplate!"
-                    OnGetMonthDisabledDaysCallback="OnGetMonthDisabledDaysCallback!" @ref="_datePickerBody"
-                    EnableGetMonthDisabledDaysCache="EnableGetMonthDisabledDaysCache">
+                    OnGetDisabledDaysCallback="OnGetDisabledDaysCallback!"
+                    EnableDisabledDaysCache="EnableDisabledDaysCache">
         @ChildContent
     </DatePickerBody>
 </div>
diff --git a/src/BootstrapBlazor/Components/DateTimePicker/DateTimePicker.razor.cs b/src/BootstrapBlazor/Components/DateTimePicker/DateTimePicker.razor.cs
@@ -8,7 +8,7 @@
 namespace BootstrapBlazor.Components;
 
 /// <summary>
-/// DateTimePicker 组件基类
+/// DateTimePicker 组件
 /// </summary>
 public partial class DateTimePicker<TValue>
 {
@@ -210,16 +210,16 @@ public string? Format
     public bool ShowHolidays { get; set; }
 
     /// <summary>
-    /// 获取/设置 获得月自定义禁用日期回调方法，默认 null 内部默认启用数据缓存 可通过 <see cref="EnableGetMonthDisabledDaysCache"/> 参数关闭
+    /// 获取/设置 获得月自定义禁用日期回调方法，默认 null 内部默认启用数据缓存 可通过 <see cref="EnableDisabledDaysCache"/> 参数关闭
     /// </summary>
     [Parameter]
-    public Func<DateTime, DateTime, Task<List<DateTime>>>? OnGetMonthDisabledDaysCallback { get; set; }
+    public Func<DateTime, DateTime, Task<List<DateTime>>>? OnGetDisabledDaysCallback { get; set; }
 
     /// <summary>
     /// 获得/设置 是否启用获得年自定义禁用日期缓存
     /// </summary>
     [Parameter]
-    public bool EnableGetMonthDisabledDaysCache { get; set; } = true;
+    public bool EnableDisabledDaysCache { get; set; } = true;
 
     [Inject]
     [NotNull]
@@ -234,8 +234,6 @@ public string? Format
 
     private DateTime SelectedValue { get; set; }
 
-    private DatePickerBody? _datePickerBody = default;
-
     /// <summary>
     /// <inheritdoc/>
     /// </summary>
@@ -321,25 +319,7 @@ protected override string FormatValueAsString(TValue value)
 
         if (d.HasValue)
         {
-            if (MinValueToToday(d.Value))
-            {
-                d = DateTime.Today;
-            }
-
-            if (_datePickerBody != null)
-            {
-                var isDisabled = _datePickerBody.IsDisableDay(d.Value);
-                if (isDisabled)
-                {
-                    d = DateTime.MinValue;
-                }
-
-                var isEmpty = MinValueToEmpty(d.Value);
-                if (!isEmpty)
-                {
-                    ret = d.Value.ToString(ViewMode == DatePickerViewMode.DateTime ? DateTimeFormat : DateFormat);
-                }
-            }
+            ret = d.Value.ToString(ViewMode == DatePickerViewMode.DateTime ? DateTimeFormat : DateFormat);
         }
         return ret;
     }
diff --git a/test/UnitTest/Components/DateTimePickerTest.cs b/test/UnitTest/Components/DateTimePickerTest.cs
@@ -1109,7 +1109,7 @@ public async Task OnGetMonthDisabledDaysCallback_Ok()
         // 禁用当天
         var cut = Context.RenderComponent<DateTimePicker<DateTime?>>(pb =>
         {
-            pb.Add(a => a.OnGetMonthDisabledDaysCallback, async (start, end) =>
+            pb.Add(a => a.OnGetDisabledDaysCallback, async (start, end) =>
             {
                 fetched = true;
                 await Task.Yield();
@@ -1135,7 +1135,7 @@ public async Task OnGetMonthDisabledDaysCallback_Ok()
         // 每次组件渲染都会触发回调
         cut.SetParametersAndRender(pb =>
         {
-            pb.Add(a => a.EnableGetMonthDisabledDaysCache, false);
+            pb.Add(a => a.EnableDisabledDaysCache, false);
         });
 
         var buttons = cut.FindAll(".picker-panel-header button");

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ private string BindValueString`
`95`	`95`	`private DateTime? _disabledNullValue = DateTime.Today;`
`96`	`96`	`private DateTime _disabledValue = DateTime.Today;`
`97`	`97`
`98`		`- private async Task<List<DateTime>> OnGetMonthDisabledWeekendsCallback(DateTime start, DateTime end)`
	`98`	`+ private async Task<List<DateTime>> OnGetDisabledWeekendsCallback(DateTime start, DateTime end)`
`99`	`99`	`{`
`100`	`100`	`var ret = new List<DateTime>();`
`101`	`101`	`if (_disableWeekend)`
`@@ -122,7 +122,7 @@ private async Task<List<DateTime>> OnGetMonthDisabledWeekendsCallback(DateTime s`
`122`	`122`	`return ret;`
`123`	`123`	`}`
`124`	`124`
`125`		`- private async Task<List<DateTime>> OnGetMonthDisabledTodayCallback(DateTime start, DateTime end)`
	`125`	`+ private async Task<List<DateTime>> OnGetDisabledTodayCallback(DateTime start, DateTime end)`
`126`	`126`	`{`
`127`	`127`	`// 模拟异步延迟`
`128`	`128`	`await Task.Delay(100);`
Original file line number	Diff line number	Diff line change
`@@ -376,16 +376,16 @@ public bool AllowNull`
`376`	`376`	`private DateTimeRange? Ranger { get; set; }`
`377`	`377`
`378`	`378`	`/// <summary>`
`379`		`- /// 获取/设置获得月自定义禁用日期回调方法，默认 null 内部默认启用数据缓存可通过 <see cref="EnableGetMonthDisabledDaysCache"/> 参数关闭`
	`379`	`+ /// 获取/设置获得月自定义禁用日期回调方法，默认 null 内部默认启用数据缓存可通过 <see cref="EnableDisabledDaysCache"/> 参数关闭`
`380`	`380`	`/// </summary>`
`381`	`381`	`[Parameter]`
`382`		`- public Func<DateTime, DateTime, Task<List<DateTime>>>? OnGetMonthDisabledDaysCallback { get; set; }`
	`382`	`+ public Func<DateTime, DateTime, Task<List<DateTime>>>? OnGetDisabledDaysCallback { get; set; }`
`383`	`383`
`384`	`384`	`/// <summary>`
`385`	`385`	`/// 获得/设置是否启用获得年自定义禁用日期缓存`
`386`	`386`	`/// </summary>`
`387`	`387`	`[Parameter]`
`388`		`- public bool EnableGetMonthDisabledDaysCache { get; set; } = true;`
	`388`	`+ public bool EnableDisabledDaysCache { get; set; } = true;`
`389`	`389`
`390`	`390`	`[Inject]`
`391`	`391`	`[NotNull]`
`@@ -524,16 +524,16 @@ protected override async Task OnParametersSetAsync()`
`524`	`524`
`525`	`525`	`private async Task UpdateDisabledDaysCache(bool force)`
`526`	`526`	`{`
`527`		`- if (OnGetMonthDisabledDaysCallback != null)`
	`527`	`+ if (OnGetDisabledDaysCallback != null)`
`528`	`528`	`{`
`529`	`529`	`var key = $"{StartDate:yyyyMMdd}-{EndDate:yyyyMMdd}";`
`530`		`- if (force && EnableGetMonthDisabledDaysCache == false)`
	`530`	`+ if (force && EnableDisabledDaysCache == false)`
`531`	`531`	`{`
`532`	`532`	`_monthDisabledDaysCache.Remove(key);`
`533`	`533`	`}`
`534`	`534`	`if (!_monthDisabledDaysCache.TryGetValue(key, out var disabledDays))`
`535`	`535`	`{`
`536`		`- disabledDays = await OnGetMonthDisabledDaysCallback(StartDate, EndDate);`
	`536`	`+ disabledDays = await OnGetDisabledDaysCallback(StartDate, EndDate);`
`537`	`537`	`_monthDisabledDaysCache.Add(key, disabledDays);`
`538`	`538`	`}`
`539`	`539`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1109,7 +1109,7 @@ public async Task OnGetMonthDisabledDaysCallback_Ok()`
`1109`	`1109`	`// 禁用当天`
`1110`	`1110`	`var cut = Context.RenderComponent<DateTimePicker<DateTime?>>(pb =>`
`1111`	`1111`	`{`
`1112`		`- pb.Add(a => a.OnGetMonthDisabledDaysCallback, async (start, end) =>`
	`1112`	`+ pb.Add(a => a.OnGetDisabledDaysCallback, async (start, end) =>`
`1113`	`1113`	`{`
`1114`	`1114`	`fetched = true;`
`1115`	`1115`	`await Task.Yield();`
`@@ -1135,7 +1135,7 @@ public async Task OnGetMonthDisabledDaysCallback_Ok()`
`1135`	`1135`	`// 每次组件渲染都会触发回调`
`1136`	`1136`	`cut.SetParametersAndRender(pb =>`
`1137`	`1137`	`{`
`1138`		`- pb.Add(a => a.EnableGetMonthDisabledDaysCache, false);`
	`1138`	`+ pb.Add(a => a.EnableDisabledDaysCache, false);`
`1139`	`1139`	`});`
`1140`	`1140`
`1141`	`1141`	`var buttons = cut.FindAll(".picker-panel-header button");`