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 并发验证用例

---
 WPFProject/PanuonWindow.xaml |   40 +++++++++++++++++++++++++---------------
 1 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/WPFProject/PanuonWindow.xaml b/WPFProject/PanuonWindow.xaml
index b783a52..32a9107 100644
--- a/WPFProject/PanuonWindow.xaml
+++ b/WPFProject/PanuonWindow.xaml
@@ -23,23 +23,10 @@
             Title="TestPlatform"
             pu:WindowXCaption.Background="Transparent"
             pu:WindowXCaption.Height="60"
-            IsOverlayerVisible="True"
             pu:WindowXCaption.Foreground="#FFF">
     <Window.Resources>
         <hc:LangConverter x:Key="lc"/>
         <dc:CollectionVisibility x:Key="cv"/>
-        <Style x:Key="UserMenu" TargetType="Menu" BasedOn="{StaticResource {x:Static pu:StyleKeys.MenuStyle}}">
-            <Setter Property="Background" Value="{StaticResource PrimaryColor}"/>
-            <Setter Property="Foreground" Value="#FFF"/>
-            <Setter Property="pu:IconHelper.FontFamily" Value="{StaticResource iconfont}"/>
-            <Setter Property="pu:IconHelper.Margin" Value="0,0,10,0"/>
-            <Setter Property="BorderThickness" Value="0"/>
-            <Setter Property="Cursor" Value="Hand"/>
-            <Setter Property="pu:MenuHelper.SubmenuItemsForeground" Value="#3a3a3a"/>
-            <Setter Property="pu:MenuHelper.SubmenuItemsBackground" Value="White"/>
-            <Setter Property="pu:MenuHelper.TopLevelItemsHoverBackground" Value="{x:Null}"/>
-            <Setter Property="pu:MenuHelper.TopLevelDropDownPlacement" Value="BottomLeft"/>
-        </Style>
     </Window.Resources>
     <Window.Background>
         <ImageBrush Stretch="Uniform" AlignmentX="Left" AlignmentY="Top"  
@@ -71,7 +58,30 @@
                     </Grid.RowDefinitions>
                     <StackPanel Grid.Row="0" VerticalAlignment="Top" Margin="10,10,0,0" Orientation="Horizontal">
                         <Menu Margin="0" Padding="0" VerticalAlignment="Top"
-  VerticalContentAlignment="Center" Style="{StaticResource UserMenu}" Background="Transparent">
+  VerticalContentAlignment="Center" Background="Transparent">
+                            <Menu.Resources>
+                                <ResourceDictionary>
+                                    <ResourceDictionary.MergedDictionaries>
+                                        <pu:StyleDictionary Includes="Menu" />
+                                    </ResourceDictionary.MergedDictionaries>
+                                </ResourceDictionary>
+                            </Menu.Resources>
+                            <Menu.Style>
+                                <Style TargetType="Menu" BasedOn="{StaticResource {x:Static pu:StyleKeys.MenuStyle}}">
+                                    <Setter Property="Background" Value="{StaticResource PrimaryColor}"/>
+                                    <Setter Property="Foreground" Value="#FFF"/>
+                                    <Setter Property="pu:IconHelper.FontFamily" Value="{StaticResource iconfont}"/>
+                                    <Setter Property="pu:IconHelper.Margin" Value="0,0,10,0"/>
+                                    <Setter Property="BorderThickness" Value="0"/>
+                                    <Setter Property="Cursor" Value="Hand"/>
+                                    <Setter Property="pu:MenuHelper.SubmenuItemsForeground" Value="#3a3a3a"/>
+                                    <Setter Property="pu:MenuHelper.SubmenuItemsBackground" Value="White"/>
+                                    <Setter Property="pu:MenuHelper.TopLevelItemsHoverBackground" Value="{x:Null}"/>
+                                    <Setter Property="pu:MenuHelper.TopLevelDropDownPlacement" Value="BottomLeft"/>
+                                </Style>
+                            </Menu.Style>
+
+
                             <MenuItem x:Name="userMenu" Header="{Binding WelcomeTitle}" FontSize="16">
                                 <MenuItem Icon="&#xe61d;" Cursor="Hand" FontSize="14" Header="閫�鍑虹櫥褰�" 
                                       x:Name="MiLogout" Click="MenuItem_Click"/>
@@ -135,7 +145,7 @@
     HorizontalContentAlignment="Left" Style="{StaticResource LinkButton}"
     Click="Clear_AllAlarm_Click"
     Content="娓呴櫎鍏ㄩ儴鎶ヨ"/>
-                        <!--<local:ResourceUI x:Name="resourceUI" Loaded="resourceUI_Loaded" DockPanel.Dock="Right"/>--> 
+                        <!--<local:ResourceUI x:Name="resourceUI" Loaded="resourceUI_Loaded" DockPanel.Dock="Right"/>-->
                     </DockPanel>
                 </Grid>
 

--
Gitblit v1.9.1