diff --git a/src/BootstrapBlazor/Components/Calendar/Calendar.razor b/src/BootstrapBlazor/Components/Calendar/Calendar.razor
index a6d76970b1d54387e98aa04cc08efcbaa7c1793c..34db651a705ea9f9665a0458b1345fd091bf3ec2 100644
--- a/src/BootstrapBlazor/Components/Calendar/Calendar.razor
+++ b/src/BootstrapBlazor/Components/Calendar/Calendar.razor
@@ -8,19 +8,19 @@
             <div class="calendar-title">@GetTitle()</div>
             <div class="calendar-button-group">
                 <div class="btn-group">
-                    <button type="button" class="btn btn-sm" @onclick="e => OnChangeYear(-1)">
+                    <button type="button" class="btn btn-sm" @onclick="() => OnChangeYear(-1)">
                         <span>@PreviousYear</span>
                     </button>
-                    <button type="button" class="btn btn-sm" @onclick="e => OnChangeMonth(-1)">
+                    <button type="button" class="btn btn-sm" @onclick="() => OnChangeMonth(-1)">
                         <span>@PreviousMonth</span>
                     </button>
-                    <button type="button" class="btn btn-sm" @onclick="e => OnChangeMonth(0)">
+                    <button type="button" class="btn btn-sm" @onclick="() => OnChangeMonth(0)">
                         <span>@Today</span>
                     </button>
-                    <button type="button" class="btn btn-sm" @onclick="e => OnChangeMonth(1)">
+                    <button type="button" class="btn btn-sm" @onclick="() => OnChangeMonth(1)">
                         <span>@NextMonth</span>
                     </button>
-                    <button type="button" class="btn btn-sm" @onclick="e => OnChangeYear(1)">
+                    <button type="button" class="btn btn-sm" @onclick="() => OnChangeYear(1)">
                         <span>@NextYear</span>
                     </button>
                 </div>
@@ -64,13 +64,13 @@
             <div class="calendar-title"><span class="d-none d-sm-inline-block">@GetTitle()</span> <span>@WeekNumberText</span></div>
             <div class="calendar-button-group">
                 <div class="btn-group">
-                    <button type="button" class="btn btn-sm" @onclick="e => OnChangeWeek(-7)">
+                    <button type="button" class="btn btn-sm" @onclick="() => OnChangeWeek(-7)">
                         <span>@PreviousWeek</span>
                     </button>
-                    <button type="button" class="btn btn-sm" @onclick="e => OnChangeWeek(0)">
+                    <button type="button" class="btn btn-sm" @onclick="() => OnChangeWeek(0)">
                         <span>@WeekText</span>
                     </button>
-                    <button type="button" class="btn btn-sm" @onclick="e => OnChangeWeek(7)">
+                    <button type="button" class="btn btn-sm" @onclick="() => OnChangeWeek(7)">
                         <span>@NextWeek</span>
                     </button>
                 </div>
diff --git a/src/BootstrapBlazor/Components/Calendar/Calendar.razor.cs b/src/BootstrapBlazor/Components/Calendar/Calendar.razor.cs
index 208cbdfe9ed5a631c8386df7211f5fcc019cf2d7..0a9b2ddc5601323c45d69c7e4541db2fec7ae845 100644
--- a/src/BootstrapBlazor/Components/Calendar/Calendar.razor.cs
+++ b/src/BootstrapBlazor/Components/Calendar/Calendar.razor.cs
@@ -179,24 +179,30 @@ public partial class Calendar
         {
             await ValueChanged.InvokeAsync(Value);
         }
-
-        StateHasChanged();
+        else
+        {
+            StateHasChanged();
+        }
     }
 
     /// <summary>
     /// 右侧快捷切换年按钮回调此方法
     /// </summary>
     /// <param name="offset"></param>
-    protected void OnChangeYear(int offset)
+    protected async Task OnChangeYear(int offset)
     {
         Value = Value.AddYears(offset);
+        if (ValueChanged.HasDelegate)
+        {
+            await ValueChanged.InvokeAsync(Value);
+        }
     }
 
     /// <summary>
     /// 右侧快捷切换月按钮回调此方法
     /// </summary>
     /// <param name="offset"></param>
-    protected void OnChangeMonth(int offset)
+    protected async Task OnChangeMonth(int offset)
     {
         if (offset == 0)
         {
@@ -206,13 +212,17 @@ public partial class Calendar
         {
             Value = Value.AddMonths(offset);
         }
+        if (ValueChanged.HasDelegate)
+        {
+            await ValueChanged.InvokeAsync(Value);
+        }
     }
 
     /// <summary>
     /// 右侧快捷切换周按钮回调此方法
     /// </summary>
     /// <param name="offset"></param>
-    protected void OnChangeWeek(int offset)
+    protected async Task OnChangeWeek(int offset)
     {
         if (offset == 0)
         {
@@ -223,6 +233,10 @@ public partial class Calendar
             Value = Value.AddDays(offset);
         }
         WeekNumberText = Localizer[nameof(WeekNumberText), GetWeekCount()];
+        if (ValueChanged.HasDelegate)
+        {
+            await ValueChanged.InvokeAsync(Value);
+        }
     }
 
     private CalendarCellValue CreateCellValue(DateTime cellValue)
diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.cs b/src/BootstrapBlazor/Components/Table/Table.razor.cs
index 3e5dba1121d2c1171a4cb0b1d6ec59e6e5195dfa..2b96da82c4b3b9e4c4b81bfcec9f94701453b2ef 100644
--- a/src/BootstrapBlazor/Components/Table/Table.razor.cs
+++ b/src/BootstrapBlazor/Components/Table/Table.razor.cs
@@ -127,7 +127,7 @@ public partial class Table<TItem> : ITable where TItem : class, new()
 
     private int PageStartIndex => Rows.Any() ? (PageIndex - 1) * PageItems + 1 : 0;
 
-    private string PageInfoLabelString => Localizer[nameof(PageInfoText), PageStartIndex, (PageIndex - 1) * PageItems + Rows.Count, TotalCount];
+    private string? PageInfoLabelString => Localizer[nameof(PageInfoText), PageStartIndex, (PageIndex - 1) * PageItems + Rows.Count, TotalCount];
 
     /// <summary>
     /// 获得/设置 列拷贝 Tooltip 文字
diff --git a/test/UnitTest/Components/SwalTest.cs b/test/UnitTest/Components/SwalTest.cs
index 806cb7f9385f13ea4176c5ac841ac988df483967..f6aba11f70b3ebee5957fea8313d518f0504bddc 100644
--- a/test/UnitTest/Components/SwalTest.cs
+++ b/test/UnitTest/Components/SwalTest.cs
@@ -24,7 +24,8 @@ public class SwalTest : SwalTestBase
             ShowFooter = true,
             ShowClose = true,
             CloseButtonIcon = "test-close-icon",
-            CloseButtonText = "test-button-text-Cancel"
+            CloseButtonText = "test-button-text-Cancel",
+            Class = "dialog-swal-test"
         }));
 
         // 代码覆盖模板单元测试
@@ -33,6 +34,7 @@ public class SwalTest : SwalTestBase
         Assert.Contains("Test-ButtonTemplate", cut.Markup);
         Assert.Contains("test-close-icon", cut.Markup);
         Assert.Contains("test-button-text-Cancel", cut.Markup);
+        Assert.Contains("dialog-swal-test", cut.Markup);
 
         // 测试关闭逻辑
         var modals = cut.FindComponents<Modal>();