enhance: optimize input elements.

src/Shared/HandyControl_Shared/Controls/Attach/InfoElement.cs

@@ -39,7 +39,7 @@ public class InfoElement : TitleElement
     ///     内容高度
     /// </summary>
     public static readonly DependencyProperty ContentHeightProperty = DependencyProperty.RegisterAttached(
-        "ContentHeight", typeof(double), typeof(InfoElement), new FrameworkPropertyMetadata(30.0, FrameworkPropertyMetadataOptions.Inherits));
+        "ContentHeight", typeof(double), typeof(InfoElement), new FrameworkPropertyMetadata(28.0, FrameworkPropertyMetadataOptions.Inherits));
 
     public static void SetContentHeight(DependencyObject element, double value) => element.SetValue(ContentHeightProperty, value);
 
@@ -49,7 +49,7 @@ public class InfoElement : TitleElement
     ///     最小内容高度
     /// </summary>
     public static readonly DependencyProperty MinContentHeightProperty = DependencyProperty.RegisterAttached(
-        "MinContentHeight", typeof(double), typeof(InfoElement), new PropertyMetadata(30.0));
+        "MinContentHeight", typeof(double), typeof(InfoElement), new PropertyMetadata(28.0));
 
     public static void SetMinContentHeight(DependencyObject element, double value)
         => element.SetValue(MinContentHeightProperty, value);

src/Shared/HandyControl_Shared/Controls/Attach/TitleElement.cs

@@ -85,6 +85,15 @@ public class TitleElement
     public static Thickness GetMarginOnTheLeft(DependencyObject element)
         => (Thickness) element.GetValue(MarginOnTheLeftProperty);
 
+    public static readonly DependencyProperty MarginOnTheTopProperty = DependencyProperty.RegisterAttached(
+        "MarginOnTheTop", typeof(Thickness), typeof(TitleElement), new FrameworkPropertyMetadata(default(Thickness), FrameworkPropertyMetadataOptions.Inherits));
+
+    public static void SetMarginOnTheTop(DependencyObject element, Thickness value)
+        => element.SetValue(MarginOnTheTopProperty, value);
+
+    public static Thickness GetMarginOnTheTop(DependencyObject element)
+        => (Thickness) element.GetValue(MarginOnTheTopProperty);
+
     public static readonly DependencyProperty PaddingProperty = DependencyProperty.RegisterAttached(
         "Padding", typeof(Thickness), typeof(TitleElement), new FrameworkPropertyMetadata(default(Thickness), FrameworkPropertyMetadataOptions.Inherits));
 

src/Shared/HandyControl_Shared/Controls/Block/ToggleBlock.cs

@@ -1,7 +1,10 @@
 using System.ComponentModel;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Markup;
 using HandyControl.Data;
+using HandyControl.Interactivity;
 
 namespace HandyControl.Controls;
 
@@ -10,9 +13,13 @@ namespace HandyControl.Controls;
 /// </summary>
 public class ToggleBlock : Control
 {
-    public static readonly DependencyProperty IsCheckedProperty = DependencyProperty.Register(
-        nameof(IsChecked), typeof(bool?), typeof(ToggleBlock), new FrameworkPropertyMetadata(ValueBoxes.FalseBox,
-            FrameworkPropertyMetadataOptions.BindsTwoWayByDefault | FrameworkPropertyMetadataOptions.Journal));
+    public static readonly DependencyProperty IsCheckedProperty = DependencyProperty.Register(nameof(IsChecked), typeof(bool?), typeof(ToggleBlock), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault | FrameworkPropertyMetadataOptions.Journal));
+    public static readonly DependencyProperty CheckedContentProperty = DependencyProperty.Register(nameof(CheckedContent), typeof(object), typeof(ToggleBlock), new PropertyMetadata(default(object)));
+    public static readonly DependencyProperty UnCheckedContentProperty = DependencyProperty.Register(nameof(UnCheckedContent), typeof(object), typeof(ToggleBlock), new PropertyMetadata(default(object)));
+    public static readonly DependencyProperty IndeterminateContentProperty = DependencyProperty.Register(nameof(IndeterminateContent), typeof(object), typeof(ToggleBlock), new PropertyMetadata(default(object)));
+    public static readonly DependencyProperty ToggleGestureProperty = DependencyProperty.Register(nameof(ToggleGesture), typeof(MouseGesture), typeof(ToggleBlock), new UIPropertyMetadata(new MouseGesture(MouseAction.None), OnToggleGestureChanged));
+
+    private MouseBinding _toggleBinding;
 
     [Category("Appearance")]
     [TypeConverter(typeof(NullableBoolConverter))]
@@ -29,30 +36,52 @@ public class ToggleBlock : Control
         set => SetValue(IsCheckedProperty, value.HasValue ? ValueBoxes.BooleanBox(value.Value) : null);
     }
 
-    public static readonly DependencyProperty CheckedContentProperty = DependencyProperty.Register(
-        nameof(CheckedContent), typeof(object), typeof(ToggleBlock), new PropertyMetadata(default(object)));
-
     public object CheckedContent
     {
         get => GetValue(CheckedContentProperty);
         set => SetValue(CheckedContentProperty, value);
     }
 
-    public static readonly DependencyProperty UnCheckedContentProperty = DependencyProperty.Register(
-        nameof(UnCheckedContent), typeof(object), typeof(ToggleBlock), new PropertyMetadata(default(object)));
-
     public object UnCheckedContent
     {
         get => GetValue(UnCheckedContentProperty);
         set => SetValue(UnCheckedContentProperty, value);
     }
 
-    public static readonly DependencyProperty IndeterminateContentProperty = DependencyProperty.Register(
-        nameof(IndeterminateContent), typeof(object), typeof(ToggleBlock), new PropertyMetadata(default(object)));
-
     public object IndeterminateContent
     {
         get => GetValue(IndeterminateContentProperty);
         set => SetValue(IndeterminateContentProperty, value);
     }
+
+    [ValueSerializer(typeof(MouseGestureValueSerializer))]
+    [TypeConverter(typeof(MouseGestureConverter))]
+    public MouseGesture ToggleGesture
+    {
+        get => (MouseGesture) GetValue(ToggleGestureProperty);
+        set => SetValue(ToggleGestureProperty, value);
+    }
+
+    public ToggleBlock()
+    {
+        CommandBindings.Add(new CommandBinding(ControlCommands.Toggle, OnToggled));
+        OnToggleGestureChanged(ToggleGesture);
+    }
+
+    private static void OnToggleGestureChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        ((ToggleBlock) d).OnToggleGestureChanged((MouseGesture) e.NewValue);
+    }
+
+    private void OnToggleGestureChanged(MouseGesture newValue)
+    {
+        InputBindings.Remove(_toggleBinding);
+        _toggleBinding = new MouseBinding(ControlCommands.Toggle, newValue);
+        InputBindings.Add(_toggleBinding);
+    }
+
+    private void OnToggled(object sender, ExecutedRoutedEventArgs e)
+    {
+        SetCurrentValue(IsCheckedProperty, IsChecked == true ? ValueBoxes.FalseBox : ValueBoxes.TrueBox);
+    }
 }

src/Shared/HandyControl_Shared/Controls/Input/CheckComboBox/CheckComboBox.cs

@@ -12,7 +12,7 @@ namespace HandyControl.Controls;
 
 [TemplatePart(Name = ElementPanel, Type = typeof(Panel))]
 [TemplatePart(Name = ElementSelectAll, Type = typeof(CheckComboBoxItem))]
-public class CheckComboBox : ListBox, IDataInput
+public class CheckComboBox : ListBox
 {
     private const string ElementPanel = "PART_Panel";
 
@@ -24,42 +24,6 @@ public class CheckComboBox : ListBox, IDataInput
 
     private bool _isInternalAction;
 
-    public static readonly DependencyProperty IsErrorProperty = DependencyProperty.Register(
-        nameof(IsError), typeof(bool), typeof(CheckComboBox), new PropertyMetadata(ValueBoxes.FalseBox));
-
-    public bool IsError
-    {
-        get => (bool) GetValue(IsErrorProperty);
-        set => SetValue(IsErrorProperty, ValueBoxes.BooleanBox(value));
-    }
-
-    public static readonly DependencyProperty ErrorStrProperty = DependencyProperty.Register(
-        nameof(ErrorStr), typeof(string), typeof(CheckComboBox), new PropertyMetadata(default(string)));
-
-    public string ErrorStr
-    {
-        get => (string) GetValue(ErrorStrProperty);
-        set => SetValue(ErrorStrProperty, value);
-    }
-
-    public static readonly DependencyProperty TextTypeProperty = DependencyProperty.Register(
-        nameof(TextType), typeof(TextType), typeof(CheckComboBox), new PropertyMetadata(default(TextType)));
-
-    public TextType TextType
-    {
-        get => (TextType) GetValue(TextTypeProperty);
-        set => SetValue(TextTypeProperty, value);
-    }
-
-    public static readonly DependencyProperty ShowClearButtonProperty = DependencyProperty.Register(
-        nameof(ShowClearButton), typeof(bool), typeof(CheckComboBox), new PropertyMetadata(ValueBoxes.FalseBox));
-
-    public bool ShowClearButton
-    {
-        get => (bool) GetValue(ShowClearButtonProperty);
-        set => SetValue(ShowClearButtonProperty, ValueBoxes.BooleanBox(value));
-    }
-
     public static readonly DependencyProperty MaxDropDownHeightProperty =
         System.Windows.Controls.ComboBox.MaxDropDownHeightProperty.AddOwner(typeof(CheckComboBox),
             new FrameworkPropertyMetadata(SystemParameters.PrimaryScreenHeight / 3));
@@ -103,6 +67,15 @@ public class CheckComboBox : ListBox, IDataInput
         set => SetValue(TagStyleProperty, value);
     }
 
+    public static readonly DependencyProperty TagSpacingProperty = DependencyProperty.Register(
+        nameof(TagSpacing), typeof(double), typeof(CheckComboBox), new PropertyMetadata(ValueBoxes.Double0Box));
+
+    public double TagSpacing
+    {
+        get => (double) GetValue(TagSpacingProperty);
+        set => SetValue(TagSpacingProperty, value);
+    }
+
     public static readonly DependencyProperty ShowSelectAllButtonProperty = DependencyProperty.Register(
         nameof(ShowSelectAllButton), typeof(bool), typeof(CheckComboBox), new PropertyMetadata(ValueBoxes.FalseBox));
 
@@ -146,59 +119,9 @@ public class CheckComboBox : ListBox, IDataInput
         UpdateTags();
     }
 
-    public bool VerifyData()
-    {
-        OperationResult<bool> result;
-
-        if (VerifyFunc != null)
-        {
-            result = VerifyFunc.Invoke(null);
-        }
-        else
-        {
-            if (SelectedItems.Count > 0)
-            {
-                result = OperationResult.Success();
-            }
-            else if (InfoElement.GetNecessary(this))
-            {
-                result = OperationResult.Failed(Properties.Langs.Lang.IsNecessary);
-            }
-            else
-            {
-                result = OperationResult.Success();
-            }
-        }
-
-        var isError = !result.Data;
-        if (isError)
-        {
-            SetCurrentValue(IsErrorProperty, ValueBoxes.TrueBox);
-            SetCurrentValue(ErrorStrProperty, result.Message);
-        }
-        else
-        {
-            isError = Validation.GetHasError(this);
-            if (isError)
-            {
-                SetCurrentValue(ErrorStrProperty, Validation.GetErrors(this)[0].ErrorContent?.ToString());
-            }
-            else
-            {
-                SetCurrentValue(IsErrorProperty, ValueBoxes.FalseBox);
-                SetCurrentValue(ErrorStrProperty, default(string));
-            }
-        }
-
-        return !isError;
-    }
-
-    public Func<string, OperationResult<bool>> VerifyFunc { get; set; }
-
     protected override void OnSelectionChanged(SelectionChangedEventArgs e)
     {
         UpdateTags();
-        VerifyData();
 
         base.OnSelectionChanged(e);
     }

src/Shared/HandyControl_Shared/Controls/Input/ComboBox.cs

@@ -17,7 +17,7 @@ namespace HandyControl.Controls;
 [TemplatePart(Name = AutoCompletePanel, Type = typeof(Panel))]
 [TemplatePart(Name = EditableTextBox, Type = typeof(System.Windows.Controls.TextBox))]
 [TemplatePart(Name = AutoPopupAutoComplete, Type = typeof(Popup))]
