From c401a2f2fd1a509cdeb33e850bb5c2827074af48 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期一, 17 三月 2025 08:44:51 +0800
Subject: [PATCH] 完善框架，新增两个close方法；
---
HMI.UI/Style/PanuonResource.xaml | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/HMI.UI/Style/PanuonResource.xaml b/HMI.UI/Style/PanuonResource.xaml
index 42c9a94..b587af8 100644
--- a/HMI.UI/Style/PanuonResource.xaml
+++ b/HMI.UI/Style/PanuonResource.xaml
@@ -175,7 +175,6 @@
<Style x:Key="DefaultDataGrid" TargetType="DataGrid" BasedOn="{StaticResource {x:Static pu:StyleKeys.DataGridStyle}}">
<Style.Resources>
-
<Style TargetType="DataGridCell"
BasedOn="{StaticResource {x:Static pu:StyleKeys.DataGridCellStyle}}">
<Setter Property="Background" Value="Transparent"/>
@@ -188,13 +187,11 @@
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="Padding" Value="5"/>
</Style>-->
-
<Style TargetType="DataGridColumnHeader"
BasedOn="{StaticResource {x:Static pu:StyleKeys.DataGridColumnHeaderStyle}}">
<Setter Property="Padding" Value="10"/>
<Setter Property="BorderThickness" Value="0"/>
</Style>
-
</Style.Resources>
<Setter Property="pu:DataGridHelper.ColumnHeaderPadding" Value="0"/>
<Setter Property="RowHeight" Value="30"/>
@@ -231,7 +228,6 @@
<Setter Property="pu:DataGridHelper.RowSelectedBackground" Value="{StaticResource PrimaryColor}"/>
<Setter Property="pu:DataGridHelper.RowSelectedForeground" Value="White"/>
<Setter Property="pu:DataGridHelper.RowHeaderBorderThickness" Value="10,0,0,0"/>
- <Setter Property="pu:DataGridHelper.RowHeaderBackground" Value="Red"/>
<Setter Property="pu:DataGridHelper.ColumnHeaderBorderThickness" Value="0"/>
<Setter Property="pu:DataGridHelper.ColumnHeaderPadding" Value="0"/>
</Style>
@@ -285,9 +281,9 @@
<Setter Property="pu:WindowXCaption.Buttons" Value="Close"/>
<Setter Property="pu:WindowXModalDialog.Buttons" Value="OKCancel"/>
<Setter Property="pu:WindowXModalDialog.CancelButtonContent"
- Value="{Binding Converter={StaticResource lc},ConverterParameter='App.Cancel'}"/>
+ Value="{DynamicResource App.Cancel}"/>
<Setter Property="pu:WindowXModalDialog.OKButtonContent"
- Value="{Binding Converter={StaticResource lc},ConverterParameter='App.Save'}"/>
+ Value="{DynamicResource App.Save}"/>
<Setter Property="pu:WindowXModalDialog.ButtonPanelMargin" Value="0,30,10,10"/>
</Style>
</ResourceDictionary>
\ No newline at end of file
--
Gitblit v1.9.1