修复 风环,IBC,称重,单组称重,收卷 状态栏 报警时，由于报警内容的变化，导致布局变化

Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Client/UiModule/DynAreaAirRing.xaml

@@ -6,7 +6,7 @@
       xmlns:local="clr-namespace:FLY.FeedbackRenZiJia.UI.Client.UiModule"
       xmlns:client="clr-namespace:FLY.FeedbackRenZiJia.UI.Client"
       mc:Ignorable="d" 
-      d:DesignWidth="292">
+      d:DesignWidth="250">
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -20,7 +20,7 @@
         </ResourceDictionary>
 
     </UserControl.Resources>
-    <Grid>
+    <Grid Height="110">
         <Button x:Name="grid_viewModel" Style="{StaticResource ButtonStyle_empty}" Command="{Binding OpenRecordCmd}"
                 d:DataContext="{StaticResource airRingVmUt}">
             <Grid >
@@ -143,7 +143,7 @@
                 Visibility="{Binding IsError,Converter={StaticResource visbilityconv}}"
                 d:DataContext="{StaticResource errorVmUt}"
                 >
-            <Border Style="{StaticResource BorderStyle_module}" Background="Red"  >
+            <Border Style="{StaticResource BorderStyle_module}" Background="{StaticResource Brushes.Validation}"  >
                 <Grid >
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="auto"/>
@@ -167,10 +167,7 @@
                             </Style>
                         </Path.Style>
                     </Path>
-                    <Viewbox Grid.Column="1" MaxHeight="80" Margin="5" >
-                        <TextBlock  VerticalAlignment="Center" TextWrapping="Wrap" Foreground="White" Text="{Binding Error}" MaxWidth="71"/>
-                    </Viewbox>
-
+                    <TextBlock Grid.Column="1" Margin="5" VerticalAlignment="Center" TextWrapping="Wrap" FontSize="22" Foreground="White" Text="{Binding Error}"/>
                 </Grid>
 
             </Border>

Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Client/UiModule/DynAreaAirRing2.xaml

@@ -20,7 +20,7 @@
 
     </UserControl.Resources>
     <Button Style="{StaticResource ButtonStyle_empty}" Background="Transparent" Click="Button_Click">
-        <Grid>
+        <Grid Height="110">
             <Grid x:Name="grid_heatbuf"/>
             <Grid x:Name="grid_feedback"/>
             <Grid x:Name="grid_error" d:DataContext="{StaticResource unitests_props}"/>
@@ -93,7 +93,7 @@
                 </Grid>
 
             </Border>
-            <Border Style="{StaticResource BorderStyle_module}" Background="Red" 
+            <Border Style="{StaticResource BorderStyle_module}" Background="{StaticResource Brushes.Validation}" 
                     DataContext="{Binding DataContext,ElementName=grid_error}"
                     Visibility="{Binding IsError,Converter={StaticResource visbilityconv}}">
                 <Grid >
@@ -119,7 +119,7 @@
                             </Style>
                         </Path.Style>
                     </Path>
-                    <TextBlock Grid.Column="1" Margin="5" VerticalAlignment="Center" TextWrapping="Wrap" FontSize="30" Foreground="White" Text="{Binding Error}"/>
+                    <TextBlock Grid.Column="1" Margin="5" VerticalAlignment="Center" TextWrapping="Wrap" FontSize="22" Foreground="White" Text="{Binding Error}"/>
                 </Grid>
 
             </Border>

Project.FLY.IBC/FLY.IBC.UI.Client/UiModule/DynAreaIbc.xaml

@@ -5,7 +5,7 @@
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
       xmlns:local="clr-namespace:FLY.IBC.UI.Client.UiModule"
       mc:Ignorable="d" 
-      d:DesignWidth="292">
+      d:DesignWidth="250">
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -31,14 +31,18 @@
     </UserControl.Resources>
     
     <Button Style="{StaticResource ButtonStyle_empty}" Background="Transparent" Click="Button_Click">
-        <Grid>
+        <Grid Height="125">
             <Grid x:Name="grid_ibc" d:DataContext="{StaticResource unitests_ibc}"/>
             <Grid x:Name="grid_error" d:DataContext="{StaticResource unitests_props}"/>
 
             <Border Style="{StaticResource BorderStyle_module}" 
                     DataContext="{Binding DataContext,ElementName=grid_ibc}"
                     Background="{StaticResource Color_background}">
-                <StackPanel Orientation="Vertical" >
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition/>
+                        <RowDefinition Height="auto"/>
+                    </Grid.RowDefinitions>
                     <Grid >
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="auto"/>
@@ -57,7 +61,7 @@
                         </Viewbox>
 
                     </Grid>
-                    <Grid Margin="2">
+                    <Grid Grid.Row="1" Margin="2">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition/>
                             <ColumnDefinition />
