Merge branch 'Master_ELK02_Release_Development' of http://git.jetplasma-oa.com/Jet/FurnaceELK into Master_ELK02_Release_Development

Furnace/FurnaceUI/Dialog/RecipesTableCompareDialogView.xaml

@@ -34,7 +34,7 @@
                 <DataGrid ItemsSource="{Binding Items}"
                           SelectedItem="{Binding SelectedItem}"
                           AutoGenerateColumns="False"
-                         CanUserReorderColumns="False" CanUserAddRows="False"
+                          CanUserReorderColumns="False" CanUserAddRows="False"
                           CanUserSortColumns="False" 
                           IsReadOnly="True" FontSize="14">
                     <DataGrid.ItemsPanel>
@@ -47,19 +47,19 @@
                         <DataGridTemplateColumn Width="60" Header="Index">
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
-                                    <TextBlock Text="{Binding Index}"/>
+                                    <TextBlock Text="{Binding Index}" Foreground="{StaticResource FG_Black}"/>
                                 </DataTemplate>
                             </DataGridTemplateColumn.CellTemplate>
                             <DataGridTemplateColumn.CellStyle>
                                 <Style TargetType="DataGridCell">
-                                    <Setter Property="Background" Value="{Binding Path=Background}" />
+                                    <Setter Property="Background" Value="{Binding Path=Background}"/>
                                 </Style>
                             </DataGridTemplateColumn.CellStyle>
                         </DataGridTemplateColumn>
                         <DataGridTemplateColumn Width="150" Header="Table A">
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
-                                    <TextBlock Text="{Binding ATableName}"/>
+                                    <TextBlock Text="{Binding ATableName}" Foreground="{StaticResource FG_Black}"/>
                                 </DataTemplate>
                             </DataGridTemplateColumn.CellTemplate>
                             <DataGridTemplateColumn.CellStyle>
@@ -71,7 +71,7 @@
                         <DataGridTemplateColumn Width="150"  Header="Table B" >
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
-                                    <TextBlock Text="{Binding BTableName}"/>
+                                    <TextBlock Text="{Binding BTableName}" Foreground="{StaticResource FG_Black}"/>
                                 </DataTemplate>
                             </DataGridTemplateColumn.CellTemplate>
                             <DataGridTemplateColumn.CellStyle>

Furnace/FurnaceUI/Views/Recipes/RecipeProcessEditViewModel.cs

@@ -3048,6 +3048,7 @@ namespace FurnaceUI.Views.Recipes
                     CurrentRecipe.SetDelegateEvent(tempStep);
                     CurrentRecipe.Steps.Add(tempStep);
                 });
+                currentPage = 1;
                 NewSteps = new ObservableCollection<Step>(CurrentRecipe.Steps.Take(pageSize * currentPage).Skip(pageSize * (currentPage - 1)));
                 SelectStep(CurrentRecipe.Steps.FirstOrDefault());
             }

Furnace/FurnaceUI/Views/Recipes/RecipesCompareTwoViewModel.cs

@@ -1113,7 +1113,7 @@ namespace FurnaceUI.Views.Recipes
                 else
                 {
                     int bIndex = 0;
-                    int oldIndex = 0;
+                    int oldIndex = -1;
                     foreach (var item in StepListA)
                     {
                         var tempB = StepListB.FirstOrDefault(x => x.StepName == item.StepName);