优化 缩小Styles.Text 的 FontSize

Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/TextStyle2.xaml

@@ -4,12 +4,19 @@
                     xmlns:osk="clr-namespace:FLY.ControlLibrary.UI.OSK;assembly=FLY.ControlLibrary"
                     xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
                     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+                    xmlns:sys="clr-namespace:System;assembly=mscorlib"
                     mc:Ignorable="d"
+                    
                     >
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/BaseStyle.xaml"/>
     </ResourceDictionary.MergedDictionaries>
-
+    <sys:Double x:Key="FontSize.FieldHeader">18</sys:Double>
+    <sys:Double x:Key="FontSize.FieldHeader.Small">12</sys:Double>
+    <sys:Double x:Key="FontSize.FieldContent">30</sys:Double>
+    <sys:Double x:Key="FontSize.FieldContent.Small">18</sys:Double>
+    <sys:Double x:Key="FontSize.FieldContent.Middle">24</sys:Double>
+    <Thickness x:Key="Margin.Text">3</Thickness>
     
     <!-- 输入框 带虚拟键盘 -->
     <Style TargetType="TextBox" x:Key="Styles.Text.Input">
@@ -36,17 +43,17 @@
     </Style>
     <!-- 只读项 的标题 -->
     <Style TargetType="TextBlock" x:Key="Styles.Text.FieldHeader">
-        <Setter Property="Margin"  Value="3" />
+        <Setter Property="Margin"  Value="{StaticResource Margin.Text}" />
         <Setter Property="Foreground"  Value="#FF3B3B3B" />
         <Setter Property="FontWeight"  Value="Bold" />
-        <Setter Property="FontSize"  Value="22" />
+        <Setter Property="FontSize"  Value="{StaticResource FontSize.FieldHeader}" />
         <Setter Property="FontFamily"  Value="YouYuan" />
         <Setter Property="TextAlignment"  Value="Left" />
     </Style>
     
     <!-- 只读项 的标题 2行 -->
     <Style TargetType="TextBlock" x:Key="Styles.Text.FieldHeader.Row2" BasedOn="{StaticResource Styles.Text.FieldHeader}">
-        <Setter Property="FontSize"  Value="15" />
+        <Setter Property="FontSize"  Value="{StaticResource FontSize.FieldHeader.Small}" />
     </Style>
     
     <!-- 可写项 的标题 -->
@@ -56,25 +63,25 @@
 
     <!-- 可写项 的标题 2行 -->
     <Style TargetType="TextBlock" x:Key="Styles.Text.FieldHeader.Editable.Row2" BasedOn="{StaticResource Styles.Text.FieldHeader.Editable}">
-        <Setter Property="FontSize"  Value="15" />
+        <Setter Property="FontSize"  Value="{StaticResource FontSize.FieldHeader.Small}" />
     </Style>
 
     <!-- 只读项 内容 -->
     <Style TargetType="TextBlock" x:Key="Styles.Text.FieldContent">
-        <Setter Property="Margin"  Value="3" />
+        <Setter Property="Margin"  Value="{StaticResource Margin.Text}" />
         <Setter Property="Foreground"  Value="#FF3B3B3B" />
         <Setter Property="FontWeight"  Value="Bold" />
-        <Setter Property="FontSize"  Value="36" />
+        <Setter Property="FontSize"  Value="{StaticResource FontSize.FieldContent}" />
         <Setter Property="FontFamily"  Value="Arial" />
         <Setter Property="TextAlignment"  Value="Left" />
     </Style>
 
     <!-- 输入框 内容 -->
     <Style TargetType="TextBox" x:Key="Styles.Text.FieldContent.Input" BasedOn="{StaticResource Styles.Text.Input}">
-        <Setter Property="Margin"  Value="3" />
+        <Setter Property="Margin"  Value="{StaticResource Margin.Text}" />
         <Setter Property="Foreground"  Value="#FF3B3B3B" />
         <Setter Property="FontWeight"  Value="Bold" />
-        <Setter Property="FontSize"  Value="36" />
+        <Setter Property="FontSize"  Value="{StaticResource FontSize.FieldContent}" />
         <Setter Property="FontFamily"  Value="Arial" />
         <Setter Property="TextAlignment"  Value="Left" />
         <Setter Property="MinWidth"  Value="30" />
@@ -86,7 +93,7 @@
     <!-- 内容的分割线 -->
     <Style TargetType="TextBlock" x:Key="Styles.Text.FieldContent.Separator">
         <Setter Property="Foreground"  Value="#FF888888" />
-        <Setter Property="FontSize"  Value="36" />
+        <Setter Property="FontSize"  Value="{StaticResource FontSize.FieldContent}" />
         <Setter Property="FontFamily"  Value="Arial" />
         <Setter Property="TextAlignment"  Value="Left" />
         <Setter Property="VerticalAlignment"  Value="Bottom" />
@@ -96,7 +103,7 @@
     <!-- 内容的单位 -->
     <Style TargetType="TextBlock" x:Key="Styles.Text.FieldContent.Unit">
         <Setter Property="Foreground"  Value="#FF888888" />
-        <Setter Property="FontSize"  Value="22" />
+        <Setter Property="FontSize"  Value="{StaticResource FontSize.FieldContent.Small}" />
         <Setter Property="FontFamily"  Value="Arial" />
         <Setter Property="TextAlignment"  Value="Left" />
         <Setter Property="VerticalAlignment"  Value="Bottom" />