修改配置文件名，合并代码

# Conflicts:
#	Venus/Venus_Themes/UserControls/LoadLockRight.xaml

Venus/Venus_MainPages/ViewModels/RoleViewModel.cs

@@ -32,7 +32,7 @@ namespace Venus_MainPages.ViewModels
 
         public RoleViewModel()
         {
-            VenusMenus = SerializeHelper.Instance.ReadFromJsonFile<List<VenusMenu>>("Config/VenusMenu.json");
+            VenusMenus = SerializeHelper.Instance.ReadFromJsonFile<List<VenusMenu>>("Config/UIMenu.json");
         }
         private void OnSave()
         {

Venus/Venus_MainPages/Views/OverKepler2300View.xaml

@@ -1154,9 +1154,11 @@
 
         </Grid>-->
 
-        <Grid Width="400" Height="25"  Background="#E8E8E8" unity:GridOptions.LineBrush="#afb4db" unity:GridOptions.ShowBorder="True" Canvas.Left="500" Canvas.Top="318">
+        <Grid Width="400" Height="80"  Background="#E8E8E8" unity:GridOptions.LineBrush="#afb4db" unity:GridOptions.ShowBorder="True" Canvas.Left="500" Canvas.Top="218">
             <Grid.RowDefinitions>
                 <RowDefinition/>
+                <RowDefinition/>
+                <RowDefinition/>
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="3*"/>

Venus/Venus_Themes/UserControls/LoadLockLeft.xaml

@@ -44,7 +44,7 @@
                     <DataTrigger.ExitActions>
                         <BeginStoryboard>
                             <Storyboard>
-                                <DoubleAnimation  Storyboard.TargetProperty="Width" To="164" Duration="0:0:1"/>
+                                <DoubleAnimation  Storyboard.TargetProperty="Width" To="166" Duration="0:0:1"/>
                             </Storyboard>
                         </BeginStoryboard>
                     </DataTrigger.ExitActions>
@@ -127,8 +127,8 @@
                 </ctrl:Slot>
             </Viewbox>
 
-            <Rectangle  Fill="Silver" Width="162"   VerticalAlignment="Top"    Height="20"  Canvas.Top="200" Canvas.Left="-1" Visibility="{Binding ElementName=LeftLoadLock,Path=Door2IsVisibility}"/>
-            <Rectangle Cursor="Hand" DataContext="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl,AncestorLevel=1}}" Fill="DimGray" Style="{StaticResource door2Animation}"  VerticalAlignment="Top"    Height="20"  Canvas.Top="200" Canvas.Left="-1" Visibility="{Binding ElementName=LeftLoadLock,Path=Door2IsVisibility}">
+            <Rectangle  Fill="Silver" Width="164"   VerticalAlignment="Top"    Height="20"  Canvas.Top="200" Canvas.Left="-2" Visibility="{Binding ElementName=LeftLoadLock,Path=Door2IsVisibility}"/>
+            <Rectangle Cursor="Hand" DataContext="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl,AncestorLevel=1}}" Fill="DimGray" Style="{StaticResource door2Animation}"  VerticalAlignment="Top"    Height="20"  Canvas.Top="200" Canvas.Left="-2" Visibility="{Binding ElementName=LeftLoadLock,Path=Door2IsVisibility}">
                 <Rectangle.ContextMenu >
                     <ContextMenu>
                         <MenuItem Header="Open Door"  Click="OpenDoor2_Click"    IsChecked="{Binding Door2IsOpen}" IsEnabled="{Binding Door2IsOpen,Converter={StaticResource BoolToBool}}"/>

Venus/Venus_Themes/UserControls/LoadLockRight.xaml

@@ -31,7 +31,7 @@
             </Style.Triggers>
         </Style>
         <Style TargetType="Rectangle" x:Key="door2Animation">
-            <Setter Property="Width" Value="162"/>
+            <Setter Property="Width" Value="165"/>
             <Style.Triggers>
                 <DataTrigger Binding="{Binding ElementName=RightLoadLock,Path=Door2IsOpen}" Value="True">
                     <DataTrigger.EnterActions>
@@ -44,7 +44,7 @@
                     <DataTrigger.ExitActions>
                         <BeginStoryboard>
                             <Storyboard>
-                                <DoubleAnimation  Storyboard.TargetProperty="Width" To="162" Duration="0:0:1"/>
+                                <DoubleAnimation  Storyboard.TargetProperty="Width" To="165" Duration="0:0:1"/>
                             </Storyboard>
                         </BeginStoryboard>
                     </DataTrigger.ExitActions>
@@ -137,17 +137,8 @@
                        DataContext="{Binding ElementName=RightLoadLock, Path=RobotWafer}"  HorizontalAlignment="Center" VerticalAlignment="Center">
                 </ctrl:Slot>
             </Viewbox>
-            <Rectangle  Fill="Silver" Width="162"  VerticalAlignment="Top"    Height="20"  Canvas.Top="200" Canvas.Left="39" Visibility="{Binding ElementName=RightLoadLock,Path=Door2IsVisibility}"/>
-            <Rectangle Cursor="Hand" DataContext="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl,AncestorLevel=1}}" Fill="DimGray" Style="{StaticResource door2Animation}"  VerticalAlignment="Top"    Height="20"  Canvas.Top="200" Canvas.Left="40" Visibility="{Binding ElementName=LeftLoadLock,Path=Door2IsVisibility}">
-                <Rectangle.ContextMenu>
-                    <ContextMenu>
-                        <MenuItem Header="Open Door"  Click="OpenDoor2_Click"    IsChecked="{Binding Door2IsOpen}" IsEnabled="{Binding Door2IsOpen,Converter={StaticResource BoolToBool}}"/>
-                        <MenuItem Header="Close Door" Click="CloseDoor2_Click"    IsChecked="{Binding Door2IsOpen,Converter={StaticResource BoolToBool}}" IsEnabled="{Binding Door2IsOpen}"/>
-                    </ContextMenu>
-                </Rectangle.ContextMenu>
-            </Rectangle>
-            
-            <Rectangle Cursor="Hand" DataContext="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl,AncestorLevel=1}}" Fill="DimGray" Style="{StaticResource door2Animation}"  VerticalAlignment="Top"    Height="20"  Canvas.Top="200" Canvas.Left="59"  Visibility="{Binding ElementName=RightLoadLock,Path=Door2IsVisibility}">
+            <Rectangle  Fill="Silver" Width="164"  VerticalAlignment="Top"    Height="20"  Canvas.Top="200" Canvas.Left="38" Visibility="{Binding ElementName=RightLoadLock,Path=Door2IsVisibility}"/>
+            <Rectangle Cursor="Hand" DataContext="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl,AncestorLevel=1}}" Fill="DimGray" Style="{StaticResource door2Animation}"  VerticalAlignment="Top"    Height="20"  Canvas.Top="200" Canvas.Left="60.5"  Visibility="{Binding ElementName=RightLoadLock,Path=Door2IsVisibility}">
                 <Rectangle.RenderTransform>
                     <RotateTransform Angle="180" CenterX="71" CenterY="10"/>
                 </Rectangle.RenderTransform>

Venus/Venus_UI/Config/KeplerMenu.json

@@ -1,322 +0,0 @@
-[
-  {
-    "Id": "PMA",
-    "IsShow": "true",
-    "MenuItem": [
-      {
-        "Id": "Operation",
-        "Name": "Operation",
-        "View": "OverView_Kepler",
-        "IsShow": "true"
-
-      },
-      {
-        "Id": "IO",
-        "Name": "IO",
-        "View": "IOView",
-        "IsShow": "true"
-      },
-      {
-        "Id": "Recipe",
-        "Name": "Recipe",
-        "View": "RecipeView",
-        "IsShow": "true"
-
-      },
-      {
-        "Id": "GasLeakCheck",
-        "Name": "Gas&Leak Check",
-        "View": "GasLeakCheckView",
-        "IsShow": "true"
-
-      },
-      {
-        "Id": "MFCVerification",
-        "Name": "MFCVerification",
-        "View": "MFCVerificationView",
-        "IsShow": "true"
-
-      },
-      {
-        "Id": "PartialPressure",
-        "Name": "Partial Pressure",
-        "View": "PartialPressureView",
-        "IsShow": "true"
-      },
-      {
-        "Id": "VATPerformance",
-        "Name": "VAT Performance",
-        "View": "VATPerformanceView",
-        "IsShow": "true"
-      },
-      {
-        "Id": "RFCalibration",
-        "Name": "RF Calibration",
-        "View": "RFCalibrationView",
-        "IsShow": "true"
-      }
-
-    ]
-  },
-  {
-    "Id": "PMB",
-    "IsShow": "false",
-
-    "MenuItem": [
-      {
-        "Id": "Operation",
-        "Name": "Operation",
-        "View": "OverView_Kepler",
-        "IsShow": "true"
-
-      },
-      {
-        "Id": "IO",
-        "Name": "IO",
-        "View": "IOView",
-        "IsShow": "true"
-      },
-      {
-        "Id": "Recipe",
-        "Name": "Recipe",
-        "View": "RecipeView",
-        "IsShow": "true"
-
-      },
-      {
-        "Id": "GasLeakCheck",
-        "Name": "Gas&Leak Check",
-        "View": "GasLeakCheckView",
-        "IsShow": "true"
-
-      },
-      {
-        "Id": "MFCVerification",
-        "Name": "MFCVerification",
-        "View": "MFCVerificationView",
-        "IsShow": "true"
-
-      },
-      {
-        "Id": "PartialPressure",
-        "Name": "Partial Pressure",
-        "View": "PartialPressureView",
-        "IsShow": "true"
-
-      },
-      {
-        "Id": "VATPerformance",
-        "Name": "VAT Performance",
-        "View": "VATPerformanceView",
-        "IsShow": "true"
-      }
-
-    ]
-  },
-  {
-    "Id": "PMC",
-    "IsShow": "false",
-    "MenuItem": [
-      {
-        "Id": "Operation",
-        "Name": "Operation",
-        "IsShow": "true",
-        "View": "OverView_Kepler"
-      },
-      {
-        "Id": "IO",
-        "Name": "IO",
-        "View": "IOView",
-        "IsShow": "true"
-      },
-      {
-        "Id": "Recipe",
-        "Name": "Recipe",
-        "IsShow": "true",
-        "View": "RecipeView"
-      },
-      {
-        "Id": "GasLeakCheck",
-        "IsShow": "true",
-        "Name": "Gas&Leak Check",
-        "View": "GasLeakCheckView"
-      },
-      {
-        "Id": "MFCVerification",
-        "IsShow": "true",
-        "Name": "MFCVerification",
-        "View": "MFCVerificationView"
-      },
-      {
-        "Id": "PartialPressure",
-        "IsShow": "true",
-        "Name": "Partial Pressure",
-        "View": "PartialPressureView"
-      },
-      {
-        "Id": "VATPerformance",
-        "Name": "VAT Performance",
-        "View": "VATPerformanceView",
-        "IsShow": "true"
-      }
-
-    ]
-  },
-  {
-    "Id": "PMD",
-
-    "IsShow": "false",
-
-    "MenuItem": [
-      {
-        "Id": "Operation",
-        "IsShow": "true",
-        "Name": "Operation",
-        "View": "OverView_Kepler"
-      },
-      {
-        "Id": "IO",
-        "Name": "IO",
-        "View": "IOView",
-        "IsShow": "true"
-      },
-      {
-        "Id": "Recipe",
-        "IsShow": "true",
-        "Name": "Recipe",
-        "View": "RecipeView"
-      },
-      {
-        "Id": "GasLeakCheck",
-        "IsShow": "true",
-
-        "Name": "Gas&Leak Check",
-        "View": "GasLeakCheckView"
-      },
-      {
-        "Id": "MFCVerification",
-        "IsShow": "true",
-        "Name": "MFCVerification",
-        "View": "MFCVerificationView"
-      },
-      {
-        "Id": "PartialPressure",
-        "IsShow": "true",
-        "Name": "Partial Pressure",
-        "View": "PartialPressureView"
-      },
-      {
-        "Id": "VATPerformance",
-        "Name": "VAT Performance",
-        "View": "VATPerformanceView",
-        "IsShow": "true"
-      }
-
-    ]
-  },
-  {
-    "Id": "Operation",
-    "IsShow": "true",
-
-    "MenuItem": [
-      {
-        "Id": "OperationOverView",
-        "IsShow": "true",
-        "Name": "OverView",
-        "View": "OperationOverView"
-      },
-      {
-        "Id": "Platform",
-        "IsShow": "true",
-        "Name": "Platform",
-        "View": "PlatformView"
-      },
-      {
-        "Id": "Sequence",
-        "IsShow": "true",
-        "Name": "Sequence",
-        "View": "SequenceView"
-      },
-      {
-        "Id": "Efem",
-        "IsShow": "true",
-        "Name": "EFEM",
-        "View": "EfemView"
-      },
-      {
-        "Id": "Fa",
-        "IsShow": "true",
-        "Name": "FA",
-        "View": "FaView"
-      }
-    ]
-  },
-  {
-    "Id": "TM",
-    "IsShow": "true",
-    "MenuItem": [
-        {
-          "Id": "TM",
-          "IsShow": "true",
-          "Name": "TM",
-          "View": "TMView"
-        },
-        {
-          "Id": "IO",
-          "Name": "IO",
-          "View": "IOView",
-          "IsShow": "true"
-        }     
-    ]
-    
-  },
-  {
-    "Id": "Configuration",
-    "IsShow": "true",
-    "MenuItem": [
-      {
-        "Id": "SystemConfig",
-        "IsShow": "true",
-        "Name": "SystemConfig",
-        "View": "SystemConfigView"
-      },
-      {
-        "Id": "Role",
-        "IsShow": "true",
-        "Name": "Role",
-        "View": "RoleView"
-      }
-    ]
-  },
-  {
-    "Id": "DataLog",
-    "IsShow": "true",
-    "MenuItem": [
-      {
-        "Id": "Event",
-        "IsShow": "true",
-        "Name": "Event",
-        "View": "EventView"
-      },
-      {
-        "Id": "WaferHistoryDB",
-        "IsShow": "true",
-        "Name": "WaferHistory",
-        "View": "WaferHistoryDBView"
-      },
-      {
-        "Id": "ProcessHistory",
-        "IsShow": "true",
-        "Name": "Process History",
-        "View": "ProcessHistoryView"
-      },
-      {
-        "Id": "DataHistory",
-        "IsShow": "true",
-        "Name": "Data History",
-        "View": "DataHistoryView"
-      }
-    ]
-  }
-
-]

Venus/Venus_UI/Config/VenusMenu.json

@@ -1,5 +1,43 @@
 [
   {
+    "Id": "Operation",
+    "IsShow": "true",
+
+    "MenuItem": [
+      {
+        "Id": "OperationOverView",
+        "IsShow": "true",
+        "Name": "OverView",
+        "View": "OperationOverView"
+      },
+      {
+        "Id": "Platform",
+        "IsShow": "true",
+        "Name": "Platform",
+        "View": "PlatformView"
+      },
+      {
+        "Id": "Sequence",
+        "IsShow": "true",
+        "Name": "Sequence",
+        "View": "SequenceView"
+      },
+      {
+        "Id": "Efem",
+        "IsShow": "true",
+        "Name": "EFEM",
+        "View": "EfemView"
+      },
+      {
+        "Id": "Fa",
+        "IsShow": "true",
+        "Name": "FA",
+        "View": "FaView"
+      }
+    ]
+  },
+
+  {
     "Id": "PMA",
     "IsShow": "true",
     "MenuItem": [
@@ -215,43 +253,6 @@
     ]
   },
   {
-    "Id": "Operation",
-    "IsShow": "true",
-
-    "MenuItem": [
-      {
-        "Id": "OperationOverView",
-        "IsShow": "true",
-        "Name": "OverView",
-        "View": "OperationOverView"
-      },
-      {
-        "Id": "Platform",
-        "IsShow": "true",
-        "Name": "Platform",
-        "View": "PlatformView"
-      },
-      {
-        "Id": "Sequence",
-        "IsShow": "true",
-        "Name": "Sequence",
-        "View": "SequenceView"
-      },
-      {
-        "Id": "Efem",
-        "IsShow": "true",
-        "Name": "EFEM",
-        "View": "EfemView"
-      },
-      {
-        "Id": "Fa",
-        "IsShow": "true",
-        "Name": "FA",
-        "View": "FaView"
-      }
-    ]
-  },
-  {
     "Id": "TM",
     "IsShow": "true",
     "MenuItem": [
@@ -274,7 +275,7 @@
         "IsShow": "true"
       }
     ]
-    
+
   },
   {
     "Id": "Configuration",

Venus/Venus_UI/Venus_UI.csproj

@@ -151,12 +151,9 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <None Include="Config\KeplerMenu.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Config\VenusMenu.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
+    <Content Include="Config\UIMenu.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>

Venus/Venus_UI/Views/ShellView.xaml.cs

@@ -68,7 +68,7 @@ namespace Venus_UI.Views
 
         private void CustomWnd_Loaded(object sender, RoutedEventArgs e)
         {
-            VenusMenu = SerializeHelper.Instance.ReadFromJsonFile<List<VenusMenu>>($"Config/VenusMenu.json");
+            VenusMenu = SerializeHelper.Instance.ReadFromJsonFile<List<VenusMenu>>($"Config/UIMenu.json");
             int index = 0;
             for (int i = 0; i < VenusMenu.Count; i++)
             {