From b544d5cccd76735e034c8055918a50927b437474 Mon Sep 17 00:00:00 2001
From: wenxiangchao <wenxiangchao@ihengxin.com.cn>
Date: 星期二, 10 十一月 2026 08:29:04 +0800
Subject: [PATCH] fix: 维护模式重复进入失败与按钮灰死 + Broker 并发验证用例
---
HMI.MenuManage/RoleManage.xaml | 73 +++++++++++++++---------------------
1 files changed, 30 insertions(+), 43 deletions(-)
diff --git a/HMI.MenuManage/RoleManage.xaml b/HMI.MenuManage/RoleManage.xaml
index 99eb89c..4b2acbd 100644
--- a/HMI.MenuManage/RoleManage.xaml
+++ b/HMI.MenuManage/RoleManage.xaml
@@ -14,18 +14,7 @@
Background="#f0f2f5"
d:DesignHeight="450" d:DesignWidth="800">
<UserControl.Resources>
- <ResourceDictionary>
- <ResourceDictionary.MergedDictionaries>
- <pu:StyleDictionary Includes="TreeView" />
- <ResourceDictionary Source="/HMI.UI;component/Style/PanuonResource.xaml"/>
- <ResourceDictionary Source="/HMI.UI;component/Resources/Font/Font.xaml"/>
- </ResourceDictionary.MergedDictionaries>
-
- <uic:PathImageConverter x:Key="path2Image"/>
- <uic:DataGridRowNumberConverter x:Key="rowNumber"/>
- </ResourceDictionary>
</UserControl.Resources>
-
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="6*"/>
@@ -35,13 +24,14 @@
<Border Style="{StaticResource CardBoarder}" Margin="0,0,2,0">
<StackPanel>
<DockPanel Margin="0,0,0,10">
- <Button DockPanel.Dock="Right" pu:ButtonHelper.Icon="" Style="{StaticResource DangerButton}">鍒犻櫎</Button>
- <Button DockPanel.Dock="Right" Style="{StaticResource PrimaryButton}"
-pu:ButtonHelper.Icon="" Margin="0,0,10,0" x:Name="refreshBtn" Click="Button_Click">鍒锋柊</Button>
- <Button DockPanel.Dock="Right" Style="{StaticResource PrimaryButton}"
- pu:ButtonHelper.Icon="" Margin="0,0,10,0" x:Name="addBtn" Click="Button_Click">鏂板</Button>
+ <Button DockPanel.Dock="Right" Style="{StaticResource DelBtn}"
+ x:Name="deleteBatchBtn" Click="Button_Click"/>
+ <Button DockPanel.Dock="Right" Style="{StaticResource RfhBtn}"
+ Margin="0,0,10,0" x:Name="refreshBtn" Click="Button_Click"/>
+ <Button DockPanel.Dock="Right" Style="{StaticResource AddBtn}"
+ Margin="0,0,10,0" x:Name="addBtn" Click="Button_Click"/>
<TextBlock DockPanel.Dock="Left" FontSize="{StaticResource TitleFontSize}"
- VerticalAlignment="Center" HorizontalAlignment="Left" Text="瑙掕壊鍒楄〃"/>
+ VerticalAlignment="Center" HorizontalAlignment="Left" Text="{DynamicResource HMI.Role.Title}"/>
</DockPanel>
<DataGrid x:Name="table" Style="{StaticResource DefaultDataGrid}"
@@ -61,34 +51,31 @@
Binding="{Binding Converter={StaticResource rowNumber},
RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow},AncestorLevel=1}}"
CanUserResize="False"/>
- <DataGridTextColumn Width="*" Binding="{Binding Code}" Header="瑙掕壊缂栧彿" />
- <DataGridTextColumn Width="*" Binding="{Binding Name}" Header="瑙掕壊鍚嶇О" />
- <DataGridTemplateColumn Header="鎿嶄綔" Width="100" IsReadOnly="True" CanUserResize="False">
+ <DataGridTextColumn Width="*" Binding="{Binding Code}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{DynamicResource HMI.Role.Code}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
+ <DataGridTextColumn Width="*" Binding="{Binding Name}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{DynamicResource HMI.Role.Name}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
+ <DataGridTemplateColumn Width="110" IsReadOnly="True" CanUserResize="False">
+ <DataGridTemplateColumn.Header>
+ <TextBlock Text="{DynamicResource App.Opt}"/>
+ </DataGridTemplateColumn.Header>
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<StackPanel Orientation="Horizontal">
- <Button x:Name="editBtn" Style="{StaticResource LinkButton}"
+ <Button x:Name="editBtn" Style="{StaticResource EditLink}"
Margin="0,0,10,0"
Click="Button_Click"
- DataContext="{Binding }">缂栬緫</Button>
- <Button x:Name="delBtn" Style="{StaticResource DangerLinkButton}"
+ DataContext="{Binding }"/>
+ <Button x:Name="delBtn" Style="{StaticResource DeleteLink}"
DataContext="{Binding }"
- Click="Button_Click">鍒犻櫎</Button>
+ Click="Button_Click"/>
</StackPanel>
-
- <DataTemplate.Triggers>
- <DataTrigger Binding="{Binding Path=IsMouseOver,
- RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow},AncestorLevel=1}}"
- Value="True">
- <Setter TargetName="editBtn" Property="Foreground" Value="#FFF"/>
- </DataTrigger>
- <DataTrigger Binding="{Binding Path=IsSelected,
- RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow},AncestorLevel=1}}"
- Value="True">
- <Setter TargetName="editBtn" Property="Foreground" Value="#FFF"/>
- </DataTrigger>
- </DataTemplate.Triggers>
-
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
@@ -100,10 +87,10 @@
<Border Grid.Column="1" Style="{StaticResource CardBoarder}" Margin="2,0,0,0">
<StackPanel>
<DockPanel Margin="0,0,0,10" >
- <Button DockPanel.Dock="Right" Style="{StaticResource PrimaryButton}" x:Name="saveMenuBtn" Click="Button_Click"
- pu:ButtonHelper.Icon="" Content="淇濆瓨"/>
+ <Button DockPanel.Dock="Right" Style="{StaticResource SaveBtn}"
+ x:Name="saveMenuBtn" Click="Button_Click"/>
<TextBlock DockPanel.Dock="Left" FontSize="{StaticResource TitleFontSize}"
- VerticalAlignment="Center" HorizontalAlignment="Left" Text="鑿滃崟鎺堟潈"/>
+ VerticalAlignment="Center" HorizontalAlignment="Left" Text="{DynamicResource HMI.Role.Permission}"/>
</DockPanel>
<TreeView x:Name="treeViewer" Grid.Column="1"
Style="{StaticResource DefaultTreeView}" ItemsSource="{Binding TreeDataSource}">
@@ -114,8 +101,8 @@
Command="{Binding CheckCommand}"
CommandParameter="{Binding Path=IsChecked,RelativeSource={RelativeSource Mode=Self}}"
/>
- <Image Width="{StaticResource ContentFontSize}"
- Height="{StaticResource ContentFontSize}" Margin="5" Source="{Binding MenuIcon,Converter={StaticResource path2Image},Mode=OneWay}"/>
+ <!--<Image Width="{StaticResource ContentFontSize}"
+ Height="{StaticResource ContentFontSize}" Margin="5" Source="{Binding MenuIcon,Converter={StaticResource path2Image},Mode=OneWay}"/>-->
<TextBlock VerticalAlignment="Center" Text="{Binding MenuName}"/>
</StackPanel>
</HierarchicalDataTemplate>
--
Gitblit v1.9.1