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/Controls/MainTabControl.xaml | 48 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 40 insertions(+), 8 deletions(-)
diff --git a/WPFProject/Controls/MainTabControl.xaml b/WPFProject/Controls/MainTabControl.xaml
index 2950b42..d48c9c8 100644
--- a/WPFProject/Controls/MainTabControl.xaml
+++ b/WPFProject/Controls/MainTabControl.xaml
@@ -159,7 +159,7 @@
<DockPanel Background="Transparent">
<Border DockPanel.Dock="Left" BorderThickness="1,1,0,1" Background="Transparent" BorderBrush="{StaticResource PrimaryColor}" Width="50"></Border>
<ListBox DockPanel.Dock="Left" Grid.Row="0" x:Name="Menu"
- Style="{StaticResource ListBoxItemStyle1}" FontSize="16"
+ Style="{StaticResource ListBoxItemStyle1}" FontSize="14"
BorderBrush="{StaticResource PrimaryColor}"
BorderThickness="1"
SelectionChanged="Menu_SelectionChanged"
@@ -180,19 +180,51 @@
Style="{StaticResource ListBoxItemStyle2}"
BorderBrush="Gray"
Visibility="{Binding MenuVisibility}"
- SelectedItem="{Binding SelectedSubMenu}" AlternationCount="{Binding SubMenuItems.Count}"
- SelectionChanged="SubMenu_SelectionChanged"
-BorderThickness="0" ItemsSource="{Binding SubMenuItems}" >
+ SelectedItem="{Binding SelectedSubMenu,Mode=OneWay}" AlternationCount="{Binding SubMenuItems.Count}"
+ SelectionChanged="SubMenu_SelectionChanged" BorderThickness="0" ItemsSource="{Binding SubMenuItems}" >
</ListBox>
</DockPanel>
</Border>
-
-
-
-
<Border x:Name="page" Grid.Row="2" BorderThickness="0" Margin="0" Background="White" Padding="0">
</Border>
+
+ <Border Height="80" Grid.Row="2" Background="Red" Visibility="Collapsed" VerticalAlignment="Top" x:Name="alarmBorder">
+ <Border.Style>
+ <Style TargetType="Border">
+ <Style.Triggers>
+ <Trigger Property="Visibility" Value="Visible">
+ <Trigger.EnterActions>
+ <BeginStoryboard>
+ <Storyboard>
+ <ColorAnimation Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)"
+ From="#ff2100"
+ To="#fe7975"
+ Duration="0:0:0.7"
+ AutoReverse="True"
+ RepeatBehavior="Forever"/>
+ </Storyboard>
+ </BeginStoryboard>
+ </Trigger.EnterActions>
+ </Trigger>
+ </Style.Triggers>
+ </Style>
+ </Border.Style>
+
+ <DockPanel>
+ <Button DockPanel.Dock="Right"
+ FontSize="25"
+ FontWeight="Bold"
+ Margin="0,10,10,0"
+ VerticalAlignment="Top"
+ Click="Button_Click_1"
+ FontFamily="{StaticResource iconfont}" Background="Transparent" Content=""/>
+
+ <Label Margin="10,0,0,0" FontSize="25" FontWeight="Bold"
+ VerticalAlignment="Center" Content="{Binding AlarmInfo}"/>
+
+ </DockPanel>
+ </Border>
</Grid>
</UserControl>
--
Gitblit v1.9.1