🐛 fix(DatePicker): Incorrect year value when Locale="fa-IR" (#2099)

masastack · Aug 12, 2024 · 39193ec · 39193ec
1 parent c0d6b2c
commit 39193ec
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/src/Masa.Blazor/Components/DatePicker/MDatePicker.razor b/src/Masa.Blazor/Components/DatePicker/MDatePicker.razor
@@ -69,6 +69,7 @@
                           Min="@MinYear"
                           Max="@MaxYear"
                           Value="@TableYear"
+                          TableDate="@TableDate"
                           Locale="@CurrentLocale"
                           Type="@Type"
                           OnInput="@OnYearClickAsync"

diff --git a/src/Masa.Blazor/Components/DatePicker/MDatePickerYears.razor b/src/Masa.Blazor/Components/DatePicker/MDatePickerYears.razor
@@ -29,7 +29,7 @@
             class="@GetClass(CssClassUtils.GetTextColor(color), active ? "active" : null)"
             style="@(StyleBuilder.Create().AddTextColor(color))"
             @onclick="@(() => HandleOnYearItemClickAsync(year))">
-            @Formatter(new DateOnly(year, 1, 1))
+            @Formatter(new DateOnly(year, TableDate.Month, TableDate.Day))
         </li>
     };
 }
diff --git a/src/Masa.Blazor/Components/DatePicker/MDatePickerYears.razor.cs b/src/Masa.Blazor/Components/DatePicker/MDatePickerYears.razor.cs
@@ -13,6 +13,9 @@ public partial class MDatePickerYears : MasaComponentBase
 
     [Parameter] public int Value { get; set; }
 
+    // for issue #2097
+    [Parameter] public DateOnly TableDate { get; set; }
+
     [Parameter] public EventCallback<int> OnInput { get; set; }
 
     [Parameter] public EventCallback<int> OnYearClick { get; set; }