From b531b4815710aa81925f82d40e97ad01bf532aac Mon Sep 17 00:00:00 2001 From: rabbitism Date: Thu, 20 Jun 2024 18:19:10 +0800 Subject: [PATCH] feat: implement date range picker. --- demo/Ursa.Demo/Pages/DatePickerDemo.axaml | 2 +- .../Controls/DatePicker.axaml | 3 + .../Controls/DateRangePicker.axaml | 147 ++++++++++ src/Ursa.Themes.Semi/Controls/_index.axaml | 1 + .../Controls/DateTimePicker/CalendarView.cs | 22 +- .../Controls/DateTimePicker/DatePicker.cs | 30 +- .../DateTimePicker/DateRangePicker.cs | 269 +++++++++++++++++- 7 files changed, 454 insertions(+), 20 deletions(-) create mode 100644 src/Ursa.Themes.Semi/Controls/DateRangePicker.axaml diff --git a/demo/Ursa.Demo/Pages/DatePickerDemo.axaml b/demo/Ursa.Demo/Pages/DatePickerDemo.axaml index d7810a5..82951c5 100644 --- a/demo/Ursa.Demo/Pages/DatePickerDemo.axaml +++ b/demo/Ursa.Demo/Pages/DatePickerDemo.axaml @@ -9,6 +9,6 @@ - + diff --git a/src/Ursa.Themes.Semi/Controls/DatePicker.axaml b/src/Ursa.Themes.Semi/Controls/DatePicker.axaml index 260bb58..6325342 100644 --- a/src/Ursa.Themes.Semi/Controls/DatePicker.axaml +++ b/src/Ursa.Themes.Semi/Controls/DatePicker.axaml @@ -40,6 +40,9 @@ Background="Transparent" BorderBrush="Transparent" BorderThickness="0" + Watermark="{TemplateBinding Watermark}" + InnerLeftContent="{TemplateBinding InnerLeftContent}" + InnerRightContent="{TemplateBinding InnerRightContent}" CornerRadius="{TemplateBinding CornerRadius}" Foreground="{TemplateBinding Foreground}" Theme="{DynamicResource LooklessTextBox}" diff --git a/src/Ursa.Themes.Semi/Controls/DateRangePicker.axaml b/src/Ursa.Themes.Semi/Controls/DateRangePicker.axaml new file mode 100644 index 0000000..0cc449b --- /dev/null +++ b/src/Ursa.Themes.Semi/Controls/DateRangePicker.axaml @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + +