Merge branch 'master' into master

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

@@ -0,0 +1,225 @@
+using System;
+using System.ComponentModel;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using HandyControl.Data;
+using HandyControl.Interactivity;
+
+namespace HandyControl.Controls
+{
+    [TemplatePart(Name = ElementPanel, Type = typeof(Panel))]
+    [TemplatePart(Name = ElementSelectAll, Type = typeof(CheckComboBoxItem))]
+    public class CheckComboBox : ListBox, IDataInput
+    {
+        private const string ElementPanel = "PART_Panel";
+
+        private const string ElementSelectAll = "PART_SelectAll";
+
+        private Panel _panel;
+
+        private CheckComboBoxItem _selectAllItem;
+
+        private bool _isInternalAction;
+
+        public static readonly DependencyProperty IsErrorProperty = DependencyProperty.Register(
+            "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(
+            "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(
+            "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(
+            "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));
+
+        [Bindable(true), Category("Layout")]
+        [TypeConverter(typeof(LengthConverter))]
+        public double MaxDropDownHeight
+        {
+            get => (double) GetValue(MaxDropDownHeightProperty);
+            set => SetValue(MaxDropDownHeightProperty, value);
+        }
+
+        public static readonly DependencyProperty IsDropDownOpenProperty = DependencyProperty.Register(
+            "IsDropDownOpen", typeof(bool), typeof(CheckComboBox), new PropertyMetadata(ValueBoxes.FalseBox));
+
+        public bool IsDropDownOpen
+        {
+            get => (bool) GetValue(IsDropDownOpenProperty);
+            set => SetValue(IsDropDownOpenProperty, ValueBoxes.BooleanBox(value));
+        }
+
+        public static readonly DependencyProperty TagStyleProperty = DependencyProperty.Register(
+            "TagStyle", typeof(Style), typeof(CheckComboBox), new PropertyMetadata(default(Style)));
+
+        public Style TagStyle
+        {
+            get => (Style) GetValue(TagStyleProperty);
+            set => SetValue(TagStyleProperty, value);
+        }
+
+        public static readonly DependencyProperty ShowSelectAllButtonProperty = DependencyProperty.Register(
+            "ShowSelectAllButton", typeof(bool), typeof(CheckComboBox), new PropertyMetadata(ValueBoxes.FalseBox));
+
+        public bool ShowSelectAllButton
+        {
+            get => (bool) GetValue(ShowSelectAllButtonProperty);
+            set => SetValue(ShowSelectAllButtonProperty, ValueBoxes.BooleanBox(value));
+        }
+
+        public CheckComboBox()
+        {
+            AddHandler(Controls.Tag.ClosedEvent, new RoutedEventHandler(Tags_OnClosed));
+            CommandBindings.Add(new CommandBinding(ControlCommands.Clear, (s, e) => SelectedItems.Clear()));
+        }
+
+        private void Tags_OnClosed(object sender, RoutedEventArgs e)
+        {
+            if (e.OriginalSource is Tag tag && tag.Tag is CheckComboBoxItem checkComboBoxItem)
+            {
+                checkComboBoxItem.SetCurrentValue(IsSelectedProperty, false);
+            }
+        }
+
+        public override void OnApplyTemplate()
+        {
+            if (_selectAllItem != null)
+            {
+                _selectAllItem.Selected -= SelectAllItem_Selected;
+                _selectAllItem.Unselected -= SelectAllItem_Unselected;
+            }
+
+            base.OnApplyTemplate();
+
+            _panel = GetTemplateChild(ElementPanel) as Panel;
+            _selectAllItem = GetTemplateChild(ElementSelectAll) as CheckComboBoxItem;
+            if (_selectAllItem != null)
+            {
+                _selectAllItem.Selected += SelectAllItem_Selected;
+                _selectAllItem.Unselected += SelectAllItem_Unselected;
+            }
+        }
+
+        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();
+                }
+            }
+
+            IsError = !result.Data;
+            ErrorStr = result.Message;
+            return result.Data;
+        }
+
+        public Func<string, OperationResult<bool>> VerifyFunc { get; set; }
+
+        private void SwitchAllItems(bool selected)
+        {
+            if (_isInternalAction) return;
+            _isInternalAction = true;
+
+            foreach (var item in Items)
+            {
+                if (ItemContainerGenerator.ContainerFromItem(item) is CheckComboBoxItem checkComboBoxItem)
+                {
+                    checkComboBoxItem.SetCurrentValue(ListBoxItem.IsSelectedProperty, selected);
+                }
+            }
+
+            _isInternalAction = false;
+            UpdateTags();
+        }
+
+        private void SelectAllItem_Selected(object sender, RoutedEventArgs e) => SwitchAllItems(true);
+
+        private void SelectAllItem_Unselected(object sender, RoutedEventArgs e) => SwitchAllItems(false);
+
+        protected override void OnSelectionChanged(SelectionChangedEventArgs e)
+        {
+            UpdateTags();
+            VerifyData();
+
+            base.OnSelectionChanged(e);
+        }
+
+        protected override bool IsItemItsOwnContainerOverride(object item) => item is CheckComboBoxItem;
+
+        protected override DependencyObject GetContainerForItemOverride() => new CheckComboBoxItem();
+
+        private void UpdateTags()
+        {
+            if (_panel == null || _isInternalAction) return;
+
+            if (_selectAllItem != null)
+            {
+                _isInternalAction = true;
+                _selectAllItem.SetCurrentValue(IsSelectedProperty, SelectedItems.Count == Items.Count);
+                _isInternalAction = false;
+            }
+
+            _panel.Children.Clear();
+
+            foreach (var item in SelectedItems)
+            {
+                if (ItemContainerGenerator.ContainerFromItem(item) is CheckComboBoxItem checkComboBoxItem)
+                {
+                    var tag = new Tag
+                    {
+                        Style = TagStyle,
+                        Content = checkComboBoxItem.Content,
+                        Tag = checkComboBoxItem
+                    };
+                    _panel.Children.Add(tag);
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,9 @@
+using System.Windows.Controls;
+
+namespace HandyControl.Controls
+{
+    public class CheckComboBoxItem : ListBoxItem
+    {
+
+    }
+}

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

@@ -5,7 +5,7 @@ using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Data;
 using System.Windows.Input;
-#if netle40
+#if NET40
 using System.Windows.Threading;
 #endif
 using HandyControl.Data;
@@ -18,7 +18,7 @@ namespace HandyControl.Controls
     [TemplatePart(Name = AutoPopupAutoComplete, Type = typeof(Popup))]
     public class ComboBox : System.Windows.Controls.ComboBox, IDataInput
     {
-#if netle40
+#if NET40
 
         private string _searchText;
 
@@ -71,7 +71,7 @@ namespace HandyControl.Controls
 
                     if (AutoComplete)
                     {
-#if netle40
+#if NET40
                         _autoCompleteTimer = new DispatcherTimer
                         {
                             Interval = TimeSpan.FromMilliseconds(500)
@@ -84,7 +84,7 @@ namespace HandyControl.Controls
                         {
                             UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged,
                             Mode = BindingMode.OneWayToSource,
-#if !netle40
+#if !NET40
                             Delay = 500,
 #endif
                             Source = this
@@ -96,7 +96,7 @@ namespace HandyControl.Controls
             }
         }
 
-#if netle40
+#if NET40
 
         private void AutoCompleteTimer_Tick(object sender, EventArgs e)
         {
@@ -119,7 +119,7 @@ namespace HandyControl.Controls
             }
         }
 
-#if !netle40
+#if !NET40
         protected override void OnDropDownClosed(EventArgs e)
         {
             base.OnDropDownClosed(e);
@@ -142,7 +142,7 @@ namespace HandyControl.Controls
             _isAutoCompleteAction = false;
             base.OnSelectionChanged(e);
             VerifyData();
-#if netle40
+#if NET40
             _isAutoCompleteAction = true;
 #endif
         }
@@ -169,7 +169,7 @@ namespace HandyControl.Controls
         public bool IsError
         {
             get => (bool)GetValue(IsErrorProperty);
-            set => SetValue(IsErrorProperty, value);
+            set => SetValue(IsErrorProperty, ValueBoxes.BooleanBox(value));
         }
 
         /// <summary>
@@ -220,7 +220,7 @@ namespace HandyControl.Controls
         public bool ShowClearButton
         {
             get => (bool)GetValue(ShowClearButtonProperty);
-            set => SetValue(ShowClearButtonProperty, value);
+            set => SetValue(ShowClearButtonProperty, ValueBoxes.BooleanBox(value));
         }
 
         /// <summary>
@@ -312,7 +312,7 @@ namespace HandyControl.Controls
             var ctl = (ComboBox)d;
             if (ctl._isAutoCompleteAction)
             {
-#if netle40
+#if NET40
                 ctl._searchText = e.NewValue as string;
                 ctl._autoCompleteTimer.Stop();
                 ctl._autoCompleteTimer.Start();
@@ -339,7 +339,7 @@ namespace HandyControl.Controls
         public bool AutoComplete
         {
             get => (bool)GetValue(AutoCompleteProperty);
-            set => SetValue(AutoCompleteProperty, value);
+            set => SetValue(AutoCompleteProperty, ValueBoxes.BooleanBox(value));
         }
 
         /// <summary>

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

@@ -8,7 +8,6 @@ using HandyControl.Interactivity;
 
 namespace HandyControl.Controls
 {
-    /// <inheritdoc cref="IDataInput" />
     [TemplatePart(Name = ElementTextBox, Type = typeof(DatePickerTextBox))]
     public class DatePicker : System.Windows.Controls.DatePicker, IDataInput
     {
@@ -51,7 +50,7 @@ namespace HandyControl.Controls
         public bool IsError
         {
             get => (bool) GetValue(IsErrorProperty);
-            set => SetValue(IsErrorProperty, value);
+            set => SetValue(IsErrorProperty, ValueBoxes.BooleanBox(value));
         }
 
         public static readonly DependencyProperty ErrorStrProperty = DependencyProperty.Register(
@@ -78,7 +77,7 @@ namespace HandyControl.Controls
         public bool ShowClearButton
         {
             get => (bool) GetValue(ShowClearButtonProperty);
-            set => SetValue(ShowClearButtonProperty, value);
+            set => SetValue(ShowClearButtonProperty, ValueBoxes.BooleanBox(value));
         }
 
         public virtual bool VerifyData()

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

@@ -153,7 +153,7 @@ namespace HandyControl.Controls
         public bool IsDropDownOpen
         {
             get => (bool) GetValue(IsDropDownOpenProperty);
-            set => SetValue(IsDropDownOpenProperty, value);
+            set => SetValue(IsDropDownOpenProperty, ValueBoxes.BooleanBox(value));
         }
 
         public static readonly DependencyProperty SelectedDateTimeProperty = DependencyProperty.Register(
@@ -238,7 +238,7 @@ namespace HandyControl.Controls
         public bool IsError
         {
             get => (bool) GetValue(IsErrorProperty);
-            set => SetValue(IsErrorProperty, value);
+            set => SetValue(IsErrorProperty, ValueBoxes.BooleanBox(value));
         }
 
         public static readonly DependencyProperty ErrorStrProperty = DependencyProperty.Register(
@@ -265,7 +265,7 @@ namespace HandyControl.Controls
         public bool ShowClearButton
         {
             get => (bool) GetValue(ShowClearButtonProperty);
-            set => SetValue(ShowClearButtonProperty, value);
+            set => SetValue(ShowClearButtonProperty, ValueBoxes.BooleanBox(value));
         }
 
         #endregion

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

@@ -0,0 +1,126 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using HandyControl.Data;
+using HandyControl.Interactivity;
+using Microsoft.Win32;
+
+namespace HandyControl.Controls
+{
+    public class ImageSelector : Control
+    {
+        public ImageSelector() => CommandBindings.Add(new CommandBinding(ControlCommands.Switch, SwitchImage));
+
+        private void SwitchImage(object sender, ExecutedRoutedEventArgs e)
+        {
+            if (!HasValue)
+            {
+                var dialog = new OpenFileDialog
+                {
+                    RestoreDirectory = true,
+                    Filter = Filter,
+                    DefaultExt = DefaultExt
+                };
+
+                if (dialog.ShowDialog() == true)
+                {
+                    SetValue(UriPropertyKey, new Uri(dialog.FileName, UriKind.RelativeOrAbsolute));
+                    SetValue(PreviewBrushPropertyKey, new ImageBrush(BitmapFrame.Create(Uri, BitmapCreateOptions.IgnoreImageCache, BitmapCacheOption.None))
+                    {
+                        Stretch = Stretch
+                    });
+                    SetValue(HasValuePropertyKey, ValueBoxes.TrueBox); 
+                    SetCurrentValue(ToolTipProperty, dialog.FileName);
+                }
+            }
+            else
+            {
+                SetValue(UriPropertyKey, default(Uri));
+                SetValue(PreviewBrushPropertyKey, default(Brush));
+                SetValue(HasValuePropertyKey, ValueBoxes.FalseBox);
+                SetCurrentValue(ToolTipProperty, default);
+            }
+        }
+
+        public static readonly DependencyProperty StretchProperty = DependencyProperty.Register(
+            "Stretch", typeof(Stretch), typeof(ImageSelector), new PropertyMetadata(default(Stretch)));
+
+        public Stretch Stretch
+        {
+            get => (Stretch) GetValue(StretchProperty);
+            set => SetValue(StretchProperty, value);
+        }
+
+        public static readonly DependencyPropertyKey UriPropertyKey = DependencyProperty.RegisterReadOnly(
+            "Uri", typeof(Uri), typeof(ImageSelector), new PropertyMetadata(default(Uri)));
+
+        public static readonly DependencyProperty UriProperty = UriPropertyKey.DependencyProperty;
+
+        public Uri Uri
+        {
+            get => (Uri) GetValue(UriProperty);
+            set => SetValue(UriProperty, value);
+        }
+
+        public static readonly DependencyPropertyKey PreviewBrushPropertyKey = DependencyProperty.RegisterReadOnly(
+            "PreviewBrush", typeof(Brush), typeof(ImageSelector), new PropertyMetadata(default(Brush)));
+
+        public static readonly DependencyProperty PreviewBrushProperty = PreviewBrushPropertyKey.DependencyProperty;
+
+        public Brush PreviewBrush
+        {
+            get => (Brush) GetValue(PreviewBrushProperty);
+            set => SetValue(PreviewBrushProperty, value);
+        }
+
+        public static readonly DependencyProperty StrokeThicknessProperty = DependencyProperty.Register(
+            "StrokeThickness", typeof(double), typeof(ImageSelector), new FrameworkPropertyMetadata(ValueBoxes.Double1Box, FrameworkPropertyMetadataOptions.AffectsRender));
+
+        public double StrokeThickness
+        {
+            get => (double) GetValue(StrokeThicknessProperty);
+            set => SetValue(StrokeThicknessProperty, value);
+        }
+
+        public static readonly DependencyProperty StrokeDashArrayProperty = DependencyProperty.Register(
+            "StrokeDashArray", typeof(DoubleCollection), typeof(ImageSelector), new FrameworkPropertyMetadata(default(DoubleCollection), FrameworkPropertyMetadataOptions.AffectsRender));
+
+        public DoubleCollection StrokeDashArray
+        {
+            get => (DoubleCollection) GetValue(StrokeDashArrayProperty);
+            set => SetValue(StrokeDashArrayProperty, value);
+        }
+
+        public static readonly DependencyProperty DefaultExtProperty = DependencyProperty.Register(
+            "DefaultExt", typeof(string), typeof(ImageSelector), new PropertyMetadata(".jpg"));
+
+        public string DefaultExt
+        {
+            get => (string) GetValue(DefaultExtProperty);
+            set => SetValue(DefaultExtProperty, value);
+        }
+
+        public static readonly DependencyProperty FilterProperty = DependencyProperty.Register(
+            "Filter", typeof(string), typeof(ImageSelector), new PropertyMetadata("(.jpg)|*.jpg|(.png)|*.png"));
+
+        public string Filter
+        {
+            get => (string) GetValue(FilterProperty);
+            set => SetValue(FilterProperty, value);
+        }
+
+        public static readonly DependencyPropertyKey HasValuePropertyKey = DependencyProperty.RegisterReadOnly(
+            "HasValue", typeof(bool), typeof(ImageSelector), new PropertyMetadata(ValueBoxes.FalseBox));
+
+        public static readonly DependencyProperty HasValueProperty = HasValuePropertyKey.DependencyProperty;
+
+        public bool HasValue
+        {
+            get => (bool) GetValue(HasValueProperty);
+            set => SetValue(HasValueProperty, ValueBoxes.BooleanBox(value));
+        }
+    }
+}

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
@@ -8,7 +8,6 @@ using HandyControl.Tools;
 
 namespace HandyControl.Controls
 {
-    /// <inheritdoc cref="IDataInput" />
     /// <summary>
     ///     数值选择控件
     /// </summary>
@@ -74,7 +73,7 @@ namespace HandyControl.Controls
             if (_textBox != null)
             {
                 TextCompositionManager.RemovePreviewTextInputHandler(_textBox, PreviewTextInputHandler);
-                _textBox.TextChanged -= _textBox_TextChanged;
+                _textBox.TextChanged -= TextBox_TextChanged;
                 _textBox.PreviewKeyDown -= TextBox_PreviewKeyDown;
                 _textBox.LostFocus -= TextBox_LostFocus;
             }
@@ -87,18 +86,22 @@ namespace HandyControl.Controls
             if (_textBox != null)
             {
                 TextCompositionManager.AddPreviewTextInputHandler(_textBox, PreviewTextInputHandler);
-                _textBox.TextChanged += _textBox_TextChanged;
+                _textBox.TextChanged += TextBox_TextChanged;
                 _textBox.PreviewKeyDown += TextBox_PreviewKeyDown;
                 _textBox.LostFocus += TextBox_LostFocus;
                 _textBox.Text = CurrentText;
             }
         }
 
-        private void _textBox_TextChanged(object sender, TextChangedEventArgs e) => UpdateData();
+        private void TextBox_TextChanged(object sender, TextChangedEventArgs e) => UpdateData();
 
         private void UpdateData()
         {
-            if (!VerifyData()) return;
+            if (!VerifyData())
+            {
+                _updateText = true;
+                return;
+            }
             if (double.TryParse(_textBox.Text, out var value))
             {
                 _updateText = false;
@@ -172,13 +175,9 @@ namespace HandyControl.Controls
 
         private static void OnValueChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            var ctl = (NumericUpDown) d;
-            var v = (double) e.NewValue;
-            if (ctl._updateText && ctl._textBox != null)
-            {
-                ctl._textBox.Text = ctl.CurrentText;
-                ctl._textBox.Select(ctl._textBox.Text.Length, 0);
-            }
+            var ctl = (NumericUpDown)d;
+            var v = (double)e.NewValue;
+            ctl.SetText();
 
             ctl.OnValueChanged(new FunctionEventArgs<double>(ValueChangedEvent, ctl)
             {
@@ -186,6 +185,15 @@ namespace HandyControl.Controls
             });
         }
 
+        private void SetText()
+        {
+            if (_updateText && _textBox != null)
+            {
+                _textBox.Text = CurrentText;
+                _textBox.Select(_textBox.Text.Length, 0);
+            }
+        }
+
         private static object CoerceValue(DependencyObject d, object basevalue)
         {
             var ctl = (NumericUpDown)d;
@@ -201,7 +209,7 @@ namespace HandyControl.Controls
             {
                 ctl.Value = maximum;
             }
-
+            ctl.SetText();
             return num > maximum ? maximum : num;
         }
 
@@ -210,7 +218,7 @@ namespace HandyControl.Controls
         /// </summary>
         public double Value
         {
-            get => (double) GetValue(ValueProperty);
+            get => (double)GetValue(ValueProperty);
             set => SetValue(ValueProperty, value);
         }
 
@@ -238,7 +246,7 @@ namespace HandyControl.Controls
         /// </summary>
         public double Maximum
         {
-            get => (double) GetValue(MaximumProperty);
+            get => (double)GetValue(MaximumProperty);
             set => SetValue(MaximumProperty, value);
         }
 
@@ -266,7 +274,7 @@ namespace HandyControl.Controls
         /// </summary>
         public double Minimum
         {
-            get => (double) GetValue(MinimumProperty);
+            get => (double)GetValue(MinimumProperty);
             set => SetValue(MinimumProperty, value);
         }
 
@@ -281,7 +289,7 @@ namespace HandyControl.Controls
         /// </summary>
         public double Increment
         {
-            get => (double) GetValue(IncrementProperty);
+            get => (double)GetValue(IncrementProperty);
             set => SetValue(IncrementProperty, value);
         }
 
@@ -296,7 +304,7 @@ namespace HandyControl.Controls
         /// </summary>
         public int? DecimalPlaces
         {
-            get => (int?) GetValue(DecimalPlacesProperty);
+            get => (int?)GetValue(DecimalPlacesProperty);
             set => SetValue(DecimalPlacesProperty, value);
         }
 
@@ -311,8 +319,8 @@ namespace HandyControl.Controls
         /// </summary>
         internal bool ShowUpDownButton
         {
-            get => (bool) GetValue(ShowUpDownButtonProperty);
-            set => SetValue(ShowUpDownButtonProperty, value);
+            get => (bool)GetValue(ShowUpDownButtonProperty);
+            set => SetValue(ShowUpDownButtonProperty, ValueBoxes.BooleanBox(value));
         }
 
         /// <summary>
@@ -323,8 +331,8 @@ namespace HandyControl.Controls
 
         public bool IsError
         {
-            get => (bool) GetValue(IsErrorProperty);
-            set => SetValue(IsErrorProperty, value);
+            get => (bool)GetValue(IsErrorProperty);
+            set => SetValue(IsErrorProperty, ValueBoxes.BooleanBox(value));
         }
 
         /// <summary>
@@ -335,7 +343,7 @@ namespace HandyControl.Controls
 
         public string ErrorStr
         {
-            get => (string) GetValue(ErrorStrProperty);
+            get => (string)GetValue(ErrorStrProperty);
             set => SetValue(ErrorStrProperty, value);
         }
 
@@ -350,7 +358,7 @@ namespace HandyControl.Controls
 
         public TextType TextType
         {
-            get => (TextType) GetValue(TextTypeProperty);
+            get => (TextType)GetValue(TextTypeProperty);
             set => SetValue(TextTypeProperty, value);
         }
 
@@ -362,8 +370,8 @@ namespace HandyControl.Controls
 
         public bool ShowClearButton
         {
-            get => (bool) GetValue(ShowClearButtonProperty);
-            set => SetValue(ShowClearButtonProperty, value); 
+            get => (bool)GetValue(ShowClearButtonProperty);
+            set => SetValue(ShowClearButtonProperty, ValueBoxes.BooleanBox(value));
         }
 
         /// <summary>
@@ -377,8 +385,8 @@ namespace HandyControl.Controls
         /// </summary>
         public bool IsReadOnly
         {
-            get => (bool) GetValue(IsReadOnlyProperty);
-            set => SetValue(IsReadOnlyProperty, value);
+            get => (bool)GetValue(IsReadOnlyProperty);
+            set => SetValue(IsReadOnlyProperty, ValueBoxes.BooleanBox(value));
         }
 
         public Func<string, OperationResult<bool>> VerifyFunc { get; set; }
@@ -426,4 +434,4 @@ namespace HandyControl.Controls
             return result.Data;
         }
     }
-}
+}

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

@@ -4,14 +4,16 @@ using System.Runtime.InteropServices;
 using System.Security;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
 using System.Windows.Input;
+using System.Windows.Media;
 using HandyControl.Data;
 using HandyControl.Interactivity;
 using HandyControl.Properties.Langs;
 
 namespace HandyControl.Controls
 {
-    /// <inheritdoc cref="IDataInput" />
     [TemplatePart(Name = ElementPasswordBox, Type = typeof(System.Windows.Controls.PasswordBox))]
     [TemplatePart(Name = ElementTextBox, Type = typeof(System.Windows.Controls.TextBox))]
     public class PasswordBox : Control, IDataInput
@@ -20,6 +22,11 @@ namespace HandyControl.Controls
 
         private const string ElementTextBox = "PART_TextBox";
 
+        private SecureString _password;
+
+        private System.Windows.Controls.TextBox _textBox;
+
+
         /// <summary>
         ///     掩码字符
         /// </summary>
@@ -27,46 +34,139 @@ namespace HandyControl.Controls
             System.Windows.Controls.PasswordBox.PasswordCharProperty.AddOwner(typeof(PasswordBox),
                 new FrameworkPropertyMetadata('●'));
 
+        public char PasswordChar
+        {
+            get => (char)GetValue(PasswordCharProperty);
+            set => SetValue(PasswordCharProperty, value);
+        }
+
         /// <summary>
         ///     数据是否错误
         /// </summary>
         public static readonly DependencyProperty IsErrorProperty = DependencyProperty.Register(
             "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(
             "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(
             "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(
             "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(
             "ShowEyeButton", typeof(bool), typeof(PasswordBox), new PropertyMetadata(ValueBoxes.FalseBox));
 
+        public bool ShowEyeButton
+        {
+            get => (bool)GetValue(ShowEyeButtonProperty);
+            set => SetValue(ShowEyeButtonProperty, ValueBoxes.BooleanBox(value));
+        }
+
         public static readonly DependencyProperty ShowPasswordProperty = DependencyProperty.Register(
             "ShowPassword", typeof(bool), typeof(PasswordBox),
             new PropertyMetadata(ValueBoxes.FalseBox, OnShowPasswordChanged));
 
-        private SecureString _password;
-
-        private System.Windows.Controls.TextBox _textBox;
-
-        public PasswordBox()
+        public bool ShowPassword
         {
-            CommandBindings.Add(new CommandBinding(ControlCommands.Clear, (s, e) => Clear()));
+            get => (bool)GetValue(ShowPasswordProperty);
+            set => SetValue(ShowPasswordProperty, ValueBoxes.BooleanBox(value));
         }
 
+        public static readonly DependencyProperty MaxLengthProperty =
+            System.Windows.Controls.TextBox.MaxLengthProperty.AddOwner(typeof(PasswordBox));
+
+        public int MaxLength
+        {
+            get => (int)GetValue(MaxLengthProperty);
+            set => SetValue(MaxLengthProperty, value);
+        }
+
+        public static readonly DependencyProperty SelectionBrushProperty =
+            TextBoxBase.SelectionBrushProperty.AddOwner(typeof(PasswordBox));
+
+        public Brush SelectionBrush
+        {
+            get => (Brush)GetValue(SelectionBrushProperty);
+            set => SetValue(SelectionBrushProperty, value);
+        }
+
+#if !(NET40 || NET45 || NET451 || NET452 || NET46 || NET461 || NET462 || NET47 || NET471 || NET472)
+
+        public static readonly DependencyProperty SelectionTextBrushProperty =
+            TextBoxBase.SelectionTextBrushProperty.AddOwner(typeof(PasswordBox));
+
+        public Brush SelectionTextBrush
+        {
+            get => (Brush)GetValue(SelectionTextBrushProperty);
+            set => SetValue(SelectionTextBrushProperty, value);
+        }
+
+#endif
+
+        public static readonly DependencyProperty SelectionOpacityProperty =
+            TextBoxBase.SelectionOpacityProperty.AddOwner(typeof(PasswordBox));
+
+        public double SelectionOpacity
+        {
+            get => (double)GetValue(SelectionOpacityProperty);
+            set => SetValue(SelectionOpacityProperty, value);
+        }
+
+        public static readonly DependencyProperty CaretBrushProperty =
+            TextBoxBase.CaretBrushProperty.AddOwner(typeof(PasswordBox));
+
+        public Brush CaretBrush
+        {
+            get => (Brush)GetValue(CaretBrushProperty);
+            set => SetValue(CaretBrushProperty, value);
+        }
+
+#if !NET40
+
+        public static readonly DependencyProperty IsSelectionActiveProperty =
+            TextBoxBase.IsSelectionActiveProperty.AddOwner(typeof(PasswordBox));
+
+        public bool IsSelectionActive => ActualPasswordBox != null && (bool) ActualPasswordBox.GetValue(IsSelectionActiveProperty);
+
+#endif
+
+        public PasswordBox() => CommandBindings.Add(new CommandBinding(ControlCommands.Clear, (s, e) => Clear()));
+
         public System.Windows.Controls.PasswordBox ActualPasswordBox { get; set; }
 
         [DefaultValue("")]
@@ -86,8 +186,7 @@ namespace HandyControl.Controls
                 if (ActualPasswordBox == null)
                 {
                     _password = new SecureString();
-                    if (value == null)
-                        value = string.Empty;
+                    value ??= string.Empty;
                     foreach (var item in value)
                         _password.AppendChar(item);
 
@@ -101,50 +200,8 @@ namespace HandyControl.Controls
         [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
         public SecureString SecurePassword => ActualPasswordBox?.SecurePassword;
 
-        public char PasswordChar
-        {
-            get => (char) GetValue(PasswordCharProperty);
-            set => SetValue(PasswordCharProperty, value);
-        }
-
-        public bool ShowEyeButton
-        {
-            get => (bool) GetValue(ShowEyeButtonProperty);
-            set => SetValue(ShowEyeButtonProperty, value);
-        }
-
-        public bool ShowPassword
-        {
-            get => (bool) GetValue(ShowPasswordProperty);
-            set => SetValue(ShowPasswordProperty, value);
-        }
-
         public Func<string, OperationResult<bool>> VerifyFunc { get; set; }
 
-        public bool IsError
-        {
-            get => (bool) GetValue(IsErrorProperty);
-            set => SetValue(IsErrorProperty, value);
-        }
-
-        public string ErrorStr
-        {
-            get => (string) GetValue(ErrorStrProperty);
-            set => SetValue(ErrorStrProperty, value);
-        }
-
-        public TextType TextType
-        {
-            get => (TextType) GetValue(TextTypeProperty);
-            set => SetValue(TextTypeProperty, value);
-        }
-
-        public bool ShowClearButton
-        {
-            get => (bool) GetValue(ShowClearButtonProperty);
-            set => SetValue(ShowClearButtonProperty, value);
-        }
-
         public virtual bool VerifyData()
         {
             OperationResult<bool> result;
@@ -174,9 +231,9 @@ namespace HandyControl.Controls
 
         private static void OnShowPasswordChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            var ctl = (PasswordBox) d;
+            var ctl = (PasswordBox)d;
             if (!ctl.ShowEyeButton) return;
-            if ((bool) e.NewValue)
+            if ((bool)e.NewValue)
             {
                 ctl._textBox.Text = ctl.ActualPasswordBox.Password;
                 ctl._textBox.Select(string.IsNullOrEmpty(ctl._textBox.Text) ? 0 : ctl._textBox.Text.Length, 0);
@@ -203,6 +260,13 @@ namespace HandyControl.Controls
             if (ActualPasswordBox != null)
             {
                 ActualPasswordBox.PasswordChanged += PasswordBox_PasswordChanged;
+                ActualPasswordBox.SetBinding(System.Windows.Controls.PasswordBox.MaxLengthProperty, new Binding(MaxLengthProperty.Name) { Source = this });
+                ActualPasswordBox.SetBinding(System.Windows.Controls.PasswordBox.SelectionBrushProperty, new Binding(SelectionBrushProperty.Name) { Source = this });
+#if !(NET40 || NET45 || NET451 || NET452 || NET46 || NET461 || NET462 || NET47 || NET471 || NET472)
+                ActualPasswordBox.SetBinding(System.Windows.Controls.PasswordBox.SelectionTextBrushProperty, new Binding(SelectionTextBrushProperty.Name) { Source = this });
+#endif
+                ActualPasswordBox.SetBinding(System.Windows.Controls.PasswordBox.SelectionOpacityProperty, new Binding(SelectionOpacityProperty.Name) { Source = this });
+                ActualPasswordBox.SetBinding(System.Windows.Controls.PasswordBox.CaretBrushProperty, new Binding(CaretBrushProperty.Name) { Source = this });
 
                 if (_password != null)
                 {

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

@@ -77,7 +77,7 @@ namespace HandyControl.Controls
         public bool IsRealTime
         {
             get => (bool)GetValue(IsRealTimeProperty);
-            set => SetValue(IsRealTimeProperty, value);
+            set => SetValue(IsRealTimeProperty, ValueBoxes.BooleanBox(value));
         }
 
         public static readonly DependencyProperty CommandProperty = DependencyProperty.Register(

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

@@ -8,7 +8,6 @@ using HandyControl.Tools;
 
 namespace HandyControl.Controls
 {
-    /// <inheritdoc cref="IDataInput" />
     public class TextBox : System.Windows.Controls.TextBox, IDataInput
     {
         public TextBox()
@@ -35,8 +34,8 @@ namespace HandyControl.Controls
 
         public bool IsError
         {
-            get => (bool)GetValue(IsErrorProperty);
-            set => SetValue(IsErrorProperty, value);
+            get => (bool) GetValue(IsErrorProperty);
+            set => SetValue(IsErrorProperty, ValueBoxes.BooleanBox(value));
         }
 
         /// <summary>
@@ -71,8 +70,8 @@ namespace HandyControl.Controls
 
         public bool ShowClearButton
         {
-            get => (bool)GetValue(ShowClearButtonProperty);
-            set => SetValue(ShowClearButtonProperty, value);
+            get => (bool) GetValue(ShowClearButtonProperty);
+            set => SetValue(ShowClearButtonProperty, ValueBoxes.BooleanBox(value));
         }
 
         public virtual bool VerifyData()

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

@@ -130,7 +130,7 @@ namespace HandyControl.Controls
         public bool IsDropDownOpen
         {
             get => (bool)GetValue(IsDropDownOpenProperty);
-            set => SetValue(IsDropDownOpenProperty, value);
+            set => SetValue(IsDropDownOpenProperty, ValueBoxes.BooleanBox(value));
         }
 
         public static readonly DependencyProperty IsDropDownOpenProperty =
@@ -262,7 +262,7 @@ namespace HandyControl.Controls
         public bool IsError
         {
             get => (bool)GetValue(IsErrorProperty);
-            set => SetValue(IsErrorProperty, value);
+            set => SetValue(IsErrorProperty, ValueBoxes.BooleanBox(value));
         }
 
         public static readonly DependencyProperty ErrorStrProperty = DependencyProperty.Register(
@@ -289,7 +289,7 @@ namespace HandyControl.Controls
         public bool ShowClearButton
         {
             get => (bool)GetValue(ShowClearButtonProperty);
-            set => SetValue(ShowClearButtonProperty, value);
+            set => SetValue(ShowClearButtonProperty, ValueBoxes.BooleanBox(value));
         }
 
         public static readonly DependencyProperty ClockProperty = DependencyProperty.Register(

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

@@ -2,7 +2,7 @@
 
 namespace HandyControl.Controls
 {
-    internal class WatermarkTextBox : TextBox
+    public class WatermarkTextBox : TextBox
     {
         #region Public Properties