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/UserManage.xaml | 101 +++++++++++++++++++++++++++-----------------------
1 files changed, 55 insertions(+), 46 deletions(-)
diff --git a/HMI.MenuManage/UserManage.xaml b/HMI.MenuManage/UserManage.xaml
index 38551b9..3388d6b 100644
--- a/HMI.MenuManage/UserManage.xaml
+++ b/HMI.MenuManage/UserManage.xaml
@@ -9,20 +9,10 @@
xmlns:pw="https://opensource.panuon.com/wpf"
xmlns:pu="https://opensource.panuon.com/wpf-ui"
mc:Ignorable="d"
- Background="{StaticResource WorkspaceBackground}"
+ Background="{DynamicResource WorkspaceBackground}"
Padding="10"
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>
@@ -32,15 +22,21 @@
<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}"
- x:Name="deleteBatchBtn" Click="Button_Click">鍒犻櫎</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 ExportBtn}"
+Margin="0,0,10,0" x:Name="exportBtn" Click="Button_Click"/>
+
+ <Button DockPanel.Dock="Right" Style="{StaticResource ImportBtn}"
+ Margin="0,0,10,0" x:Name="importBtn" 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.User.Title}"/>
</DockPanel>
<DataGrid Grid.Column="1" x:Name="table" Style="{StaticResource DefaultDataGrid}"
@@ -62,35 +58,37 @@
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
- <DataGridTextColumn Width="*" Binding="{Binding Username}" Header="璐﹀彿" />
- <DataGridTextColumn Width="*" Binding="{Binding Name}" Header="鐢ㄦ埛鍚嶇О" />
+ <DataGridTextColumn Width="*" Binding="{Binding Code}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{DynamicResource HMI.User.Code}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
+ <DataGridTextColumn Width="*" Binding="{Binding Username}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{DynamicResource HMI.User.Account}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
+ <DataGridTextColumn Width="*" Binding="{Binding Name}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{DynamicResource HMI.User.RealName}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
<!--<DataGridTextColumn Width="*" Binding="{Binding RoleCode}" Header="瑙掕壊缂栧彿" />
<DataGridTextColumn Width="*" Binding="{Binding RoleName}" Header="瑙掕壊鍚嶇О" />-->
- <DataGridTemplateColumn Header="鎿嶄綔" Width="100" IsReadOnly="True" CanUserResize="False">
+ <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}" Margin="0,0,10,0"
+ <Button x:Name="editBtn" Style="{StaticResource EditLink}" Margin="0,0,10,0"
DataContext="{Binding }"
- Click="Button_Click">缂栬緫</Button>
- <Button x:Name="delBtn" Style="{StaticResource DangerLinkButton}"
+ Click="Button_Click"/>
+ <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>
@@ -102,16 +100,19 @@
<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="saveRoleBtn" Click="Button_Click" pu:ButtonHelper.Icon="" Content="淇濆瓨"/>
+ <Button DockPanel.Dock="Right" Style="{StaticResource SaveBtn}"
+ x:Name="saveRoleBtn" Click="Button_Click"/>
<TextBlock DockPanel.Dock="Left" FontSize="{StaticResource TitleFontSize}"
- VerticalAlignment="Center" HorizontalAlignment="Left" Text="鐢ㄦ埛瑙掕壊"/>
+ VerticalAlignment="Center" HorizontalAlignment="Left" Text="{DynamicResource HMI.User.Role}"/>
</DockPanel>
<DataGrid x:Name="roleTable" Style="{StaticResource DefaultDataGrid}" SelectionMode="Single"
ItemsSource="{Binding Roles}">
<DataGrid.Columns>
- <DataGridTemplateColumn Header="鎺堜簣" Width="Auto" CanUserResize="False">
+ <DataGridTemplateColumn Width="Auto" CanUserResize="False">
+ <DataGridTemplateColumn.Header>
+ <TextBlock Text="{DynamicResource App.Granted}"/>
+ </DataGridTemplateColumn.Header>
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<CheckBox VerticalAlignment="Center"
@@ -123,8 +124,16 @@
<DataGridTextColumn Header="#" Binding="{Binding Converter={StaticResource rowNumber},
RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow},AncestorLevel=1}}"
CanUserResize="False"/>
- <DataGridTextColumn Width="*" Binding="{Binding RoleCode}" Header="瑙掕壊缂栧彿" />
- <DataGridTextColumn Width="*" Binding="{Binding RoleName}" Header="瑙掕壊鍚嶇О" />
+ <DataGridTextColumn Width="*" Binding="{Binding RoleCode}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{DynamicResource HMI.Role.Code}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
+ <DataGridTextColumn Width="*" Binding="{Binding RoleName}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{DynamicResource HMI.Role.Name}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
</DataGrid.Columns>
</DataGrid>
--
Gitblit v1.9.1