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.ParameterManage/TestItem.xaml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/HMI.ParameterManage/TestItem.xaml b/HMI.ParameterManage/TestItem.xaml
index a26e373..70d67a5 100644
--- a/HMI.ParameterManage/TestItem.xaml
+++ b/HMI.ParameterManage/TestItem.xaml
@@ -10,15 +10,15 @@
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"
- Background="{StaticResource WorkspaceBackground}"
+ Background="{DynamicResource WorkspaceBackground}"
Loaded="PluginControl_Loaded"
d:DesignHeight="450" d:DesignWidth="800">
<UserControl.Resources>
- <ResourceDictionary>
+ <!--<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="/HMI.UI;component/Style/PanuonDataGrid.xaml"/>
</ResourceDictionary.MergedDictionaries>
- </ResourceDictionary>
+ </ResourceDictionary>-->
</UserControl.Resources>
<Border Style="{StaticResource CardBoarder}">
<Grid dp:GridHelper.Space="10">
@@ -68,7 +68,7 @@
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="8*"/>
</Grid.ColumnDefinitions>
- <Border Grid.Column="0" BorderThickness="2,2,0,2" BorderBrush="{StaticResource CommonBoarder}">
+ <Border Grid.Column="0" BorderThickness="2,2,0,2" BorderBrush="{DynamicResource CommonBoarder}">
<DataGrid Style="{StaticResource DefaultDataGrid}"
ItemsSource="{Binding Products}"
SelectedItem="{Binding SelectedProduct}">
@@ -89,7 +89,7 @@
</DataGrid.Columns>
</DataGrid>
</Border>
- <Border Grid.Column="1" BorderThickness="2" BorderBrush="{StaticResource CommonBoarder}">
+ <Border Grid.Column="1" BorderThickness="2" BorderBrush="{DynamicResource CommonBoarder}">
<DataGrid Style="{StaticResource DefaultDataGrid}" ItemsSource="{Binding TestItems}">
<DataGrid.Columns>
<DataGridTemplateColumn Header="" Width="Auto" CanUserResize="False">
--
Gitblit v1.9.1