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.UI/Themes/Generic.xaml | 46 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/HMI.UI/Themes/Generic.xaml b/HMI.UI/Themes/Generic.xaml
index e77a351..9c06e9b 100644
--- a/HMI.UI/Themes/Generic.xaml
+++ b/HMI.UI/Themes/Generic.xaml
@@ -29,10 +29,13 @@
<Ellipse Height="{TemplateBinding Size}" Width="{TemplateBinding Size}" VerticalAlignment="Center">
<Ellipse.Style>
<Style TargetType="Ellipse">
- <Setter Property="Fill" Value="{StaticResource RedLight}"/>
+ <Setter Property="Fill" Value="Gray"/>
<Style.Triggers>
<DataTrigger Binding="{Binding Value,RelativeSource={RelativeSource Mode=TemplatedParent}}" Value="True">
<Setter Property="Fill" Value="{StaticResource GreenLight}"/>
+ </DataTrigger>
+ <DataTrigger Binding="{Binding Value,RelativeSource={RelativeSource Mode=TemplatedParent}}" Value="False">
+ <Setter Property="Fill" Value="{StaticResource RedLight}"/>
</DataTrigger>
</Style.Triggers>
</Style>
@@ -85,7 +88,7 @@
TextWrapping="NoWrap" Padding="0" VerticalAlignment="Center"
Text="{Binding Path=Value, RelativeSource={RelativeSource TemplatedParent}}"/>
</Border>
- <TextBox x:Name="PART_TextBoxPart" BorderThickness="0" Padding="0"
+ <TextBox x:Name="PART_TextBoxPart" BorderThickness="1" Padding="0" Background="#FFF"
FontSize="{TemplateBinding FontSize}" Visibility="Collapsed"
Text="{Binding Path=Value, RelativeSource={RelativeSource TemplatedParent}}"/>
</Grid>
@@ -142,4 +145,43 @@
</Setter.Value>
</Setter>
</Style>
+
+ <Style TargetType="{x:Type local:ScrollLabel}">
+ <Setter Property="Template">
+ <Setter.Value>
+ <ControlTemplate TargetType="{x:Type local:ScrollLabel}">
+ <ScrollViewer Name="slv" IsHitTestVisible="False" Width="{TemplateBinding Width}"
+ VerticalScrollBarVisibility="Hidden"
+ BorderThickness="0"
+ HorizontalScrollBarVisibility="Hidden">
+ <Label x:Name="label" Content="{Binding Path=Value, RelativeSource={RelativeSource TemplatedParent}}"
+ VerticalContentAlignment="Center"
+ BorderThickness="0"
+ Foreground="{TemplateBinding Foreground}"
+ Padding="{TemplateBinding Padding}"
+ Margin="{TemplateBinding Margin}"
+ HorizontalContentAlignment="Left" FontSize="{TemplateBinding FontSize}">
+ <!--<Label.Triggers>
+ <EventTrigger RoutedEvent="Label.Loaded">
+ <BeginStoryboard HandoffBehavior="Compose">
+ <Storyboard>
+ <DoubleAnimation From="0"
+ To="{Binding ElementName=slv,Path=ScrollableWidth}"
+ Duration="0:0:3"
+ Storyboard.TargetName="slv"
+ AutoReverse="True"
+ RepeatBehavior="Forever"
+ BeginTime="0:0:0.2"
+ Storyboard.TargetProperty="(local:ScrollViewerBehavior.HorizontalOffset)">
+ </DoubleAnimation>
+ </Storyboard>
+ </BeginStoryboard>
+ </EventTrigger>
+ </Label.Triggers>-->
+ </Label>
+ </ScrollViewer>
+ </ControlTemplate>
+ </Setter.Value>
+ </Setter>
+ </Style>
</ResourceDictionary>
\ No newline at end of file
--
Gitblit v1.9.1