Просмотр исходного кода

1.去掉MFC Verification
2.隐藏了role header

JET-YDB\JET-YANGDB дней назад: 2
Родитель
Сommit
5b072851b4

+ 2 - 2
VirgoUI/Config/Menu.xml

@@ -40,7 +40,7 @@
     <menuItem id="OESPMA" resKey="OES" System="PMA"  viewmodel="VirgoUI.Client.Models.PMs.OESViewModel,VirgoUI" />
     <menuItem id="EPDPMA" resKey="EPD" System="PMA"  viewmodel="VirgoUI.Client.Models.PMs.EPDViewModel,VirgoUI" />
     <menuItem id="calibrationPMA" resKey="RF Calibration" System="PMA" viewmodel="VirgoUI.Client.Models.PMs.RFCalibrationViewModel,VirgoUI" />
-    <menuItem id="verificationPMA" resKey="MFC Verification" System="PMA" viewmodel="VirgoUI.Client.Models.PMs.MFCVerificationViewModel,VirgoUI" />
+    <!--<menuItem id="verificationPMA" resKey="MFC Verification" System="PMA" viewmodel="VirgoUI.Client.Models.PMs.MFCVerificationViewModel,VirgoUI" />-->
     <menuItem id="pidPMA" resKey="PID" System="IO.PMA" viewmodel="VirgoUI.Client.Models.PMs.PMPIDViewModel,VirgoUI" />
   </menuItem>
   <menuItem id="PMB" resKey="PMB">
@@ -53,7 +53,7 @@
     <menuItem id="OESPMB" resKey="OES" System="PMB"  viewmodel="VirgoUI.Client.Models.PMs.OESViewModel,VirgoUI" />
     <menuItem id="EPDPMB" resKey="EPD" System="PMB"  viewmodel="VirgoUI.Client.Models.PMs.EPDViewModel,VirgoUI" />
     <menuItem id="calibrationPMB" resKey="RF Calibration" System="PMB" viewmodel="VirgoUI.Client.Models.PMs.RFCalibrationViewModel,VirgoUI" />
-    <menuItem id="verificationPMB" resKey="MFC Verification" System="PMB" viewmodel="VirgoUI.Client.Models.PMs.MFCVerificationViewModel,VirgoUI" />
+    <!--<menuItem id="verificationPMB" resKey="MFC Verification" System="PMB" viewmodel="VirgoUI.Client.Models.PMs.MFCVerificationViewModel,VirgoUI" />-->
     <menuItem id="pidPMB" resKey="PID" System="IO.PMB" viewmodel="VirgoUI.Client.Models.PMs.PMPIDViewModel,VirgoUI" />
   </menuItem>
 

+ 1 - 1
VirgoUI/Models/Utility/Role/RoleManager.cs

@@ -47,7 +47,7 @@ namespace VirgoUI.Client.Models.Utility.RolePage
                 MenuInfo mp = new MenuInfo() { ID = "Header" };
                 mp.Name = "Header";
                 mp.EnumPermission = menuPermissionParse.GetPermissionByPageID("Header");
-                role.AddMenuInfo(mp);
+                //role.AddMenuInfo(mp);
 
                 //Get Menu information
                 foreach (AppMenu topMenuItem in menus)

+ 8 - 0
VirgoUI/Styles/TextBox.xaml

@@ -1,4 +1,5 @@
 <ResourceDictionary
+    xmlns:ctrl="http://OpenSEMI.Ctrlib.com/presentation"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
@@ -17,6 +18,13 @@
     <SolidColorBrush x:Key="TextBox_InnerRight_Unable" Color="#FFE7E7E7"/>
     <SolidColorBrush x:Key="TextBox_InnerBottom_Unable" Color="#FFE7E7E7"/>
 
+    <Style TargetType="ctrl:TextBoxEx">
+        <Setter Property="Background" Value="White" />
+        <Setter Property="ChangedColor" Value="White" />
+        <Setter Property="NormalColor" Value="White" />
+        <Setter Property="WarningColor" Value="White" />
+    </Style>
+    
     <Style TargetType="{x:Type TextBox}">
         <Setter Property="SnapsToDevicePixels" Value="True"/>
         <Setter Property="FontFamily" Value="Arial" />