From 4c3eb7f334abb8129b57e86f2935d75d0b3070b4 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期一, 03 三月 2025 18:55:31 +0800
Subject: [PATCH] 完善UI；新增TestResult;
---
HMI.UI/Style/FormStyle.xaml | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/HMI.UI/Style/FormStyle.xaml b/HMI.UI/Style/FormStyle.xaml
index 9056d01..b77cbf6 100644
--- a/HMI.UI/Style/FormStyle.xaml
+++ b/HMI.UI/Style/FormStyle.xaml
@@ -90,6 +90,24 @@
<Setter Property="VerticalContentAlignment" Value="Center"/>
<Style.Triggers>
<Trigger Property="IsReadOnly" Value="True">
+ <Setter Property="Background" Value="#e8e8e8"/>
+ </Trigger>
+ </Style.Triggers>
+ </Style>
+
+ <Style x:Key="FormNumberInput" TargetType="pu:NumberInput" BasedOn="{StaticResource {x:Type pu:NumberInput}}">
+ <Setter Property="pu:TextBoxHelper.FocusedBorderBrush" Value="#6CBCEA" />
+ <Setter Property="pu:TextBoxHelper.FocusedShadowColor" Value="#6CBCEA" />
+ <Setter Property="pu:TextBoxHelper.CornerRadius" Value="0" />
+ <Setter Property="pu:TextBoxHelper.WatermarkForeground" Value="#4A4A4A" />
+ <Setter Property="pu:TextBoxHelper.FocusedWatermarkForeground" Value="#AAAAAA" />
+ <Setter Property="Height" Value="35" />
+ <Setter Property="Padding" Value="5,0" />
+ <Setter Property="Background" Value="Transparent" />
+ <Setter Property="Foreground" Value="Black" />
+ <Setter Property="VerticalContentAlignment" Value="Center"/>
+ <Style.Triggers>
+ <Trigger Property="IsReadOnly" Value="True">
<Setter Property="Background" Value="LightGray"/>
</Trigger>
</Style.Triggers>
@@ -130,7 +148,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 WindowBar}"/>
+ <Setter Property="pu:ComboBoxHelper.ItemsHoverBackground" Value="{StaticResource SecondPrimaryColor}"/>
<Setter Property="pu:ComboBoxHelper.ItemsHoverForeground" Value="#FFF"/>
<Setter Property="pu:ComboBoxHelper.ItemsSelectedForeground" Value="Black"/>
<Setter Property="pu:ComboBoxHelper.HoverBorderBrush" Value="#007ACC" />
@@ -145,4 +163,18 @@
<Setter Property="Foreground" Value="Black" />
<Setter Property="SelectedValuePath" Value="Content"/>
</Style>
+
+ <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="TextStringFormat" Value="yyyy-MM-dd HH:mm:ss"/>
+ <Setter Property="Width" Value="180"/>
+ <Setter Property="Mode" Value="DateTime"/>
+ <Setter Property="SelectedDateTime" Value="{x:Null}"/>
+ </Style>
+
</ResourceDictionary>
\ No newline at end of file
--
Gitblit v1.9.1