Browse Source

1.bug506:recipe compare字体调一致18号,数据垂直方向居中
2.修复带table的步次太多导致save按钮不显示问题

huangping 1 month ago
parent
commit
627a8acff0

+ 1 - 1
Furnace/FurnaceUI/Views/Recipes/RecipeTableSelectDialogView.xaml

@@ -74,7 +74,7 @@
                         <TextBox Text="{Binding SelectedTable.EndStatus, UpdateSourceTrigger=PropertyChanged}" Width="265"/>
                     </StackPanel>
 
-                    <ListView Margin="1" ItemsSource="{Binding SelectedTable.TableData.Steps}">
+                    <ListView Margin="1" ItemsSource="{Binding SelectedTable.TableData.Steps}" MaxHeight="680">
                         
                         <ListView.View>
                             <GridView>

+ 8 - 8
Furnace/FurnaceUI/Views/Recipes/RecipesCompareTwoView.xaml

@@ -419,6 +419,7 @@
                         FontFamily="Segoe"
                         FontSize="18"
                         IsReadOnly="True"
+                        RowHeight="40"
                         ItemsSource="{Binding StepList, Mode=OneWay}"
                         SelectedItem="{Binding StepSelection}"
                         SelectionMode="Single"
@@ -446,10 +447,9 @@
                                 <DataGridTemplateColumn.CellTemplate>
                                     <DataTemplate>
                                         <TextBlock
-                                            Height="40"
-                                            Margin="5,0"
+                                                   Margin="5,0"
                                             HorizontalAlignment="Left"
-                                            VerticalAlignment="Center"
+                                            VerticalAlignment="Center"                                     
                                             FontSize="18"
                                             Foreground="{DynamicResource FG_Black}"
                                             Text="{Binding AStepNumber}"
@@ -472,7 +472,7 @@
                                         <TextBlock
                                             Margin="5,0"
                                             HorizontalAlignment="Left"
-                                            VerticalAlignment="Center"
+                                            VerticalAlignment="Center"                                       
                                             FontSize="18"
                                             Foreground="{DynamicResource FG_Black}"
                                             Text="{Binding AStepName}"
@@ -521,7 +521,7 @@
                                             Margin="5,0"
                                             HorizontalAlignment="Left"
                                             VerticalAlignment="Center"
-                                            FontSize="14"
+                                            FontSize="18"
                                             Foreground="{DynamicResource FG_Black}"
                                             Text="{Binding BStepName}"
                                             ToolTip="{Binding RelativeSource={RelativeSource Self}, Path=Text}"/>
@@ -621,6 +621,7 @@
                         FontFamily="Segoe"
                         FontSize="18"
                         IsReadOnly="True"
+                        RowHeight="40"
                         ItemsSource="{Binding ParamList, Mode=OneWay}"
                         SelectedItem="{Binding ParamSelection}"
                         SelectionMode="Single"
@@ -648,8 +649,7 @@
                                 IsReadOnly="True">
                                 <DataGridTemplateColumn.CellTemplate>
                                     <DataTemplate>
-                                        <TextBlock
-                                            Height="40"
+                                        <TextBlock           
                                             Margin="5,0"
                                             HorizontalAlignment="Left"
                                             VerticalAlignment="Center"
@@ -699,7 +699,7 @@
                                             Margin="5,0"
                                             HorizontalAlignment="Left"
                                             VerticalAlignment="Center"
-                                            FontSize="14"
+                                            FontSize="18"
                                             Foreground="{DynamicResource FG_Black}"
                                             Text="{Binding BParamValue}"
                                             ToolTip="{Binding RelativeSource={RelativeSource Self}, Path=Text}"/>