From d8e8e61e7e9336a4b38a2a1846cfd3cbec637f86 Mon Sep 17 00:00:00 2001
From: "GukSang.Jin" <guksang_chen@163.com>
Date: Sun, 5 Apr 2026 17:04:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EngineeringRegistersWindow.xaml               | 15 ++++++++++-----
 Cardiopulmonarybypasssystems/MainWindow.xaml      |  4 ++--
 .../manufacturer-limits.json                      |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Cardiopulmonarybypasssystems/EngineeringRegistersWindow.xaml b/Cardiopulmonarybypasssystems/EngineeringRegistersWindow.xaml
index 1d78eaa..56e588a 100644
--- a/Cardiopulmonarybypasssystems/EngineeringRegistersWindow.xaml
+++ b/Cardiopulmonarybypasssystems/EngineeringRegistersWindow.xaml
@@ -26,14 +26,19 @@
                             MouseLeftButtonDown="CloseHotspot_OnMouseLeftButtonDown"
                             MouseLeftButtonUp="CloseHotspot_OnMouseLeftButtonUp"
                             MouseLeave="CloseHotspot_OnMouseLeave" />
-                    <TextBlock FontSize="20" FontWeight="Bold" Foreground="White" Text="工程寄存器" />
+                    <TextBlock FontSize="20"
+                               FontWeight="Bold"
+                               Foreground="White"
+                               Text="工程寄存器" />
                     <TextBlock Margin="0,6,0,0"
                                FontSize="12"
                                Foreground="#EFFAFC"
-                               Text="长按左上角空白区可关闭弹窗。D1330 / D1380 为只读显示值；其余地址支持读写，写入后自动回读并刷新实时值。"
+                               Text="长按左上角空白区可关闭窗口。D1330 / D1380 为只读显示值；其余地址支持读写，写入后自动回读并刷新。"
                                TextWrapping="Wrap" />
                 </StackPanel>
-                <StackPanel DockPanel.Dock="Right" Orientation="Horizontal" VerticalAlignment="Center">
+                <StackPanel DockPanel.Dock="Right"
+                            Orientation="Horizontal"
+                            VerticalAlignment="Center">
                     <Button Padding="12,6"
                             Command="{Binding RefreshEngineeringRegistersCommand}"
                             Content="刷新寄存器"
@@ -62,7 +67,7 @@
                         <DataGridTextColumn Header="名称" Binding="{Binding Name}" IsReadOnly="True" Width="180" />
                         <DataGridTextColumn Header="地址" Binding="{Binding AddressDisplay}" IsReadOnly="True" Width="80" />
                         <DataGridTextColumn Header="权限" Binding="{Binding AccessDisplay}" IsReadOnly="True" Width="80" />
-                        <DataGridTemplateColumn Header="当前值 / 写入值" Width="200">
+                        <DataGridTemplateColumn Header="写入值" Width="200">
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
                                     <Grid>
@@ -75,7 +80,7 @@
                                 </DataTemplate>
                             </DataGridTemplateColumn.CellTemplate>
                         </DataGridTemplateColumn>
-                        <DataGridTextColumn Header="PLC 当前值" Binding="{Binding CurrentValue}" IsReadOnly="True" Width="140" />
+                        <DataGridTextColumn Header="当前值" Binding="{Binding CurrentValue}" IsReadOnly="True" Width="140" />
                         <DataGridTextColumn Header="状态" Binding="{Binding StatusText}" IsReadOnly="True" Width="120" />
                         <DataGridTemplateColumn Header="操作" Width="100">
                             <DataGridTemplateColumn.CellTemplate>
diff --git a/Cardiopulmonarybypasssystems/MainWindow.xaml b/Cardiopulmonarybypasssystems/MainWindow.xaml
index 86531ec..ebf0dda 100644
--- a/Cardiopulmonarybypasssystems/MainWindow.xaml
+++ b/Cardiopulmonarybypasssystems/MainWindow.xaml
@@ -1972,7 +1972,7 @@
                                                 <TextBlock Margin="8,6,8,0" Text="/" />
                                                 <TextBox Width="80" Text="{Binding Rs485WriteTimeoutMs, UpdateSourceTrigger=PropertyChanged}" />
                                             </StackPanel>
-                                            <StackPanel Grid.Row="2" Grid.Column="2" Grid.ColumnSpan="2" Orientation="Horizontal">
+                                            <WrapPanel Grid.Row="2" Grid.Column="2" Grid.ColumnSpan="2" Margin="0,2,0,0">
                                                 <CheckBox Margin="0,4,16,0"
                                                           IsChecked="{Binding Rs485AutoSwitchPresetMode, UpdateSourceTrigger=PropertyChanged}"
                                                           Content="写入时自动切到 485 预设速度模式" />
@@ -1986,7 +1986,7 @@
                                                            VerticalAlignment="Center"
                                                            Style="{StaticResource CaptionStyle}"
                                                            Text="8 泵启停固定由伺服器 RS485 主控" />
-                                            </StackPanel>
+                                            </WrapPanel>
                                         </Grid>
                                         <TextBlock Margin="0,10,0,0"
                                                    Style="{StaticResource CaptionStyle}"
diff --git a/Cardiopulmonarybypasssystems/manufacturer-limits.json b/Cardiopulmonarybypasssystems/manufacturer-limits.json
index 2a6e268..9ad6771 100644
--- a/Cardiopulmonarybypasssystems/manufacturer-limits.json
+++ b/Cardiopulmonarybypasssystems/manufacturer-limits.json
@@ -159,4 +159,4 @@
       "MaxFlowLpm": 7
     }
   ]
-}
+}
\ No newline at end of file