-public class ComboBox : System.Windows.Controls.ComboBox, IDataInput
+public class ComboBox : System.Windows.Controls.ComboBox
 {
 #if NET40
 
@@ -68,8 +68,6 @@ public class ComboBox : System.Windows.Controls.ComboBox, IDataInput
 
             if (_editableTextBox != null)
             {
-                _editableTextBox.TextChanged += EditableTextBox_TextChanged;
-
                 _editableTextBox.SetBinding(SelectionBrushProperty, new Binding(SelectionBrushProperty.Name) { Source = this });
 #if !(NET40 || NET45 || NET451 || NET452 || NET46 || NET461 || NET462 || NET47 || NET471 || NET472)
                 _editableTextBox.SetBinding(SelectionTextBrushProperty, new Binding(SelectionTextBrushProperty.Name) { Source = this });
@@ -114,11 +112,6 @@ public class ComboBox : System.Windows.Controls.ComboBox, IDataInput
 
 #endif
 
-    private void EditableTextBox_TextChanged(object sender, TextChangedEventArgs e)
-    {
-        VerifyData();
-    }
-
     private void EditableTextBox_LostFocus(object sender, RoutedEventArgs e)
     {
         if (_autoPopupAutoComplete != null)
@@ -149,88 +142,16 @@ public class ComboBox : System.Windows.Controls.ComboBox, IDataInput
     {
         _isAutoCompleteAction = false;
         base.OnSelectionChanged(e);
-        VerifyData();
 #if NET40
         _isAutoCompleteAction = true;
 #endif
     }
 
-    /// <summary>
-    ///     数据验证委托
-    /// </summary>
-    public Func<string, OperationResult<bool>> VerifyFunc { get; set; }
-
     /// <summary>
     ///     数据搜索委托
     /// </summary>
     public Func<ItemCollection, object, IEnumerable<object>> SearchFunc { get; set; }
 
-    /// <summary>
-    ///     数据是否错误
-    /// </summary>
-    public static readonly DependencyProperty IsErrorProperty = DependencyProperty.Register(
-        nameof(IsError), typeof(bool), typeof(ComboBox), new PropertyMetadata(ValueBoxes.FalseBox));
-
-    /// <summary>
-    ///     数据是否错误
-    /// </summary>
-    public bool IsError
-    {
-        get => (bool) GetValue(IsErrorProperty);
-        set => SetValue(IsErrorProperty, ValueBoxes.BooleanBox(value));
-    }
-
-    /// <summary>
-    ///     错误提示
-    /// </summary>
-    public static readonly DependencyProperty ErrorStrProperty = DependencyProperty.Register(
-        nameof(ErrorStr), typeof(string), typeof(ComboBox), new PropertyMetadata(default(string)));
-
-    /// <summary>
-    ///     错误提示
-    /// </summary>
-    public string ErrorStr
-    {
-        get => (string) GetValue(ErrorStrProperty);
-        set => SetValue(ErrorStrProperty, value);
-    }
-
-    /// <summary>
-    ///     文本类型
-    /// </summary>
-    public static readonly DependencyPropertyKey TextTypePropertyKey =
-        DependencyProperty.RegisterReadOnly("TextType", typeof(TextType), typeof(ComboBox),
-            new PropertyMetadata(default(TextType)));
-
-    /// <summary>
-    ///     文本类型
-    /// </summary>
-    public static readonly DependencyProperty TextTypeProperty = TextTypePropertyKey.DependencyProperty;
-
-    /// <summary>
-    ///     文本类型
-    /// </summary>
-    public TextType TextType
-    {
-        get => (TextType) GetValue(TextTypeProperty);
-        set => SetValue(TextTypeProperty, value);
-    }
-
-    /// <summary>
-    ///     是否显示清除按钮
-    /// </summary>
-    public static readonly DependencyProperty ShowClearButtonProperty = DependencyProperty.Register(
-        nameof(ShowClearButton), typeof(bool), typeof(ComboBox), new PropertyMetadata(ValueBoxes.FalseBox));
-
-    /// <summary>
-    ///     是否显示清除按钮
-    /// </summary>
-    public bool ShowClearButton
-    {
-        get => (bool) GetValue(ShowClearButtonProperty);
-        set => SetValue(ShowClearButtonProperty, ValueBoxes.BooleanBox(value));
-    }
-
     /// <summary>
     ///     是否自动完成输入
     /// </summary>
@@ -327,59 +248,6 @@ public class ComboBox : System.Windows.Controls.ComboBox, IDataInput
         set => SetValue(CaretBrushProperty, value);
     }
 
-    /// <summary>
-    ///     验证数据
-    /// </summary>
-    /// <returns></returns>
-    public virtual bool VerifyData()
-    {
-        OperationResult<bool> result;
-
-        var value = _editableTextBox == null ? Text : _editableTextBox.Text;
-
-        if (VerifyFunc != null)
-        {
-            result = VerifyFunc.Invoke(value);
-        }
-        else
-        {
-            if (!string.IsNullOrEmpty(value))
-            {
-                result = OperationResult.Success();
-            }
-            else if (InfoElement.GetNecessary(this))
-            {
-                result = OperationResult.Failed(Properties.Langs.Lang.IsNecessary);
-            }
-            else
-            {
-                result = OperationResult.Success();
-            }
-        }
-
-        var isError = !result.Data;
-        if (isError)
-        {
-            SetCurrentValue(IsErrorProperty, ValueBoxes.TrueBox);
-            SetCurrentValue(ErrorStrProperty, result.Message);
-        }
-        else
-        {
-            isError = Validation.GetHasError(this);
-            if (isError)
-            {
-                SetCurrentValue(ErrorStrProperty, Validation.GetErrors(this)[0].ErrorContent?.ToString());
-            }
-            else
-            {
-                SetCurrentValue(IsErrorProperty, ValueBoxes.FalseBox);
-                SetCurrentValue(ErrorStrProperty, default(string));
-            }
-        }
-
-        return !isError;
-    }
-
     /// <summary>
     ///     更新搜索的项目
     /// </summary>

src/Shared/HandyControl_Shared/Controls/Input/DatePicker.cs

@@ -1,17 +1,14 @@
-using System;
-using System.Windows;
-using System.Windows.Controls;
+using System.Windows;
 using System.Windows.Controls.Primitives;
 using System.Windows.Data;
 using System.Windows.Input;
 using System.Windows.Media;
-using HandyControl.Data;
 using HandyControl.Interactivity;
 
 namespace HandyControl.Controls;
 
 [TemplatePart(Name = ElementTextBox, Type = typeof(DatePickerTextBox))]
-public class DatePicker : System.Windows.Controls.DatePicker, IDataInput
+public class DatePicker : System.Windows.Controls.DatePicker
 {
     private const string ElementTextBox = "PART_TextBox";
 
@@ -28,11 +25,6 @@ public class DatePicker : System.Windows.Controls.DatePicker, IDataInput
 
     public override void OnApplyTemplate()
     {
-        if (_textBox != null)
-        {
-            _textBox.TextChanged -= TextBox_TextChanged;
-        }
-
         base.OnApplyTemplate();
 
         _textBox = GetTemplateChild(ElementTextBox) as System.Windows.Controls.TextBox;
@@ -44,51 +36,9 @@ public class DatePicker : System.Windows.Controls.DatePicker, IDataInput
 #endif
             _textBox.SetBinding(SelectionOpacityProperty, new Binding(SelectionOpacityProperty.Name) { Source = this });
             _textBox.SetBinding(CaretBrushProperty, new Binding(CaretBrushProperty.Name) { Source = this });
-
-            _textBox.TextChanged += TextBox_TextChanged;
         }
     }
 
-    private void TextBox_TextChanged(object sender, TextChangedEventArgs e) => VerifyData();
-
-    public Func<string, OperationResult<bool>> VerifyFunc { get; set; }
-
-    public static readonly DependencyProperty IsErrorProperty = DependencyProperty.Register(
-        nameof(IsError), typeof(bool), typeof(DatePicker), new PropertyMetadata(ValueBoxes.FalseBox));
-
-    public bool IsError
-    {
-        get => (bool) GetValue(IsErrorProperty);
-        set => SetValue(IsErrorProperty, ValueBoxes.BooleanBox(value));
-    }
-
-    public static readonly DependencyProperty ErrorStrProperty = DependencyProperty.Register(
-        nameof(ErrorStr), typeof(string), typeof(DatePicker), new PropertyMetadata(default(string)));
-
-    public string ErrorStr
-    {
-        get => (string) GetValue(ErrorStrProperty);
-        set => SetValue(ErrorStrProperty, value);
-    }
-
-    public static readonly DependencyProperty TextTypeProperty = DependencyProperty.Register(
-        nameof(TextType), typeof(TextType), typeof(DatePicker), new PropertyMetadata(default(TextType)));
-
-    public TextType TextType
-    {
-        get => (TextType) GetValue(TextTypeProperty);
-        set => SetValue(TextTypeProperty, value);
-    }
-
-    public static readonly DependencyProperty ShowClearButtonProperty = DependencyProperty.Register(
-        nameof(ShowClearButton), typeof(bool), typeof(DatePicker), new PropertyMetadata(ValueBoxes.FalseBox));
-
-    public bool ShowClearButton
-    {
-        get => (bool) GetValue(ShowClearButtonProperty);
-        set => SetValue(ShowClearButtonProperty, ValueBoxes.BooleanBox(value));
-    }
-
     public static readonly DependencyProperty SelectionBrushProperty =
         TextBoxBase.SelectionBrushProperty.AddOwner(typeof(DatePicker));
 
@@ -128,50 +78,4 @@ public class DatePicker : System.Windows.Controls.DatePicker, IDataInput
         get => (Brush) GetValue(CaretBrushProperty);
         set => SetValue(CaretBrushProperty, value);
     }
-
-    public virtual bool VerifyData()
-    {
-        OperationResult<bool> result;
-
-        if (VerifyFunc != null)
-        {
-            result = VerifyFunc.Invoke(Text);
-        }
-        else
-        {
-            if (!string.IsNullOrEmpty(Text))
-            {
-                result = OperationResult.Success();
-            }
-            else if (InfoElement.GetNecessary(this))
-            {
-                result = OperationResult.Failed(Properties.Langs.Lang.IsNecessary);
-            }
-            else
-            {
-                result = OperationResult.Success();
-            }
-        }
-
-        var isError = !result.Data;
-        if (isError)
-        {
-            SetCurrentValue(IsErrorProperty, ValueBoxes.TrueBox);
-            SetCurrentValue(ErrorStrProperty, result.Message);
-        }
-        else
-        {
-            isError = Validation.GetHasError(this);
-            if (isError)
-            {
-                SetCurrentValue(ErrorStrProperty, Validation.GetErrors(this)[0].ErrorContent?.ToString());
-            }
-            else
-            {
-                SetCurrentValue(IsErrorProperty, ValueBoxes.FalseBox);
-                SetCurrentValue(ErrorStrProperty, default(string));
-            }
-        }
-        return !isError;
-    }
 }

