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/MenuManage.xaml | 125 +++++++++++++++++++++++------------------
1 files changed, 69 insertions(+), 56 deletions(-)
diff --git a/HMI.MenuManage/MenuManage.xaml b/HMI.MenuManage/MenuManage.xaml
index 3d0f51a..ed3021b 100644
--- a/HMI.MenuManage/MenuManage.xaml
+++ b/HMI.MenuManage/MenuManage.xaml
@@ -3,53 +3,43 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:hb="clr-namespace:HMI.Base;assembly=HMI.Base"
xmlns:local="clr-namespace:HMI.MenuManage"
+ xmlns:hb="clr-namespace:HMI.Base;assembly=HMI.Base"
xmlns:uic="clr-namespace:HMI.UI.Converter;assembly=HMI.UI"
xmlns:pw="https://opensource.panuon.com/wpf"
xmlns:pu="https://opensource.panuon.com/wpf-ui"
xmlns:dp="clr-namespace:HMI.UI;assembly=HMI.UI"
+ xmlns:cc="clr-namespace:HMI.Core;assembly=HMI.Core"
mc:Ignorable="d"
Padding="10"
Loaded="DataGrid_Loaded"
- Background="{StaticResource WorkspaceBackground}"
+ Background="{DynamicResource WorkspaceBackground}"
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="7*"/>
- <ColumnDefinition Width="3*"/>
+ <ColumnDefinition Width="8*"/>
+ <ColumnDefinition Width="2*"/>
</Grid.ColumnDefinitions>
<Border Style="{StaticResource CardBoarder}" Margin="0,0,2,0">
<StackPanel>
<DockPanel Margin="0,0,0,10">
- <Button DockPanel.Dock="Right" pu:ButtonHelper.Icon=""
- x:Name="deleteBatchBtn"
- Style="{StaticResource DangerButton}" Click="Button_Click" Cursor="Hand">鍒犻櫎</Button>
- <Button DockPanel.Dock="Right" Style="{StaticResource PrimaryButton}"
-pu:IconHelper.FontFamily="{StaticResource iconfont}"
-pu:ButtonHelper.Icon="" Margin="0,0,10,0" x:Name="refreshBtn" Click="Button_Click">鍒锋柊</Button>
- <Button DockPanel.Dock="Right" Style="{StaticResource PrimaryButton}"
- pu:IconHelper.FontFamily="{StaticResource iconfont}"
- 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.Menu.Title}"/>
</DockPanel>
- <DataGrid Grid.Column="1" x:Name="table" Style="{StaticResource DefaultDataGrid}" ItemsSource="{Binding DataSource}">
+ <DataGrid Grid.Column="1" x:Name="table" Style="{StaticResource DefaultDataGrid}"
+ ItemsSource="{Binding DataSource}">
<DataGrid.Columns>
<DataGridTemplateColumn Header="" Width="Auto" CanUserResize="False">
<DataGridTemplateColumn.CellTemplate>
@@ -66,40 +56,63 @@
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
- <DataGridTextColumn Binding="{Binding Code}" Header="鑿滃崟缂栧彿" />
- <DataGridTextColumn Binding="{Binding Name}" Header="鑿滃崟鍚嶇О" />
- <DataGridTextColumn Binding="{Binding Level}" Header="绛夌骇" />
- <DataGridTextColumn Binding="{Binding Type}" Header="绫诲瀷" />
- <DataGridTextColumn Binding="{Binding Name}" Header="鑿滃崟鍚嶇О" />
- <DataGridTextColumn Binding="{Binding ParentCode}" Header="鐖惰彍鍗曠紪鍙�" />
- <DataGridTextColumn Binding="{Binding ParentName}" Header="鐖惰彍鍗曞悕绉�" />
- <DataGridTextColumn Width="*" Binding="{Binding DllPath}" Header="Dll璺緞" />
- <DataGridTextColumn Width="*" Binding="{Binding ClassName}" Header="绫诲悕" />
- <DataGridTemplateColumn Header="鎿嶄綔" Width="100" IsReadOnly="True" CanUserResize="False">
+ <DataGridTextColumn Binding="{Binding Code}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{DynamicResource HMI.Menu.Code}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
+
+ <DataGridTextColumn Binding="{Binding Name}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{DynamicResource HMI.Menu.Name}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
+ <DataGridTextColumn Binding="{Binding Level}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{DynamicResource HMI.Menu.Level}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
+ <DataGridTextColumn Binding="{Binding Type}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{DynamicResource HMI.Menu.Type}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
+ <!--<DataGridTextColumn Binding="{Binding ParentCode}" Header="{DynamicResource HMI.Menu.ParentCode}"/>-->
+
+ <DataGridTextColumn Binding="{Binding ParentName}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{DynamicResource HMI.Menu.ParentName}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
+ <DataGridTextColumn Width="*" Binding="{Binding DllPath}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{DynamicResource HMI.Menu.DllPath}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
+ <DataGridTextColumn Width="*" Binding="{Binding ClassName}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{DynamicResource HMI.Menu.ClassName}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
+ <DataGridTextColumn Width="50" Binding="{Binding Sort}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{DynamicResource HMI.Menu.Sort}"/>
+ </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}"
- Margin="0,0,10,0"
- Click="Button_Click"
- DataContext="{Binding }">缂栬緫</Button>
- <Button x:Name="delBtn" Style="{StaticResource DangerLinkButton}"
+ <Button x:Name="editBtn" Style="{StaticResource EditLink}"
+ Click="Button_Click" Margin="0,0,10,0"
+ 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>
@@ -112,7 +125,7 @@
<StackPanel>
<DockPanel Margin="0,0,0,10" >
<TextBlock DockPanel.Dock="Left" FontSize="{StaticResource TitleFontSize}"
- VerticalAlignment="Center" HorizontalAlignment="Left" Text="鑿滃崟缁撴瀯"/>
+ VerticalAlignment="Center" HorizontalAlignment="Left" Text="{DynamicResource HMI.Menu.TreeTitle}"/>
</DockPanel>
<TreeView x:Name="treeViewer" Style="{StaticResource DefaultTreeView}" ItemsSource="{Binding TreeDataSource}"
--
Gitblit v1.9.1