From 8813fddfacf1fac5f7eb2d92f6fbac1857429bbf Mon Sep 17 00:00:00 2001 From: NaBian <836904362@qq.com> Date: Thu, 29 Jul 2021 22:35:07 +0800 Subject: [PATCH] minor modified input element verifying logic --- .../Controls/Input/CheckComboBox/CheckComboBox.cs | 5 +++++ src/Shared/HandyControl_Shared/Controls/Input/ComboBox.cs | 5 +++++ src/Shared/HandyControl_Shared/Controls/Input/DatePicker.cs | 5 +++++ .../HandyControl_Shared/Controls/Input/DateTimePicker.cs | 5 +++++ src/Shared/HandyControl_Shared/Controls/Input/PasswordBox.cs | 5 +++++ src/Shared/HandyControl_Shared/Controls/Input/TextBox.cs | 5 +++++ src/Shared/HandyControl_Shared/Controls/Input/TimePicker.cs | 5 +++++ 7 files changed, 35 insertions(+) diff --git a/src/Shared/HandyControl_Shared/Controls/Input/CheckComboBox/CheckComboBox.cs b/src/Shared/HandyControl_Shared/Controls/Input/CheckComboBox/CheckComboBox.cs index 70a36ac9..8d2b5b99 100644 --- a/src/Shared/HandyControl_Shared/Controls/Input/CheckComboBox/CheckComboBox.cs +++ b/src/Shared/HandyControl_Shared/Controls/Input/CheckComboBox/CheckComboBox.cs @@ -198,6 +198,11 @@ namespace HandyControl.Controls { SetCurrentValue(ErrorStrProperty, Validation.GetErrors(this)[0].ErrorContent); } + else + { + SetCurrentValue(IsErrorProperty, ValueBoxes.FalseBox); + SetCurrentValue(ErrorStrProperty, default(string)); + } } return !isError; diff --git a/src/Shared/HandyControl_Shared/Controls/Input/ComboBox.cs b/src/Shared/HandyControl_Shared/Controls/Input/ComboBox.cs index c5104147..d178848c 100644 --- a/src/Shared/HandyControl_Shared/Controls/Input/ComboBox.cs +++ b/src/Shared/HandyControl_Shared/Controls/Input/ComboBox.cs @@ -370,6 +370,11 @@ namespace HandyControl.Controls { SetCurrentValue(ErrorStrProperty, Validation.GetErrors(this)[0].ErrorContent); } + else + { + SetCurrentValue(IsErrorProperty, ValueBoxes.FalseBox); + SetCurrentValue(ErrorStrProperty, default(string)); + } } return !isError; diff --git a/src/Shared/HandyControl_Shared/Controls/Input/DatePicker.cs b/src/Shared/HandyControl_Shared/Controls/Input/DatePicker.cs index 7d2c5fc7..66fe911e 100644 --- a/src/Shared/HandyControl_Shared/Controls/Input/DatePicker.cs +++ b/src/Shared/HandyControl_Shared/Controls/Input/DatePicker.cs @@ -166,6 +166,11 @@ namespace HandyControl.Controls { SetCurrentValue(ErrorStrProperty, Validation.GetErrors(this)[0].ErrorContent); } + else + { + SetCurrentValue(IsErrorProperty, ValueBoxes.FalseBox); + SetCurrentValue(ErrorStrProperty, default(string)); + } } return !isError; } diff --git a/src/Shared/HandyControl_Shared/Controls/Input/DateTimePicker.cs b/src/Shared/HandyControl_Shared/Controls/Input/DateTimePicker.cs index 7da94e1c..279771b2 100644 --- a/src/Shared/HandyControl_Shared/Controls/Input/DateTimePicker.cs +++ b/src/Shared/HandyControl_Shared/Controls/Input/DateTimePicker.cs @@ -440,6 +440,11 @@ namespace HandyControl.Controls { SetCurrentValue(ErrorStrProperty, Validation.GetErrors(this)[0].ErrorContent); } + else + { + SetCurrentValue(IsErrorProperty, ValueBoxes.FalseBox); + SetCurrentValue(ErrorStrProperty, default(string)); + } } return !isError; } diff --git a/src/Shared/HandyControl_Shared/Controls/Input/PasswordBox.cs b/src/Shared/HandyControl_Shared/Controls/Input/PasswordBox.cs index 13416eab..c748448c 100644 --- a/src/Shared/HandyControl_Shared/Controls/Input/PasswordBox.cs +++ b/src/Shared/HandyControl_Shared/Controls/Input/PasswordBox.cs @@ -271,6 +271,11 @@ namespace HandyControl.Controls { SetCurrentValue(ErrorStrProperty, Validation.GetErrors(this)[0].ErrorContent); } + else + { + SetCurrentValue(IsErrorProperty, ValueBoxes.FalseBox); + SetCurrentValue(ErrorStrProperty, default(string)); + } } return !isError; } diff --git a/src/Shared/HandyControl_Shared/Controls/Input/TextBox.cs b/src/Shared/HandyControl_Shared/Controls/Input/TextBox.cs index 6394f461..6cf338eb 100644 --- a/src/Shared/HandyControl_Shared/Controls/Input/TextBox.cs +++ b/src/Shared/HandyControl_Shared/Controls/Input/TextBox.cs @@ -125,6 +125,11 @@ namespace HandyControl.Controls { SetCurrentValue(ErrorStrProperty, Validation.GetErrors(this)[0].ErrorContent); } + else + { + SetCurrentValue(IsErrorProperty, ValueBoxes.FalseBox); + SetCurrentValue(ErrorStrProperty, default(string)); + } } return !isError; diff --git a/src/Shared/HandyControl_Shared/Controls/Input/TimePicker.cs b/src/Shared/HandyControl_Shared/Controls/Input/TimePicker.cs index 373e7cb5..a91d98d6 100644 --- a/src/Shared/HandyControl_Shared/Controls/Input/TimePicker.cs +++ b/src/Shared/HandyControl_Shared/Controls/Input/TimePicker.cs @@ -408,6 +408,11 @@ namespace HandyControl.Controls { SetCurrentValue(ErrorStrProperty, Validation.GetErrors(this)[0].ErrorContent); } + else + { + SetCurrentValue(IsErrorProperty, ValueBoxes.FalseBox); + SetCurrentValue(ErrorStrProperty, default(string)); + } } return !isError; }