src/Shared/HandyControl_Shared/Controls/Input/DateTimePicker.cs

@@ -20,7 +20,7 @@ namespace HandyControl.Controls;
 [TemplatePart(Name = ElementTextBox, Type = typeof(WatermarkTextBox))]
 [TemplatePart(Name = ElementButton, Type = typeof(Button))]
 [TemplatePart(Name = ElementPopup, Type = typeof(Popup))]
-public class DateTimePicker : Control, IDataInput
+public class DateTimePicker : Control
 {
     #region Constants
 
@@ -238,44 +238,6 @@ public class DateTimePicker : Control, IDataInput
         SetCurrentValue(TextProperty, value);
     }
 
-    public Func<string, OperationResult<bool>> VerifyFunc { get; set; }
-
-    public static readonly DependencyProperty IsErrorProperty = DependencyProperty.Register(
-        nameof(IsError), typeof(bool), typeof(DateTimePicker), new PropertyMetadata(ValueBoxes.FalseBox));
-
-    public bool IsError
-    {
-        get => (bool) GetValue(IsErrorProperty);
-        set => SetValue(IsErrorProperty, ValueBoxes.BooleanBox(value));
-    }
-
-    public static readonly DependencyProperty ErrorStrProperty = DependencyProperty.Register(
-        nameof(ErrorStr), typeof(string), typeof(DateTimePicker), new PropertyMetadata(default(string)));
-
-    public string ErrorStr
-    {
-        get => (string) GetValue(ErrorStrProperty);
-        set => SetValue(ErrorStrProperty, value);
-    }
-
-    public static readonly DependencyProperty TextTypeProperty = DependencyProperty.Register(
-        nameof(TextType), typeof(TextType), typeof(DateTimePicker), new PropertyMetadata(default(TextType)));
-
-    public TextType TextType
-    {
-        get => (TextType) GetValue(TextTypeProperty);
-        set => SetValue(TextTypeProperty, value);
-    }
-
-    public static readonly DependencyProperty ShowClearButtonProperty = DependencyProperty.Register(
-        nameof(ShowClearButton), typeof(bool), typeof(DateTimePicker), new PropertyMetadata(ValueBoxes.FalseBox));
-
-    public bool ShowClearButton
-    {
-        get => (bool) GetValue(ShowClearButtonProperty);
-        set => SetValue(ShowClearButtonProperty, ValueBoxes.BooleanBox(value));
-    }
-
     public static readonly DependencyProperty SelectionBrushProperty =
         TextBoxBase.SelectionBrushProperty.AddOwner(typeof(DateTimePicker));
 