@@ -99,10 +103,10 @@
                             </StackPanel.Style>
                         </StackPanel>
                     </Grid>
-                </StackPanel>
+                </Grid>
             </Border>
 
-            <Border Style="{StaticResource BorderStyle_module}" Background="Red" 
+            <Border Style="{StaticResource BorderStyle_module}" Background="{StaticResource Brushes.Validation}" 
                     DataContext="{Binding DataContext,ElementName=grid_error}"
                     Visibility="{Binding IsError,Converter={StaticResource visbilityconv}}">
                 <Grid >
@@ -128,7 +132,7 @@
                             </Style>
                         </Path.Style>
                     </Path>
-                    <TextBlock Grid.Column="1" Margin="5" VerticalAlignment="Center" TextWrapping="Wrap" FontSize="30" Foreground="White" Text="{Binding Error}"/>
+                    <TextBlock Grid.Column="1" Margin="5" VerticalAlignment="Center" TextWrapping="Wrap" FontSize="22" Foreground="White" Text="{Binding Error}"/>
                 </Grid>
 
             </Border>

Project.FLY.Weight/FLY.Weight.UI.Client/UiModule/V3/DynAreaWeight.xaml

@@ -6,7 +6,7 @@
       xmlns:local="clr-namespace:FLY.Weight.UI.Client.UiModule"
       xmlns:control="clr-namespace:FLY.Weight.UI.Client.Control"
       mc:Ignorable="d" 
-      d:DesignWidth="292" >
+      d:DesignWidth="250" >
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -27,7 +27,7 @@
 
     </UserControl.Resources>
     <Button Style="{StaticResource ButtonStyle_empty}" Background="Transparent" Click="Button_Click">
-        <Grid>
+        <Grid Height="150">
             <Grid x:Name="grid_weighter" d:DataContext="{StaticResource unittests_weighters}"/>
             <Grid x:Name="grid_error" d:DataContext="{StaticResource unitests_props}"/>
 
@@ -88,7 +88,7 @@
                     </Grid>
                 </StackPanel>
             </Border>
-            <Border Style="{StaticResource BorderStyle_module}" Background="Red" 
+            <Border Style="{StaticResource BorderStyle_module}" Background="{StaticResource Brushes.Validation}" 
                     DataContext="{Binding DataContext,ElementName=grid_error}"
                     Visibility="{Binding IsError,Converter={StaticResource visbilityconv}}">
                 <Grid >
@@ -114,7 +114,7 @@
                             </Style>
                         </Path.Style>
                     </Path>
-                    <TextBlock Grid.Column="1" Margin="5" VerticalAlignment="Center" TextWrapping="Wrap" FontSize="30" Foreground="White" Text="{Binding Error}"/>
+                    <TextBlock Grid.Column="1" Margin="5" VerticalAlignment="Center" TextWrapping="Wrap" FontSize="22" Foreground="White" Text="{Binding Error}"/>
                 </Grid>
 
             </Border>

Project.FLY.Weight/FLY.Weight.UI.Client/UiModule/V4/DynAreaWeightV4.xaml

@@ -27,7 +27,7 @@
 
     </UserControl.Resources>
     <Button Style="{StaticResource ButtonStyle_empty}" Background="Transparent" Click="Button_Click">
-        <Grid>
+        <Grid Height="120">
             <Grid x:Name="grid_weighter" d:DataContext="{StaticResource unittests_weighters}"/>
             <Grid x:Name="grid_error" d:DataContext="{StaticResource unitests_props}"/>
 
@@ -68,7 +68,7 @@
                     </Grid>
                 </StackPanel>
             </Border>
-            <Border Style="{StaticResource BorderStyle_module}" Background="Red" 
+            <Border Style="{StaticResource BorderStyle_module}" Background="{StaticResource Brushes.Validation}" 
                     DataContext="{Binding DataContext,ElementName=grid_error}"
                     Visibility="{Binding IsError,Converter={StaticResource visbilityconv}}">
                 <Grid >
@@ -94,7 +94,7 @@
                             </Style>
                         </Path.Style>
                     </Path>
-                    <TextBlock Grid.Column="1" Margin="5" VerticalAlignment="Center" TextWrapping="Wrap" FontSize="30" Foreground="White" Text="{Binding Error}"/>
+                    <TextBlock Grid.Column="1" Margin="5" VerticalAlignment="Center" TextWrapping="Wrap" FontSize="22" Foreground="White" Text="{Binding Error}"/>
                 </Grid>
 
             </Border>

Project.FLY.Weight/FLY.Weight.UI.Client/UiModule/V5/DynAreaWeightV5.xaml

@@ -27,7 +27,7 @@
 
     </UserControl.Resources>
     <Button Style="{StaticResource ButtonStyle_empty}" Background="Transparent" Click="Button_Click">
