hc:DateTimePicker support for Validation

This commit is contained in:
NaBian committed 2021-07-18 14:32:12 +08:00
1 parent 13d9404848
commit 30ed64e5d2
3 files changed
+18 -4

No files matched your search

@@ -156,7 +156,7 @@ namespace HandyControl.Controls
var isError = !result.Data; var isError = !result.Data;
if (isError) if (isError)
{ {
SetCurrentValue(IsErrorProperty, true); SetCurrentValue(IsErrorProperty, ValueBoxes.TrueBox);
SetCurrentValue(ErrorStrProperty, result.Message); SetCurrentValue(ErrorStrProperty, result.Message);
} }
else else
@@ -427,9 +427,21 @@ namespace HandyControl.Controls
} }
} }
IsError = !result.Data; var isError = !result.Data;
ErrorStr = result.Message; if (isError)
return result.Data; {
SetCurrentValue(IsErrorProperty, ValueBoxes.TrueBox);
SetCurrentValue(ErrorStrProperty, result.Message);
}
else
{
isError = Validation.GetHasError(this);
if (isError)
{
SetCurrentValue(ErrorStrProperty, Validation.GetErrors(this)[0].ErrorContent);
}
}
return !isError;
} }
public override string ToString() => SelectedDateTime?.ToString(DateTimeFormat) ?? string.Empty; public override string ToString() => SelectedDateTime?.ToString(DateTimeFormat) ?? string.Empty;
@@ -14,6 +14,7 @@
<Setter Property="BorderThickness" Value="1"/> <Setter Property="BorderThickness" Value="1"/>
<Setter Property="CaretBrush" Value="{DynamicResource PrimaryTextBrush}"/> <Setter Property="CaretBrush" Value="{DynamicResource PrimaryTextBrush}"/>
<Setter Property="VerticalContentAlignment" Value="Center"/> <Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="Validation.ErrorTemplate" Value="{x:Null}"/>
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="hc:DateTimePicker"> <ControlTemplate TargetType="hc:DateTimePicker">
@@ -323,6 +324,7 @@
</ControlTemplate> </ControlTemplate>
<Style x:Key="DateTimePickerPlusBaseStyle" BasedOn="{StaticResource DateTimePickerExtendBaseStyle}" TargetType="hc:DateTimePicker"> <Style x:Key="DateTimePickerPlusBaseStyle" BasedOn="{StaticResource DateTimePickerExtendBaseStyle}" TargetType="hc:DateTimePicker">
<Setter Property="IsError" Value="{Binding Path=(Validation.HasError),RelativeSource={RelativeSource Self}}"/>
<Setter Property="Template" Value="{StaticResource DateTimePickerPlusTopTemplate}"/> <Setter Property="Template" Value="{StaticResource DateTimePickerPlusTopTemplate}"/>
<Style.Triggers> <Style.Triggers>
<Trigger Property="hc:InfoElement.TitlePlacement" Value="Left"> <Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">