@@ -405,52 +367,6 @@ public class DateTimePicker : Control, IDataInput
         }
     }
 
-    public virtual bool VerifyData()
-    {
-        OperationResult<bool> result;
-
-        if (VerifyFunc != null)
-        {
-            result = VerifyFunc.Invoke(Text);
-        }
-        else
-        {
-            if (!string.IsNullOrEmpty(Text))
-            {
-                result = OperationResult.Success();
-            }
-            else if (InfoElement.GetNecessary(this))
-            {
-                result = OperationResult.Failed(Properties.Langs.Lang.IsNecessary);
-            }
-            else
-            {
-                result = OperationResult.Success();
-            }
-        }
-
-        var isError = !result.Data;
-        if (isError)
-        {
-            SetCurrentValue(IsErrorProperty, ValueBoxes.TrueBox);
-            SetCurrentValue(ErrorStrProperty, result.Message);
-        }
-        else
-        {
-            isError = Validation.GetHasError(this);
-            if (isError)
-            {
-                SetCurrentValue(ErrorStrProperty, Validation.GetErrors(this)[0].ErrorContent?.ToString());
-            }
-            else
-            {
-                SetCurrentValue(IsErrorProperty, ValueBoxes.FalseBox);
-                SetCurrentValue(ErrorStrProperty, default(string));
-            }
-        }
-        return !isError;
-    }
-
     public override string ToString() => SelectedDateTime?.ToString(DateTimeFormat) ?? string.Empty;
 
     #endregion
@@ -527,7 +443,6 @@ public class DateTimePicker : Control, IDataInput
     private void TextBox_TextChanged(object sender, TextChangedEventArgs e)
     {
         SetValueNoCallback(TextProperty, _textBox.Text);
-        VerifyData();
     }
 
     private bool ProcessDateTimePickerKey(KeyEventArgs e)

src/Shared/HandyControl_Shared/Controls/Input/IDataInput.cs

@@ -1,42 +0,0 @@
-using System;
-using HandyControl.Data;
-
-
-namespace HandyControl.Controls;
-
-/// <summary>
-///     表示可以成为一个数据输入控件
-/// </summary>
-public interface IDataInput
-{
-    /// <summary>
-    ///     验证数据
-    /// </summary>
-    /// <returns></returns>
-    bool VerifyData();
-
-    /// <summary>
-    ///     数据验证委托
-    /// </summary>
-    Func<string, OperationResult<bool>> VerifyFunc { get; set; }
-
-    /// <summary>
-    ///     数据是否错误
-    /// </summary>
-    bool IsError { get; set; }
-
-    /// <summary>
-    ///     错误提示
-    /// </summary>
-    string ErrorStr { get; set; }
-
-    /// <summary>
-    ///     文本类型
-    /// </summary>
-    TextType TextType { get; set; }
-
-    /// <summary>
-    ///     是否显示清除按钮
-    /// </summary>
-    bool ShowClearButton { get; set; }
-}

