From f28fa3ad84e67a12d4ba77a7cf4a5adcbe77efe0 Mon Sep 17 00:00:00 2001
From: GF-Huang <GF-Huang@users.noreply.github.com>
Date: Mon, 23 Nov 2020 21:35:14 +0800
Subject: [PATCH] Add "StringFormat" property for NumericUpDown control.

---
 .../Controls/NumericUpDownDemoCtl.xaml        |  6 ++++
 .../Controls/Input/NumericUpDown.cs           | 33 +++++++++++++++++--
 2 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NumericUpDownDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NumericUpDownDemoCtl.xaml
index ccebf3aa..433afce9 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NumericUpDownDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NumericUpDownDemoCtl.xaml
@@ -16,6 +16,12 @@
                 <hc:NumericUpDown hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" hc:InfoElement.Necessary="True" Style="{StaticResource NumericUpDownExtend}"/>
                 <hc:NumericUpDown Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource NumericUpDownExtend}" Margin="0,32,0,0"/>
                 <hc:NumericUpDown Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource NumericUpDownExtend}" hc:InfoElement.Necessary="True" Margin="0,32,0,0"/>
+                <hc:NumericUpDown Margin="0,32,0,0" 
+                                  hc:InfoElement.TitlePlacement="Left"
+                                  hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}"
+                                  Style="{StaticResource NumericUpDownExtend}"
+                                  Value="1024"
+                                  StringFormat="N2" />
             </StackPanel>
             <StackPanel Margin="32,0,0,0">
                 <hc:NumericUpDown Name="NumericUpDownCustomVerify" ShowClearButton="True" Style="{StaticResource NumericUpDownPlus}"/>
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs b/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs
index 28dbba39..d2e4dbd4 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs
@@ -153,9 +153,21 @@ namespace HandyControl.Controls
             }
         }
 
-        private string CurrentText => DecimalPlaces.HasValue
-            ? Value.ToString($"#0.{new string('0', DecimalPlaces.Value)}")
-            : Value.ToString("#0");
+        private string CurrentText
+        {
+            get
+            {
+                if (string.IsNullOrWhiteSpace(StringFormat))
+                {
+                    return DecimalPlaces.HasValue ? Value.ToString($"#0.{new string('0', DecimalPlaces.Value)}") : 
+                                                    Value.ToString("#0");
+                }
+                else
+                {
+                    return Value.ToString(StringFormat);
+                }
+            }
+        }
 
         protected virtual void OnValueChanged(FunctionEventArgs<double> e) => RaiseEvent(e);
 
@@ -318,6 +330,21 @@ namespace HandyControl.Controls
             set => SetValue(DecimalPlacesProperty, value);
         }
 
+        /// <summary>
+        ///     指示要显示的数字的格式
+        /// </summary>
+        public static readonly DependencyProperty StringFormatProperty =
+            DependencyProperty.Register("StringFormat", typeof(string), typeof(NumericUpDown), new PropertyMetadata(default(string)));
+
+        /// <summary>
+        ///     指示要显示的数字的格式，这将会覆盖 <see cref="DecimalPlaces"/> 属性
+        /// </summary>
+        public string StringFormat
+        {
+            get { return (string)GetValue(StringFormatProperty); }
+            set { SetValue(StringFormatProperty, value); }
+        }
+
         /// <summary>
         ///     是否显示上下调值按钮
         /// </summary>