merged pr

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

@@ -68,5 +68,17 @@ namespace HandyControl.Controls
 
         public static double GetMaxContentHeight(DependencyObject element)
             => (double) element.GetValue(MaxContentHeightProperty);
+
+        /// <summary>
+        ///     正则表达式
+        /// </summary>
+        public static readonly DependencyProperty RegexPatternProperty = DependencyProperty.RegisterAttached(
+            "RegexPattern", typeof(string), typeof(InfoElement), new PropertyMetadata(default(string)));
+
+        public static void SetRegexPattern(DependencyObject element, string value)
+            => element.SetValue(RegexPatternProperty, value);
+
+        public static string GetRegexPattern(DependencyObject element)
+            => (string) element.GetValue(RegexPatternProperty);
     }
 }

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

@@ -1,5 +1,4 @@
 using System;
-using System.Text.RegularExpressions;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
@@ -36,7 +35,7 @@ namespace HandyControl.Controls
 
         public bool IsError
         {
-            get => (bool) GetValue(IsErrorProperty);
+            get => (bool)GetValue(IsErrorProperty);
             set => SetValue(IsErrorProperty, value);
         }
 
@@ -48,7 +47,7 @@ namespace HandyControl.Controls
 
         public string ErrorStr
         {
-            get => (string) GetValue(ErrorStrProperty);
+            get => (string)GetValue(ErrorStrProperty);
             set => SetValue(ErrorStrProperty, value);
         }
 
@@ -60,7 +59,7 @@ namespace HandyControl.Controls
 
         public TextType TextType
         {
-            get => (TextType) GetValue(TextTypeProperty);
+            get => (TextType)GetValue(TextTypeProperty);
             set => SetValue(TextTypeProperty, value);
         }
 
@@ -72,20 +71,10 @@ namespace HandyControl.Controls
 
         public bool ShowClearButton
         {
-            get => (bool) GetValue(ShowClearButtonProperty);
+            get => (bool)GetValue(ShowClearButtonProperty);
             set => SetValue(ShowClearButtonProperty, value);
         }
 
-        public static readonly DependencyProperty TextTypeCustomRegexPatternProperty = DependencyProperty.Register(
-            "TextTypeCustomRegexPattern", typeof(string), typeof(TextBox), new PropertyMetadata(null));
-
-        public string TextTypeCustomRegexPattern
-        {
-            get => (string)GetValue(TextTypeCustomRegexPatternProperty);
-            set => SetValue(TextTypeCustomRegexPatternProperty, value);
-        }
-
-
         public virtual bool VerifyData()
         {
             OperationResult<bool> result;
@@ -100,10 +89,14 @@ namespace HandyControl.Controls
                 {
                     if (TextType != TextType.Common)
                     {
-                        if (TextType == TextType.Custom && !string.IsNullOrEmpty(TextTypeCustomRegexPattern))
-                            result = Regex.IsMatch(Text, TextTypeCustomRegexPattern) ? OperationResult.Success() : OperationResult.Failed(Properties.Langs.Lang.FormatError);
-                        else
-                            result = Text.IsKindOf(TextType) ? OperationResult.Success() : OperationResult.Failed(Properties.Langs.Lang.FormatError);
+                        var regexPattern = InfoElement.GetRegexPattern(this);
+                        result = string.IsNullOrEmpty(regexPattern)
+                            ? Text.IsKindOf(TextType)
+                                ? OperationResult.Success()
+                                : OperationResult.Failed(Properties.Langs.Lang.FormatError)
+                            : Text.IsKindOf(regexPattern)
+                                ? OperationResult.Success()
+                                : OperationResult.Failed(Properties.Langs.Lang.FormatError);
                     }
                     else
                     {