src/Shared/HandyControl_Shared/Controls/Input/PasswordBox.cs

@@ -10,13 +10,12 @@ using System.Windows.Input;
 using System.Windows.Media;
 using HandyControl.Data;
 using HandyControl.Interactivity;
-using HandyControl.Properties.Langs;
 
 namespace HandyControl.Controls;
 
 [TemplatePart(Name = ElementPasswordBox, Type = typeof(System.Windows.Controls.PasswordBox))]
 [TemplatePart(Name = ElementTextBox, Type = typeof(System.Windows.Controls.TextBox))]
-public class PasswordBox : Control, IDataInput
+public class PasswordBox : Control
 {
     private const string ElementPasswordBox = "PART_PasswordBox";
 
@@ -39,54 +38,6 @@ public class PasswordBox : Control, IDataInput
         set => SetValue(PasswordCharProperty, value);
     }
 
-    /// <summary>
-    ///     数据是否错误
-    /// </summary>
-    public static readonly DependencyProperty IsErrorProperty = DependencyProperty.Register(
-        nameof(IsError), typeof(bool), typeof(PasswordBox), new PropertyMetadata(ValueBoxes.FalseBox));
-
-    public bool IsError
-    {
-        get => (bool) GetValue(IsErrorProperty);
-        set => SetValue(IsErrorProperty, ValueBoxes.BooleanBox(value));
-    }
-
-    /// <summary>
-    ///     错误提示
-    /// </summary>
-    public static readonly DependencyProperty ErrorStrProperty = DependencyProperty.Register(
-        nameof(ErrorStr), typeof(string), typeof(PasswordBox), new PropertyMetadata(default(string)));
-
-    public string ErrorStr
-    {
-        get => (string) GetValue(ErrorStrProperty);
-        set => SetValue(ErrorStrProperty, value);
-    }
-
-    /// <summary>
-    ///     文本类型
-    /// </summary>
-    public static readonly DependencyProperty TextTypeProperty = DependencyProperty.Register(
-        nameof(TextType), typeof(TextType), typeof(PasswordBox), new PropertyMetadata(default(TextType)));
-
-    public TextType TextType
-    {
-        get => (TextType) GetValue(TextTypeProperty);
-        set => SetValue(TextTypeProperty, value);
-    }
-
-    /// <summary>
-    ///     是否显示清除按钮
-    /// </summary>
-    public static readonly DependencyProperty ShowClearButtonProperty = DependencyProperty.Register(
-        nameof(ShowClearButton), typeof(bool), typeof(PasswordBox), new PropertyMetadata(ValueBoxes.FalseBox));
-
-    public bool ShowClearButton
-    {
-        get => (bool) GetValue(ShowClearButtonProperty);
-        set => SetValue(ShowClearButtonProperty, ValueBoxes.BooleanBox(value));
-    }
-
     public static readonly DependencyProperty ShowEyeButtonProperty = DependencyProperty.Register(
         nameof(ShowEyeButton), typeof(bool), typeof(PasswordBox), new PropertyMetadata(ValueBoxes.FalseBox));
 
@@ -234,52 +185,6 @@ public class PasswordBox : Control, IDataInput
     [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
     public SecureString SecurePassword => ActualPasswordBox?.SecurePassword;
 
-    public Func<string, OperationResult<bool>> VerifyFunc { get; set; }
-
-    public virtual bool VerifyData()
-    {
-        OperationResult<bool> result;
-
-        if (VerifyFunc != null)
-        {
-            result = VerifyFunc.Invoke(ShowEyeButton && ShowPassword
-                ? _textBox.Text
-                : ActualPasswordBox.Password);
-        }
-        else
-        {
-            if (!string.IsNullOrEmpty(ShowEyeButton && ShowPassword
-                    ? _textBox.Text
-                    : ActualPasswordBox.Password))
-                result = OperationResult.Success();
-            else if (InfoElement.GetNecessary(this))
-                result = OperationResult.Failed(Lang.IsNecessary);
-            else
-                result = OperationResult.Success();
-        }
-
-        var isError = !result.Data;
-        if (isError)
-        {
-            SetCurrentValue(IsErrorProperty, ValueBoxes.TrueBox);
-            SetCurrentValue(ErrorStrProperty, result.Message);
-        }
-        else
-        {
-            isError = Validation.GetHasError(this);
-            if (isError)
-            {
-                SetCurrentValue(ErrorStrProperty, Validation.GetErrors(this)[0].ErrorContent?.ToString());
-            }
-            else
-            {
-                SetCurrentValue(IsErrorProperty, ValueBoxes.FalseBox);
-                SetCurrentValue(ErrorStrProperty, default(string));
-            }
-        }
-        return !isError;
-    }
-
     private static void OnShowPasswordChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
         var ctl = (PasswordBox) d;
@@ -376,8 +281,6 @@ public class PasswordBox : Control, IDataInput
                 _textBox.Text = ActualPasswordBox.Password;
             }
         }
