|
@@ -895,6 +895,12 @@ namespace FurnaceUI.Views.Recipes
|
|
|
{
|
|
|
IndexNoDefault = NewSteps.Count - 1;
|
|
|
}
|
|
|
+ SelectedRecipeStep = NewSteps.FirstOrDefault(a => a.StepNo == currentIndex);
|
|
|
+ if (SelectedRecipeStep!=null)
|
|
|
+ {
|
|
|
+ SelectedRecipeStep.IsChecked = true;
|
|
|
+
|
|
|
+ }
|
|
|
}
|
|
|
else//向下翻
|
|
|
{
|
|
@@ -905,6 +911,13 @@ namespace FurnaceUI.Views.Recipes
|
|
|
currentPage = currentPage + 1;
|
|
|
NewSteps = new ObservableCollection<Step>(CurrentRecipe.Steps.Take(pageSize * currentPage).Skip(pageSize * (currentPage - 1)));
|
|
|
IndexNoDefault = 0;
|
|
|
+ SelectedRecipeStep = NewSteps.FirstOrDefault(a => a.StepNo == currentIndex);
|
|
|
+ SelectedRecipeStep = NewSteps.FirstOrDefault(a => a.StepNo == currentIndex);
|
|
|
+ if (SelectedRecipeStep != null)
|
|
|
+ {
|
|
|
+ SelectedRecipeStep.IsChecked = true;
|
|
|
+
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -1512,8 +1525,12 @@ namespace FurnaceUI.Views.Recipes
|
|
|
{
|
|
|
var tempStep = CurrentRecipe.Steps.Where(x => x.StepNo == SelectedRecipeStep.StepNo).FirstOrDefault();
|
|
|
CurrentRecipe.ShallowCopyStep(ref tempStep, recipeStepSelectDialogViewModel.SelectedStep);
|
|
|
- CurrentRecipe.SetDelegateEvent(tempStep);
|
|
|
selectStep = SelectedRecipeStep;
|
|
|
+ if (selectStep != null && selectStep.StepNo >= 0)
|
|
|
+ {
|
|
|
+ SelectStep(selectStep);
|
|
|
+
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|