-        <Grid>
+        <Grid Height="150" >
             <Grid x:Name="grid_weighter" d:DataContext="{StaticResource unittests_weighters}"/>
             <Grid x:Name="grid_error" d:DataContext="{StaticResource unitests_props}"/>
 
@@ -81,7 +81,7 @@
                     </Grid>
                 </StackPanel>
             </Border>
-            <Border Style="{StaticResource BorderStyle_module}" Background="Red" 
+            <Border Style="{StaticResource BorderStyle_module}" Background="{StaticResource Brushes.Validation}" 
                     DataContext="{Binding DataContext,ElementName=grid_error}"
                     Visibility="{Binding IsError,Converter={StaticResource visbilityconv}}">
                 <Grid >
@@ -107,7 +107,7 @@
                             </Style>
                         </Path.Style>
                     </Path>
-                    <TextBlock Grid.Column="1" Margin="5" VerticalAlignment="Center" TextWrapping="Wrap" FontSize="30" Foreground="White" Text="{Binding Error}"/>
+                    <TextBlock Grid.Column="1" Margin="5" VerticalAlignment="Center" TextWrapping="Wrap" FontSize="22" Foreground="White" Text="{Binding Error}"/>
                 </Grid>
 
             </Border>

Project.FLY.Weight2/FLY.Weight2.UI.Client/UiModule/DynAreaWeight.xaml

@@ -6,7 +6,7 @@
       xmlns:local="clr-namespace:FLY.Weight2.UI.Client.UiModule"
       xmlns:flyctrl="clr-namespace:FLY.ControlLibrary;assembly=FLY.ControlLibrary"
       mc:Ignorable="d" 
-      d:DesignWidth="292" >
+      d:DesignWidth="250" >
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -26,7 +26,7 @@
 
     </UserControl.Resources>
     <Button Style="{StaticResource ButtonStyle_empty}" Click="Button_Click">
-        <Grid>
+        <Grid Height="150">
             <Grid x:Name="grid_weighter" d:DataContext="{StaticResource unittests_weighters}"/>
             <Grid x:Name="grid_error" d:DataContext="{StaticResource unitests_props}"/>
 
@@ -81,7 +81,7 @@
                     </Grid>
                 </StackPanel>
             </Border>
-            <Border Style="{StaticResource BorderStyle_module}" Background="Red" 
+            <Border Style="{StaticResource BorderStyle_module}" Background="{StaticResource Brushes.Validation}" 
                     DataContext="{Binding DataContext,ElementName=grid_error}"
                     Visibility="{Binding IsError,Converter={StaticResource visbilityconv}}">
                 <Grid >
@@ -107,7 +107,7 @@
                             </Style>
                         </Path.Style>
                     </Path>
-                    <TextBlock Grid.Column="1" Margin="5" VerticalAlignment="Center" TextWrapping="Wrap" FontSize="30" Foreground="White" Text="{Binding Error}"/>
+                    <TextBlock Grid.Column="1" Margin="5" VerticalAlignment="Center" TextWrapping="Wrap" FontSize="22" Foreground="White" Text="{Binding Error}"/>
                 </Grid>
 
             </Border>

Project.FLY.Winder_20190413/FLY.Winder.UI.Client/UiModule/DynAreaWinder.xaml

@@ -7,7 +7,7 @@
       xmlns:conv="clr-namespace:FLY.Winder.UI.Client.Converter"
       xmlns:sys="clr-namespace:System;assembly=mscorlib"  
       mc:Ignorable="d" 
-      d:DesignWidth="292">
+      d:DesignWidth="250">
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -37,7 +37,7 @@
     </UserControl.Resources>
     
     <Button Style="{StaticResource ButtonStyle_empty}" Background="Transparent" Click="Button_Click">
-        <Grid>
+        <Grid Height="120">
             <Grid x:Name="grid_winder" d:DataContext="{StaticResource unittests_windersystem}"/>
             <Grid x:Name="grid_error" d:DataContext="{StaticResource unitests_props}"/>
 
@@ -113,7 +113,7 @@
                 </StackPanel>
             </Border>
 
-            <Border Style="{StaticResource BorderStyle_module}" Background="Red" 
+            <Border Style="{StaticResource BorderStyle_module}" Background="{StaticResource Brushes.Validation}" 
                     DataContext="{Binding DataContext,ElementName=grid_error}"
                     Visibility="{Binding IsError,Converter={StaticResource visbilityconv}}">
                 <Grid >
@@ -139,7 +139,7 @@
                             </Style>
                         </Path.Style>
                     </Path>
-                    <TextBlock Grid.Column="1" Margin="5" VerticalAlignment="Center" TextWrapping="Wrap" FontSize="30" Foreground="White" Text="{Binding Error}"/>
+                    <TextBlock Grid.Column="1" Margin="5" VerticalAlignment="Center" TextWrapping="Wrap" FontSize="22" Foreground="White" Text="{Binding Error}"/>
                 </Grid>
 
             </Border>