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/Style/BaseWindow.xaml | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/HMI.UI/Style/BaseWindow.xaml b/HMI.UI/Style/BaseWindow.xaml
index 340ee2e..f4c2183 100644
--- a/HMI.UI/Style/BaseWindow.xaml
+++ b/HMI.UI/Style/BaseWindow.xaml
@@ -3,7 +3,6 @@
xmlns:ui="clr-namespace:HMI.UI"
x:Class="HMI.UI.BaseWindowTemplate">
<ResourceDictionary.MergedDictionaries>
- <ResourceDictionary Source="/HMI.UI;component/Style/Colors.xaml"/>
<ResourceDictionary Source="/HMI.UI;component/Resources/Font/Font.xaml"/>
<ResourceDictionary Source="/HMI.UI;component/Style/WindowResources.xaml"/>
</ResourceDictionary.MergedDictionaries>
@@ -26,7 +25,7 @@
<RowDefinition/>
</Grid.RowDefinitions>
- <Grid Grid.Row="0" Background="{StaticResource MainBorder}">
+ <Grid Grid.Row="0" Background="{DynamicResource PrimaryColor}">
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition Width="Auto"/>
--
Gitblit v1.9.1