From 15bbd62b0b24b72c717ae91ab45348a2083ad04e Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期五, 10 十月 2025 08:58:18 +0800
Subject: [PATCH] 优化bug;

---
 HMI.UI/Style/PanuonDataGrid.xaml |   31 ++++++++++++++++---------------
 1 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/HMI.UI/Style/PanuonDataGrid.xaml b/HMI.UI/Style/PanuonDataGrid.xaml
index 4260135..c2d9930 100644
--- a/HMI.UI/Style/PanuonDataGrid.xaml
+++ b/HMI.UI/Style/PanuonDataGrid.xaml
@@ -18,7 +18,15 @@
 
     <Style x:Key="DefaultDataGridRow" TargetType="DataGridRow" BasedOn="{StaticResource {x:Static pu:StyleKeys.DataGridRowStyle}}">
         <Setter Property="Background" Value="White"/>
-        <Setter Property="DetailsVisibility" Value="Collapsed"/>
+        <Setter Property="HeaderStyle">
+            <Setter.Value>
+                <Style TargetType="DataGridColumnHeader" 
+       BasedOn="{StaticResource {x:Static pu:StyleKeys.DataGridColumnHeaderStyle}}">
+                    <Setter Property="Padding" Value="10"/>
+                    <Setter Property="BorderThickness" Value="0"/>
+                </Style>
+            </Setter.Value>
+        </Setter>
         <Style.Triggers>
             <Trigger Property="AlternationIndex" Value="1">
                 <Setter Property="Background" Value="#eeeeee"/>
@@ -26,22 +34,15 @@
         </Style.Triggers>
     </Style>
 
-
-    <Style TargetType="DataGridCell" 
-       BasedOn="{StaticResource {x:Static pu:StyleKeys.DataGridCellStyle}}">
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="Padding" Value="5"/>
-        <Setter Property="Margin" Value="0"/>
-        <Setter Property="BorderThickness" Value="0"/>
-        <Setter Property="VerticalAlignment" Value="Stretch"/>
-    </Style>
-
     <Style x:Key="DefaultDataGrid" TargetType="DataGrid" BasedOn="{StaticResource {x:Static pu:StyleKeys.DataGridStyle}}">
         <Style.Resources>
-            <Style TargetType="DataGridColumnHeader" 
-       BasedOn="{StaticResource {x:Static pu:StyleKeys.DataGridColumnHeaderStyle}}">
-                <Setter Property="Padding" Value="10"/>
+            <Style TargetType="DataGridCell" 
+                   BasedOn="{StaticResource {x:Static pu:StyleKeys.DataGridCellStyle}}">
+                <Setter Property="Background" Value="Transparent"/>
+                <Setter Property="Padding" Value="5"/>
+                <Setter Property="Margin" Value="0"/>
                 <Setter Property="BorderThickness" Value="0"/>
+                <Setter Property="VerticalAlignment" Value="Stretch"/>
             </Style>
         </Style.Resources>
 
@@ -51,7 +52,7 @@
         <Setter Property="pu:DataGridHelper.ColumnHeaderPadding" Value="0"/>
         <Setter Property="ForceCursor" Value="True"/>
         <Setter Property="SelectionMode" Value="Single"/>
-        <Setter Property="RowStyle" Value="{StaticResource DefaultDataGridRow}"/>
+        <!--<Setter Property="RowStyle" Value="{StaticResource DefaultDataGridRow}"/>-->
         <Setter Property="AlternationCount" Value="2"></Setter>
         <Setter Property="Foreground" Value="#3a3a3a"/>
         <Setter Property="HorizontalGridLinesBrush" Value="{StaticResource TableBoarder}"/>

--
Gitblit v1.9.1