-
-        VerifyData();
     }
 
     private void TextBox_TextChanged(object sender, TextChangedEventArgs e)
@@ -387,7 +290,5 @@ public class PasswordBox : Control, IDataInput
             Password = _textBox.Text;
             SetCurrentValue(UnsafePasswordProperty, Password);
         }
-
-        VerifyData();
     }
 }

src/Shared/HandyControl_Shared/Controls/Input/TimePicker.cs

@@ -20,7 +20,7 @@ namespace HandyControl.Controls;
 [TemplatePart(Name = ElementTextBox, Type = typeof(WatermarkTextBox))]
 [TemplatePart(Name = ElementButton, Type = typeof(Button))]
 [TemplatePart(Name = ElementPopup, Type = typeof(Popup))]
-public class TimePicker : Control, IDataInput
+public class TimePicker : Control
 {
     #region Constants
 
@@ -260,44 +260,6 @@ public class TimePicker : Control, IDataInput
 
     #endregion Text
 
-    public Func<string, OperationResult<bool>> VerifyFunc { get; set; }
-
-    public static readonly DependencyProperty IsErrorProperty = DependencyProperty.Register(
-        nameof(IsError), typeof(bool), typeof(TimePicker), new PropertyMetadata(ValueBoxes.FalseBox));
-
-    public bool IsError
-    {
-        get => (bool) GetValue(IsErrorProperty);
-        set => SetValue(IsErrorProperty, ValueBoxes.BooleanBox(value));
-    }
-
-    public static readonly DependencyProperty ErrorStrProperty = DependencyProperty.Register(
-        nameof(ErrorStr), typeof(string), typeof(TimePicker), new PropertyMetadata(default(string)));
-
-    public string ErrorStr
-    {
-        get => (string) GetValue(ErrorStrProperty);
-        set => SetValue(ErrorStrProperty, value);
-    }
-
-    public static readonly DependencyProperty TextTypeProperty = DependencyProperty.Register(
-        nameof(TextType), typeof(TextType), typeof(TimePicker), new PropertyMetadata(default(TextType)));
-
-    public TextType TextType
-    {
-        get => (TextType) GetValue(TextTypeProperty);
-        set => SetValue(TextTypeProperty, value);
-    }
-
-    public static readonly DependencyProperty ShowClearButtonProperty = DependencyProperty.Register(
-        nameof(ShowClearButton), typeof(bool), typeof(TimePicker), new PropertyMetadata(ValueBoxes.FalseBox));
-
-    public bool ShowClearButton
-    {
-        get => (bool) GetValue(ShowClearButtonProperty);
-        set => SetValue(ShowClearButtonProperty, ValueBoxes.BooleanBox(value));
-    }
-
     public static readonly DependencyProperty SelectionBrushProperty =
         TextBoxBase.SelectionBrushProperty.AddOwner(typeof(TimePicker));
 
@@ -371,52 +333,6 @@ public class TimePicker : Control, IDataInput
 
     #region Public Methods
 
-    public virtual bool VerifyData()
-    {
-        OperationResult<bool> result;
-
-        if (VerifyFunc != null)
-        {
-            result = VerifyFunc.Invoke(Text);
-        }
-        else
-        {
-            if (!string.IsNullOrEmpty(Text))
-            {
-                result = OperationResult.Success();
-            }
-            else if (InfoElement.GetNecessary(this))
-            {
-                result = OperationResult.Failed(Properties.Langs.Lang.IsNecessary);
-            }
-            else
-            {
-                result = OperationResult.Success();
-            }
-        }
-
-        var isError = !result.Data;
-        if (isError)
-        {
-            SetCurrentValue(IsErrorProperty, ValueBoxes.TrueBox);
-            SetCurrentValue(ErrorStrProperty, result.Message);
-        }
-        else
-        {
-            isError = Validation.GetHasError(this);
-            if (isError)
-            {
-                SetCurrentValue(ErrorStrProperty, Validation.GetErrors(this)[0].ErrorContent?.ToString());
-            }
-            else
-            {
-                SetCurrentValue(IsErrorProperty, ValueBoxes.FalseBox);
-                SetCurrentValue(ErrorStrProperty, default(string));
-            }
-        }
-        return !isError;
-    }
-
     public override void OnApplyTemplate()
     {
         if (DesignerProperties.GetIsInDesignMode(this)) return;
@@ -565,7 +481,6 @@ public class TimePicker : Control, IDataInput
     private void TextBox_TextChanged(object sender, TextChangedEventArgs e)
     {
         SetValueNoCallback(TextProperty, _textBox.Text);
-        VerifyData();
     }
 
     private bool ProcessTimePickerKey(KeyEventArgs e)