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/FormStyle.xaml | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/HMI.UI/Style/FormStyle.xaml b/HMI.UI/Style/FormStyle.xaml
index f745834..1cd04c2 100644
--- a/HMI.UI/Style/FormStyle.xaml
+++ b/HMI.UI/Style/FormStyle.xaml
@@ -50,6 +50,7 @@
<Style x:Key="SearchButton" TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
<Setter Property="pu:ButtonHelper.CornerRadius" Value="0" />
+ <Setter Property="Width" Value="30" />
<Setter Property="Background" Value="{StaticResource VerBar}" />
<Setter Property="Foreground" Value="{StaticResource PrimaryColorContract}" />
<Setter Property="FontFamily" Value="{StaticResource iconfont}" />
@@ -108,8 +109,7 @@
</Style>
</Style.Resources>
- <Setter Property="HeaderWidth" Value="70" />
- <Setter Property="HeaderHeight" Value="35" />
+ <Setter Property="HeaderWidth" Value="Auto" />
<Setter Property="Orientation" Value="Horizontal" />
<Setter Property="Margin" Value="0,10,0,0" />
</Style>
@@ -132,6 +132,7 @@
<Setter Property="pu:ComboBoxHelper.ItemsSelectedForeground" Value="Black"/>
<Setter Property="pu:ComboBoxHelper.HoverBorderBrush" Value="#007ACC" />
<Setter Property="pu:ComboBoxHelper.FocusedBorderBrush" Value="#007ACC" />
+ <Setter Property="pu:ComboBoxHelper.ClearButtonVisibility" Value="VisibleOnNonnull" />
<Setter Property="Height" Value="35" />
<Setter Property="Margin" Value="0" />
<Setter Property="Background" Value="#FFF" />
@@ -151,7 +152,7 @@
<Setter Property="ItemsHoverBackground" Value="{StaticResource SecondPrimaryColor}"/>
<Setter Property="ItemsHoverForeground" Value="{StaticResource SecondPrimaryColorContract}"/>
<Setter Property="TextStringFormat" Value="yyyy-MM-dd HH:mm:ss"/>
- <Setter Property="Width" Value="180"/>
+ <Setter Property="MinWidth" Value="180"/>
<Setter Property="Mode" Value="DateTime"/>
<Setter Property="SelectedDateTime" Value="{x:Null}"/>
</Style>
--
Gitblit v1.9.1