From b3f3a72ee4f11ef66daca013515d812edc7972c9 Mon Sep 17 00:00:00 2001 From: Gokce Ozkan Date: Thu, 28 Mar 2024 14:53:28 +0300 Subject: [PATCH 1/2] Update DatePicker issue 37 --- .../Components/DatePicker/DatePicker.razor | 28 +++++++++---------- .../Components/DatePicker/DatePicker.razor.cs | 8 ++++-- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/SiemensIXBlazor/Components/DatePicker/DatePicker.razor b/SiemensIXBlazor/Components/DatePicker/DatePicker.razor index 48a3188..455dd51 100644 --- a/SiemensIXBlazor/Components/DatePicker/DatePicker.razor +++ b/SiemensIXBlazor/Components/DatePicker/DatePicker.razor @@ -5,17 +5,17 @@ @inject IJSRuntime JSRuntime @inherits IXBaseComponent - + diff --git a/SiemensIXBlazor/Components/DatePicker/DatePicker.razor.cs b/SiemensIXBlazor/Components/DatePicker/DatePicker.razor.cs index f1ed217..f76af24 100644 --- a/SiemensIXBlazor/Components/DatePicker/DatePicker.razor.cs +++ b/SiemensIXBlazor/Components/DatePicker/DatePicker.razor.cs @@ -19,7 +19,7 @@ public partial class DatePicker [Parameter] public static string Format { get; set; } = "yyyy/MM/dd"; [Parameter] - public string From { get; set; } = DateTime.Now.ToString(Format); + public string? From { get; set; } [Parameter] public string? MaxDate { get; set; } [Parameter] @@ -27,7 +27,11 @@ public partial class DatePicker [Parameter] public bool Range { get; set; } = true; [Parameter] - public string TextSelectDate { get; set; } = "Done"; + public string I18nDone { get; set; } = "Done"; + [Parameter] + public string? Locale { get; set; } + [Parameter] + public int WeekStartIndex { get; set; } = 0; [Parameter] public string? To { get; set; } [Parameter] From c4f18de46b55a44ef243f147577cec432dc0e711 Mon Sep 17 00:00:00 2001 From: Gokce Ozkan Date: Thu, 28 Mar 2024 15:02:11 +0300 Subject: [PATCH 2/2] Date change events are added --- .../Components/DatePicker/DatePicker.razor.cs | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/SiemensIXBlazor/Components/DatePicker/DatePicker.razor.cs b/SiemensIXBlazor/Components/DatePicker/DatePicker.razor.cs index f76af24..7de6f10 100644 --- a/SiemensIXBlazor/Components/DatePicker/DatePicker.razor.cs +++ b/SiemensIXBlazor/Components/DatePicker/DatePicker.razor.cs @@ -37,6 +37,9 @@ public partial class DatePicker [Parameter] public EventCallback DateRangeChangeEvent { get; set; } [Parameter] + public EventCallback DateChangeEvent { get; set; } + [Parameter] + public EventCallback DateSelectEvent { get; set; } private BaseInterop _interop; @@ -47,6 +50,7 @@ protected async override Task OnAfterRenderAsync(bool firstRender) { _interop = new(JSRuntime); + await _interop.AddEventListener(this, Id, "dateChange", "DateChange"); await _interop.AddEventListener(this, Id, "dateRangeChange", "DateRangeChange"); await _interop.AddEventListener(this, Id, "dateSelect", "DateSelect"); } @@ -61,6 +65,16 @@ public async void DateRangeChange(JsonElement data) await DateRangeChangeEvent.InvokeAsync(jsonData); } + + [JSInvokable] + public async void DateChange(JsonElement data) + { + string jsonDataText = data.GetRawText(); + DatePickerResponse? jsonData = JObject.Parse(jsonDataText) + .ToObject(); + await DateChangeEvent.InvokeAsync(jsonData); + } + [JSInvokable] public async void DateSelect(JsonElement data) {