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 并发验证用例
---
Plugin.DOControl/DOControl.xaml | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Plugin.DOControl/DOControl.xaml b/Plugin.DOControl/DOControl.xaml
index 2df075e..7f4dc1c 100644
--- a/Plugin.DOControl/DOControl.xaml
+++ b/Plugin.DOControl/DOControl.xaml
@@ -3,15 +3,15 @@
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:Plugin.DOControl"
+ mc:Ignorable="d"
+ 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.DpUtil;assembly=HMI.UI"
- mc:Ignorable="d"
Loaded="UserControl_Loaded"
- Background="{StaticResource WorkspaceBackground}"
+ Background="{DynamicResource WorkspaceBackground}"
d:DesignHeight="450" d:DesignWidth="800">
<UserControl.Resources>
<ResourceDictionary>
@@ -20,8 +20,8 @@
</ResourceDictionary.MergedDictionaries>
<Style TargetType="GroupBox" BasedOn="{StaticResource {x:Static pu:StyleKeys.GroupBoxStyle}}">
- <Setter Property="pu:GroupBoxHelper.HeaderBackground" Value="{StaticResource ReHoriBar}"/>
- <Setter Property="pu:GroupBoxHelper.HeaderForeground" Value="{StaticResource PrimaryColorContract}"/>
+ <Setter Property="pu:GroupBoxHelper.HeaderBackground" Value="{DynamicResource ReHoriBar}"/>
+ <Setter Property="pu:GroupBoxHelper.HeaderForeground" Value="{DynamicResource PrimaryColorContract}"/>
<Setter Property="pu:GroupBoxHelper.HeaderFontWeight" Value="Bold"/>
</Style>
</ResourceDictionary>
@@ -67,7 +67,7 @@
<Setter Property="Cursor" Value="Hand"/>
<Setter Property="FontWeight" Value="Bold"/>
- <Setter Property="Background" Value="{StaticResource PrimaryColor}"/>
+ <Setter Property="Background" Value="{DynamicResource PrimaryColor}"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="ListBoxItem">
@@ -81,13 +81,13 @@
<ControlTemplate.Triggers>
<Trigger Property="IsSelected" Value="True">
<Setter Property="Background" TargetName="border"
- Value="{StaticResource ReHoriBar}"/>
+ Value="{DynamicResource ReHoriBar}"/>
<Setter Property="Foreground" Value="White"/>
</Trigger>
<Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="border" Property="Background" Value="#7093d3" />
- <Setter Property="Foreground" Value="{StaticResource SecondPrimaryColorContract}" />
+ <Setter Property="Foreground" Value="{DynamicResource SecondPrimaryColorContract}" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
--
Gitblit v1.9.1