diff --git a/MECF.Framework.UI.Client/CenterViews/Editors/Recipe/RecipeCompareView.xaml b/MECF.Framework.UI.Client/CenterViews/Editors/Recipe/RecipeCompareView.xaml index 7bf839d..0b6f9c5 100644 --- a/MECF.Framework.UI.Client/CenterViews/Editors/Recipe/RecipeCompareView.xaml +++ b/MECF.Framework.UI.Client/CenterViews/Editors/Recipe/RecipeCompareView.xaml @@ -90,22 +90,31 @@ - + - + + + + + + Background="#FF9FBEDE"> @@ -154,21 +163,30 @@ Grid.Row="1" Width="330" HorizontalAlignment="Left"> - - + + + + + PreserveNewest + + + + diff --git a/MECF.Framework.UI.Client/RecipeEditorLib/RecipeModel/Params/Base/IParam.cs b/MECF.Framework.UI.Client/RecipeEditorLib/RecipeModel/Params/Base/IParam.cs index 53ecf88..7528ce1 100644 --- a/MECF.Framework.UI.Client/RecipeEditorLib/RecipeModel/Params/Base/IParam.cs +++ b/MECF.Framework.UI.Client/RecipeEditorLib/RecipeModel/Params/Base/IParam.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using System.Windows.Media; using ExtendedGrid.Microsoft.Windows.Controls; using MECF.Framework.UI.Client.ClientBase; @@ -117,6 +118,12 @@ namespace MECF.Framework.UI.Client.RecipeEditorLib.RecipeModel.Params /// void Save(); + /// + /// 设置单元格背景色 + /// + /// + void SetBackground(Color brush); + /// /// 高亮显示当前参数。 /// diff --git a/MECF.Framework.UI.Client/Resources/Images/menu1.png b/MECF.Framework.UI.Client/Resources/Images/menu1.png new file mode 100644 index 0000000..7f6fd0d Binary files /dev/null and b/MECF.Framework.UI.Client/Resources/Images/menu1.png differ diff --git a/MECF.Framework.UI.Client/Resources/Images/menu2.png b/MECF.Framework.UI.Client/Resources/Images/menu2.png new file mode 100644 index 0000000..ae6cae5 Binary files /dev/null and b/MECF.Framework.UI.Client/Resources/Images/menu2.png differ diff --git a/MECF.Framework.UI.Client/Resources/Images/return1.png b/MECF.Framework.UI.Client/Resources/Images/return1.png new file mode 100644 index 0000000..a5b3020 Binary files /dev/null and b/MECF.Framework.UI.Client/Resources/Images/return1.png differ diff --git a/MECF.Framework.UI.Client/Resources/Images/return2.png b/MECF.Framework.UI.Client/Resources/Images/return2.png new file mode 100644 index 0000000..622a550 Binary files /dev/null and b/MECF.Framework.UI.Client/Resources/Images/return2.png differ