fix add菜单隐藏搭配RunningMode配置共同使用

FrameworkLocal/Common/Account/Extends/Menu.cs

@@ -16,6 +16,7 @@ namespace MECF.Framework.Common.Account.Extends
         private AppMenu parent;
         private List<AppMenu> menuItems;
         private bool selected;
+        private bool isHide;
      
         public string MenuID
         {
@@ -64,6 +65,15 @@ namespace MECF.Framework.Common.Account.Extends
             get { return this.parent; }
             set { this.parent = value; }
         }
+        public bool IsHide
+        {
+            get { return this.isHide; }
+            set
+            {
+                this.isHide = value;
+                this.OnPropertyChanged("IsHide");
+            }
+        }
 
         public bool Selected
         {
@@ -129,6 +139,7 @@ namespace MECF.Framework.Common.Account.Extends
             item.IsAlarm = this.IsAlarm;
             item.AlarmModule = this.AlarmModule;
             item.Type = this.Type;
+            item.IsHide = this.IsHide;
 
             if (this.MenuItems != null)
             {

FrameworkLocal/Common/Account/Extends/MenuLoader.cs

@@ -45,6 +45,9 @@ namespace MECF.Framework.Common.Account.Extends
                     strMenuViewMode = result.Attribute("viewmodel").Value;
                     strMenuResKey = result.Attribute("resKey").Value;
                     AppMenu item = new AppMenu(strMenuID, strMenuViewMode, strMenuResKey, null);
+                    if (result.Attribute("isHide") != null)
+                        item.IsHide = bool.Parse(result.Attribute("isHide").Value);
+
                     if (result.Attribute("System") != null)
                         item.System = result.Attribute("System").Value;
                     if (result.Attribute("parentKey") != null)
@@ -62,6 +65,8 @@ namespace MECF.Framework.Common.Account.Extends
                     List<AppMenu> subMenuList = new List<AppMenu>();
                     subMenuList = TranslateMenus(result);
                     AppMenu item = new AppMenu(strMenuID, strMenuViewMode, strMenuResKey, subMenuList);
+                    if (result.Attribute("isHide") != null)
+                        item.IsHide = bool.Parse(result.Attribute("isHide").Value);
 
                     if (result.Attribute("System") != null)
                         item.System = result.Attribute("System").Value;

FrameworkLocal/Common/Account/Extends/RoleLoader.cs

@@ -233,6 +233,7 @@ namespace MECF.Framework.Common.Account.Extends
                     AppMenu RetSubMenu = new AppMenu(subMenu.MenuID, subMenu.ViewModel, subMenu.ResKey, null);
                     RetSubMenu.System = subMenu.System;
                     RetSubMenu.Type = subMenu.Type;
+                    RetSubMenu.IsHide = subMenu.IsHide;
                     RetSubMenu.ParentKey = subMenu.ParentKey;
                     RetSubMenu.AlarmModule = subMenu.AlarmModule;
                     RetSubMenu.Permission = this.GetMenuPermission(rolePermissions, subMenu.MenuID);
@@ -244,6 +245,7 @@ namespace MECF.Framework.Common.Account.Extends
                 {
                     var menu = new AppMenu(menuItem.MenuID, menuItem.ViewModel, menuItem.ResKey, subMenus);
                     menu.System = menuItem.System;
+                    menu.IsHide = menu.IsHide;
                     menu.ParentKey = menuItem.ParentKey;
                     menu.Type = menuItem.Type;
                     menu.AlarmModule = menuItem.AlarmModule;

Furnace/FurnaceRT/Config/FurnaceGemModel.xml

@@ -12234,6 +12234,7 @@
     <ECID id="3312280009" valueType="Ascii" logicalName="PM1.N2Purge.Manual_phase5.ValveAV65" value="" min="" max="" eventTrigger="" units="" description="" isArray="false" />
     <ECID id="3312280010" valueType="Ascii" logicalName="PM1.N2Purge.Manual_phase5.ValveAV66" value="" min="" max="" eventTrigger="" units="" description="" isArray="false" />
     <ECID id="3312280011" valueType="Ascii" logicalName="PM1.N2Purge.Manual_phase5.ValveSV227" value="" min="" max="" eventTrigger="" units="" description="" isArray="false" />
+    <ECID id="3312280012" valueType="Ascii" logicalName="PM1.N2Purge.Manual_phase5.MFC51" value="" min="" max="" eventTrigger="" units="" description="" isArray="false" />
     <ECID id="3312290001" valueType="Ascii" logicalName="PM1.RHC.RHCVDFFrequency" value="" min="" max="" eventTrigger="" units="" description="RHC VDF Frequency" isArray="false" />
   </EquipmentConstants>
   <DataVariables>

Furnace/FurnaceUI/Config/Menu.xml

@@ -18,21 +18,21 @@
 	<menuItem id="maintenance"			resKey="Maintain" >
 		<menuItem  id="BoatRobot"		resKey="Boat"				viewmodel="FurnaceUI.Views.Maintenances.BoatRobotViewModel,FurnaceUI" />
 		<menuItem  id="BufferRobot"		resKey="Buffer"				viewmodel="FurnaceUI.Views.Maintenances.BufferRobotViewModel,FurnaceUI" />
-		<menuItem  id="FIMSRobot"		resKey="FIMS"				viewmodel="FurnaceUI.Views.Maintenances.FIMSRobotViewModel,FurnaceUI" />
-		<menuItem  id="ioCHM"			resKey="IO-Tube"			viewmodel="FurnaceUI.Models.Maintenances.IO1.IO1ViewModel,FurnaceUI" System="System.PM1"/>
-		<menuItem  id="ioHeater"		resKey="IO-Heater"			viewmodel="FurnaceUI.Models.Maintenances.IO1.IO1ViewModel,FurnaceUI" System="System.Heater"/>
+		<menuItem isHide="true"  id="FIMSRobot"		resKey="FIMS"				viewmodel="FurnaceUI.Views.Maintenances.FIMSRobotViewModel,FurnaceUI" />
+		<menuItem isHide="true" id="ioCHM"			resKey="IO-Tube"			viewmodel="FurnaceUI.Models.Maintenances.IO1.IO1ViewModel,FurnaceUI" System="System.PM1"/>
+		<menuItem  isHide="true" id="ioHeater"		resKey="IO-Heater"			viewmodel="FurnaceUI.Models.Maintenances.IO1.IO1ViewModel,FurnaceUI" System="System.Heater"/>
 
 		<!--<menuItem  id="PMManagement"	resKey="PMManagement"		viewmodel="FurnaceUI.Views.Maintenances.StatisticsViewModel,FurnaceUI" />-->
 		<menuItem  id="ManualSet"		resKey="ManualSet"			viewmodel="FurnaceUI.Views.Recipes.ManualSetViewModel,FurnaceUI" />
 		<menuItem  id="ioList"		resKey="AxisMon"			viewmodel="FurnaceUI.Views.Maintenances.IOListViewModel,FurnaceUI" System="System.PM1"/>
 	</menuItem>
 	<menuItem id="GasLine"	resKey="GasLine" >
-		<menuItem  id="GasLine1"		    resKey="IO-GasLine1"	type="ELK"		viewmodel="FurnaceUI.Models.Maintenances.IO1.IO1ViewModel,FurnaceUI" System="System.GasLine1"/>
-		<menuItem  id="GasLine2"		    resKey="IO-GasLine2"	type="ELK"		viewmodel="FurnaceUI.Models.Maintenances.IO1.IO1ViewModel,FurnaceUI" System="System.GasLine2"/>
-		<menuItem  id="GasLine3"		    resKey="IO-GasLine3"	type="ELK"		viewmodel="FurnaceUI.Models.Maintenances.IO1.IO1ViewModel,FurnaceUI" System="System.GasLine3"/>
-		<menuItem  id="GasLine4"		    resKey="IO-GasLine4"	type="ELK"		viewmodel="FurnaceUI.Models.Maintenances.IO1.IO1ViewModel,FurnaceUI" System="System.GasLine4"/>
-		<menuItem  id="GasLine6"		    resKey="IO-GasLine6"	type="ELK"		viewmodel="FurnaceUI.Models.Maintenances.IO1.IO1ViewModel,FurnaceUI" System="System.GasLine6"/>
-		<menuItem  id="GasLine7"		    resKey="IO-GasLine7"	type="ELK"		viewmodel="FurnaceUI.Models.Maintenances.IO1.IO1ViewModel,FurnaceUI" System="System.GasLine7"/>
+		<menuItem  isHide="true" id="GasLine1"		    resKey="IO-GasLine1"	type="ELK"		viewmodel="FurnaceUI.Models.Maintenances.IO1.IO1ViewModel,FurnaceUI" System="System.GasLine1"/>
+		<menuItem  isHide="true" id="GasLine2"		    resKey="IO-GasLine2"	type="ELK"		viewmodel="FurnaceUI.Models.Maintenances.IO1.IO1ViewModel,FurnaceUI" System="System.GasLine2"/>
+		<menuItem  isHide="true" id="GasLine3"		    resKey="IO-GasLine3"	type="ELK"		viewmodel="FurnaceUI.Models.Maintenances.IO1.IO1ViewModel,FurnaceUI" System="System.GasLine3"/>
+		<menuItem  isHide="true" id="GasLine4"		    resKey="IO-GasLine4"	type="ELK"		viewmodel="FurnaceUI.Models.Maintenances.IO1.IO1ViewModel,FurnaceUI" System="System.GasLine4"/>
+		<menuItem  isHide="true" id="GasLine6"		    resKey="IO-GasLine6"	type="ELK"		viewmodel="FurnaceUI.Models.Maintenances.IO1.IO1ViewModel,FurnaceUI" System="System.GasLine6"/>
+		<menuItem  isHide="true" id="GasLine7"		    resKey="IO-GasLine7"	type="ELK"		viewmodel="FurnaceUI.Models.Maintenances.IO1.IO1ViewModel,FurnaceUI" System="System.GasLine7"/>
 		<!--<menuItem  id="GasLine8"		    resKey="IO-GasLine8"	type="ELK"		viewmodel="FurnaceUI.Models.Maintenances.IO1.IO1ViewModel,FurnaceUI" System="System.GasLine8"/>-->
 	</menuItem>
 	<menuItem id="Recipe"				resKey="Recipe">
@@ -61,7 +61,7 @@
 		<!--<menuItem  id="Alarmtable" resKey="Alarm Table" viewmodel="MECF.Framework.UI.Client.CenterViews.Parameter.AlarmtableParameterViewModel,MECF.Framework.UI.Client" />-->
 		<!--<menuItem  id="interlock"		resKey="Interlock"			viewmodel="FurnaceUI.Views.Operations.InterlockViewModel,FurnaceUI" />-->
 		<menuItem  id="Valvelock"		resKey="Valvelock"			viewmodel="FurnaceUI.Views.Operations.ValveInterlockViewModel,FurnaceUI" />
-		<menuItem  id="WaferThick"		resKey="Wafer Thick"	type="ELK"	viewmodel="FurnaceUI.Views.Operations.WaferThickViewModel,FurnaceUI" />
+		<menuItem isHide="true" id="WaferThick"		resKey="Wafer Thick"	type="ELK"	viewmodel="FurnaceUI.Views.Operations.WaferThickViewModel,FurnaceUI" />
 		<menuItem  id="WaferRobot"		resKey="WaferRobot"			viewmodel="FurnaceUI.Views.Maintenances.WaferRobotParameterViewModel,FurnaceUI" System="WaferRobot"/>
 		<menuItem  id="CarrierRobot"		resKey="CarrierRobot"			viewmodel="FurnaceUI.Views.Maintenances.WaferRobotParameterViewModel,FurnaceUI"  System="CarrierRobot"/>
 		<menuItem id="ScheduledMait"	resKey="Scheduled Mait"		viewmodel="FurnaceUI.Views.Editors.ScheduledMaitViewModel,FurnaceUI"/>
@@ -73,7 +73,7 @@
 		<menuItem id="N2Purge2"			resKey="N2Purge2"			viewmodel="FurnaceUI.Views.Parameter.N2PurgeEditViewModel,FurnaceUI"/>
 		<menuItem id="FA"				resKey="FA"					viewmodel="MECF.Framework.UI.Client.CenterViews.Operations.FA.FAViewModel,MECF.Framework.UI.Client" />
 		<!--<menuItem id="AUX"				resKey="AUX"				viewmodel="FurnaceUI.Views.Parameter.AUXIndexViewModel,FurnaceUI"/>-->
-		<menuItem id="Mapping"			resKey="Wafer Mapping"	type="ELK"	viewmodel="FurnaceUI.Views.Parameter.WaferMappingViewModel,FurnaceUI"/>
+		<menuItem isHide="true" id="Mapping"			resKey="Wafer Mapping"	type="ELK"	viewmodel="FurnaceUI.Views.Parameter.WaferMappingViewModel,FurnaceUI"/>
 		<menuItem id="SystemConfig"		resKey="System Config"		viewmodel="FurnaceUI.Views.Maintenances.ConfigViewModel,FurnaceUI"/>
 		<menuItem id="LoadPort" resKey="LoadPort" viewmodel="MECF.Framework.UI.Client.CenterViews.Operations.E84.E84ViewModel,MECF.Framework.UI.Client" />
 		<menuItem  id="BackUp"		resKey="BackUp"			viewmodel="FurnaceUI.Views.Parameter.BackUpViewModel,FurnaceUI"  />

Furnace/FurnaceUI/MainViewModel.cs

@@ -1099,7 +1099,8 @@ namespace FurnaceUI.Client
                         if (string.IsNullOrEmpty(toolType)) continue;
                         foreach (var menuItemMenuItem in menuitem.MenuItems)
                         {
-                            if (runningMode == ConfigEnum.Release.ToString() && menuItemMenuItem.ResKey.StartsWith("IO-"))
+
+                            if (menuItemMenuItem.IsHide && runningMode == ConfigEnum.Release.ToString())
                             {
                                 filtered.Add(menuItemMenuItem);
                             }