From 771a0e7b6b1276087515bbe94de28358cb92963b Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期四, 04 六月 2026 10:32:27 +0800
Subject: [PATCH] 优化老化；

---
 HMI.UI/Style/FormStyle.xaml |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/HMI.UI/Style/FormStyle.xaml b/HMI.UI/Style/FormStyle.xaml
index 24958cc..d6407ac 100644
--- a/HMI.UI/Style/FormStyle.xaml
+++ b/HMI.UI/Style/FormStyle.xaml
@@ -4,7 +4,7 @@
             xmlns:pu="https://opensource.panuon.com/wpf-ui">
 
     <ResourceDictionary.MergedDictionaries>
-        <pu:StyleDictionary Includes="TextBox,ComboBox,Button" />
+        <pu:StyleDictionary Includes="TextBox,ComboBox,Button,PasswordBox" />
     </ResourceDictionary.MergedDictionaries>
 
     <Style x:Key="ModalButton" TargetType="Button" BasedOn="{StaticResource {x:Static pu:WindowXModalDialog.ButtonStyleKey}}">
@@ -27,8 +27,8 @@
                 </Setter>
             </Trigger>
             <Trigger Property="Tag" Value="OK">
-                <Setter Property="Background" Value="{StaticResource VerBar}" />
-                <Setter Property="Foreground" Value="{StaticResource PrimaryColorContract}" />
+                <Setter Property="Background" Value="{DynamicResource VerBar}" />
+                <Setter Property="Foreground" Value="{DynamicResource PrimaryColorContract}" />
                 <Setter Property="Padding" Value="20,0" />
                 <Setter Property="Height" Value="35" />
             </Trigger>
@@ -51,8 +51,8 @@
     <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="Background" Value="{DynamicResource VerBar}" />
+        <Setter Property="Foreground" Value="{DynamicResource PrimaryColorContract}" />
         <Setter Property="FontFamily" Value="{StaticResource iconfont}" />
         <Setter Property="Height" Value="35" />
         <Setter Property="Content" Value="&#xe752;"/>
@@ -137,7 +137,7 @@
 
     <Style x:Key="FormComboxStyle" TargetType="ComboBox" BasedOn="{StaticResource {x:Type ComboBox}}">
         <Setter Property="pu:ComboBoxHelper.CornerRadius" Value="0"/>
-        <Setter Property="pu:ComboBoxHelper.ItemsHoverBackground" Value="{StaticResource SecondPrimaryColor}"/>
+        <Setter Property="pu:ComboBoxHelper.ItemsHoverBackground" Value="{DynamicResource SecondPrimaryColor}"/>
         <Setter Property="pu:ComboBoxHelper.ItemsHoverForeground" Value="#FFF"/>
         <Setter Property="pu:ComboBoxHelper.ItemsSelectedForeground" Value="Black"/>
         <Setter Property="pu:ComboBoxHelper.HoverBorderBrush" Value="#007ACC" />
@@ -165,10 +165,10 @@
     <Style x:Key="TimePicker" TargetType="pu:DateTimePicker">
         <Setter Property="Height" Value="35"/>
         <Setter Property="ClearButtonVisibility" Value="Visible"/>
-        <Setter Property="ItemsCheckedBackground" Value="{StaticResource PrimaryColor}"/>
-        <Setter Property="ItemsCheckedForeground" Value="{StaticResource SecondPrimaryColorContract}"/>
-        <Setter Property="ItemsHoverBackground" Value="{StaticResource SecondPrimaryColor}"/>
-        <Setter Property="ItemsHoverForeground" Value="{StaticResource SecondPrimaryColorContract}"/>
+        <Setter Property="ItemsCheckedBackground" Value="{DynamicResource PrimaryColor}"/>
+        <Setter Property="ItemsCheckedForeground" Value="{DynamicResource SecondPrimaryColorContract}"/>
+        <Setter Property="ItemsHoverBackground" Value="{DynamicResource SecondPrimaryColor}"/>
+        <Setter Property="ItemsHoverForeground" Value="{DynamicResource SecondPrimaryColorContract}"/>
         <Setter Property="TextStringFormat" Value="yyyy-MM-dd HH:mm:ss"/>
         <Setter Property="MinWidth" Value="180"/>
         <Setter Property="Mode" Value="DateTime"/>
@@ -181,8 +181,8 @@
         <Setter Property="pu:PasswordBoxHelper.CornerRadius" Value="2" />
         <Setter Property="pu:PasswordBoxHelper.WatermarkForeground" Value="#4A4A4A" />
         <Setter Property="pu:PasswordBoxHelper.FocusedWatermarkForeground" Value="#AAAAAA" />
-        <Setter Property="pu:PasswordBoxHelper.ClearButtonVisibility" Value="VisibleOnHoverAndNonnull" />
+        <Setter Property="pu:PasswordBoxHelper.PlainButtonVisibility" Value="VisibleOnHover" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="Height" Value="35" />
-        <Setter Property="Padding" Value="10,0" />
     </Style>
 </ResourceDictionary>
\ No newline at end of file

--
Gitblit v1.9.1