Merge branch 'master' of https://github.com/HandyOrg/HandyControl

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

@@ -153,9 +153,11 @@ namespace HandyControl.Controls
             }
         }
 
-        private string CurrentText => DecimalPlaces.HasValue
-            ? Value.ToString($"#0.{new string('0', DecimalPlaces.Value)}")
-            : Value.ToString("#0");
+        private string CurrentText => string.IsNullOrWhiteSpace(ValueFormat)
+            ? DecimalPlaces.HasValue
+                ? Value.ToString($"#0.{new string('0', DecimalPlaces.Value)}")
+                : Value.ToString("#0")
+            : Value.ToString(ValueFormat);
 
         protected virtual void OnValueChanged(FunctionEventArgs<double> e) => RaiseEvent(e);
 
@@ -318,6 +320,21 @@ namespace HandyControl.Controls
             set => SetValue(DecimalPlacesProperty, value);
         }
 
+        /// <summary>
+        ///     指示要显示的数字的格式
+        /// </summary>
+        public static readonly DependencyProperty ValueFormatProperty = DependencyProperty.Register(
+            "ValueFormat", typeof(string), typeof(NumericUpDown), new PropertyMetadata(default(string)));
+
+        /// <summary>
+        ///     指示要显示的数字的格式，这将会覆盖 <see cref="DecimalPlaces"/> 属性
+        /// </summary>
+        public string ValueFormat
+        {
+            get => (string) GetValue(ValueFormatProperty);
+            set => SetValue(ValueFormatProperty, value);
+        }
+
         /// <summary>
         ///     是否显示上下调值按钮
         /// </summary>

src/Shared/HandyControl_Shared/Themes/Styles/Base/TreeViewBaseStyle.xaml

@@ -53,10 +53,10 @@
                             <RowDefinition/>
                         </Grid.RowDefinitions>
                         <Border x:Name="Bd" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
-                            <StackPanel Orientation="Horizontal" Margin="{Binding Converter={StaticResource TreeViewItemMarginConverter}, RelativeSource={RelativeSource TemplatedParent}}">
+                            <DockPanel LastChildFill="True" Margin="{Binding Converter={StaticResource TreeViewItemMarginConverter}, RelativeSource={RelativeSource TemplatedParent}}">
                                 <ToggleButton x:Name="Expander" ClickMode="Press" IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ExpandCollapseToggleStyle}"/>
                                 <ContentPresenter VerticalAlignment="Center" x:Name="PART_Header" ContentSource="Header" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                            </StackPanel>
+                            </DockPanel>
                         </Border>
                         <ItemsPresenter x:Name="ItemsHost" Grid.Row="1"/>
                     </Grid>