Browse Source

解决Operation Log在read权限时不显示数据的问题“

JET-GZX 1 day ago
parent
commit
df20375677

+ 1 - 1
VirgoUI/Models/DataLog/Event/EventViewModel.cs

@@ -236,7 +236,7 @@ namespace VirgoUI.Client.Models.DataLog.Event
         /// </summary>
         public void Search()
         {
-            if (MenuPermission != 3) return;
+            //if (MenuPermission != 3) return;
             Task.Factory.StartNew(() =>
             {
                 try

+ 39 - 0
VirgoUI/Models/Utility/Role/RoleView.xaml

@@ -118,6 +118,19 @@
                             <TextBlock Text="Role Name" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="12" FontFamily="Arial" VerticalAlignment="Center"/>
                         </Border>
                         <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,1,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Column="1" Padding="5,1">
+                            <Border.Style>
+                                <Style TargetType="{x:Type Border}">
+                                    <Setter Property="IsEnabled" Value="False" />
+                                    <Style.Triggers>
+                                        <MultiDataTrigger>
+                                            <MultiDataTrigger.Conditions>
+                                                <Condition Binding="{Binding Permission}" Value="3" />
+                                            </MultiDataTrigger.Conditions>
+                                            <Setter Property="IsEnabled" Value="True" />
+                                        </MultiDataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </Border.Style>
                             <ControlLib:TextBoxEx Text="{Binding TreeSelectedRole.DisplayRoleName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" HorizontalContentAlignment="Left" TextSaved="{Binding Mode=TwoWay, Path=TreeSelectedRole.RoleNameTextSaved }" Name="textBox1"  
                                     HorizontalAlignment="Left" VerticalAlignment="Center"  Width="150">
                                 <i:Interaction.Triggers>
@@ -138,6 +151,19 @@
                             <TextBlock Text="Is Auto lock" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="12" FontFamily="Arial" VerticalAlignment="Center"/>
                         </Border>
                         <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Column="1" Padding="5,1">
+                            <Border.Style>
+                                <Style TargetType="{x:Type Border}">
+                                    <Setter Property="IsEnabled" Value="False" />
+                                    <Style.Triggers>
+                                        <MultiDataTrigger>
+                                            <MultiDataTrigger.Conditions>
+                                                <Condition Binding="{Binding Permission}" Value="3" />
+                                            </MultiDataTrigger.Conditions>
+                                            <Setter Property="IsEnabled" Value="True" />
+                                        </MultiDataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </Border.Style>
                             <CheckBox IsChecked="{Binding TreeSelectedRole.DisplayIsAutoLogout}" HorizontalAlignment="Left" VerticalAlignment="Center"
                                         Content="" 
                                         Name="checkBox1">
@@ -160,6 +186,19 @@
                             <TextBlock Text="Time(minutes)" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="12" FontFamily="Arial" VerticalAlignment="Center"/>
                         </Border>
                         <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Column="1" Padding="5,1">
+                            <Border.Style>
+                                <Style TargetType="{x:Type Border}">
+                                    <Setter Property="IsEnabled" Value="False" />
+                                    <Style.Triggers>
+                                        <MultiDataTrigger>
+                                            <MultiDataTrigger.Conditions>
+                                                <Condition Binding="{Binding Permission}" Value="3" />
+                                            </MultiDataTrigger.Conditions>
+                                            <Setter Property="IsEnabled" Value="True" />
+                                        </MultiDataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </Border.Style>
                             <ControlLib:TextBoxEx EditBoxMode="UnSignInteger" Text="{Binding TreeSelectedRole.DisplayAutoLogoutTime,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" HorizontalContentAlignment="Left"   TextSaved="{Binding Mode=TwoWay, Path=TreeSelectedRole.TimeTextSaved }"  Name="textBox2"  
                                             HorizontalAlignment="Left" VerticalAlignment="Center" Width="150">
                                 <i:Interaction.Triggers>