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/ParameterManage.xaml | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/HMI.ParameterManage/ParameterManage.xaml b/HMI.ParameterManage/ParameterManage.xaml
index d2e3d5e..bdf5ca9 100644
--- a/HMI.ParameterManage/ParameterManage.xaml
+++ b/HMI.ParameterManage/ParameterManage.xaml
@@ -13,14 +13,9 @@
mc:Ignorable="d"
Padding="10"
Loaded="UserControl_Loaded"
- Background="{StaticResource WorkspaceBackground}"
+ Background="{DynamicResource WorkspaceBackground}"
d:DesignHeight="450" d:DesignWidth="800">
<UserControl.Resources>
- <!--<ResourceDictionary>
- <ResourceDictionary.MergedDictionaries>
- <ResourceDictionary Source="/HMI.UI;component/Style/PanuonDataGrid.xaml"/>
- </ResourceDictionary.MergedDictionaries>
- </ResourceDictionary>-->
<CollectionViewSource x:Key="GroupFilter" Source="{Binding Parameters}">
<CollectionViewSource.GroupDescriptions>
<PropertyGroupDescription PropertyName="ShowGroup" />
@@ -143,7 +138,7 @@
</DataGrid.GroupStyle>
<DataGrid.Columns>
- <DataGridTemplateColumn Header="" Width="Auto" CanUserResize="False">
+ <DataGridTemplateColumn Width="Auto" CanUserResize="False">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<CheckBox VerticalAlignment="Center"
@@ -152,7 +147,7 @@
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
- <DataGridTextColumn Header="#" Binding="{Binding Converter={StaticResource rowNumber},
+ <DataGridTextColumn Header="#" Width="40" Binding="{Binding Converter={StaticResource rowNumber},
RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow},AncestorLevel=1}}"
CanUserResize="False"/>
<DataGridTextColumn Width="150" Binding="{Binding Name}">
@@ -175,7 +170,7 @@
<TextBlock Text="{DynamicResource Pm.Parameter.Unit}"/>
</DataGridTextColumn.Header>
</DataGridTextColumn>
- <DataGridTextColumn Width="120" Binding="{Binding Description}">
+ <DataGridTextColumn Width="*" Binding="{Binding Description}">
<DataGridTextColumn.Header>
<TextBlock Text="{DynamicResource Pm.Parameter.Desc}"/>
</DataGridTextColumn.Header>
--
Gitblit v1.9.1