From 2e54b439c64e0adbb7e010243c1f33aa5fc5f503 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期二, 11 三月 2025 14:08:57 +0800
Subject: [PATCH] 完善程序； Merge branch 'master' of http://58.211.88.246:3600/r/WPF/WPFProject
---
HMI.UI/Style/FormStyle.xaml | 43 +++++++++++--------------------------------
1 files changed, 11 insertions(+), 32 deletions(-)
diff --git a/HMI.UI/Style/FormStyle.xaml b/HMI.UI/Style/FormStyle.xaml
index b77cbf6..f745834 100644
--- a/HMI.UI/Style/FormStyle.xaml
+++ b/HMI.UI/Style/FormStyle.xaml
@@ -27,7 +27,7 @@
</Setter>
</Trigger>
<Trigger Property="Tag" Value="OK">
- <Setter Property="Background" Value="{StaticResource PrimaryColor}" />
+ <Setter Property="Background" Value="{StaticResource VerBar}" />
<Setter Property="Foreground" Value="{StaticResource PrimaryColorContract}" />
<Setter Property="Padding" Value="20,0" />
<Setter Property="Height" Value="35" />
@@ -48,33 +48,14 @@
</Style.Triggers>
</Style>
-
<Style x:Key="SearchButton" TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
<Setter Property="pu:ButtonHelper.CornerRadius" Value="0" />
- <Setter Property="Background" Value="{StaticResource PrimaryColor}" />
+ <Setter Property="Background" Value="{StaticResource VerBar}" />
<Setter Property="Foreground" Value="{StaticResource PrimaryColorContract}" />
<Setter Property="FontFamily" Value="{StaticResource iconfont}" />
<Setter Property="Height" Value="35" />
<Setter Property="Content" Value=""/>
- <Setter Property="pu:ButtonHelper.PendingSpinStyle">
- <Setter.Value>
- <Style TargetType="pu:Spin" BasedOn="{StaticResource {x:Static pu:ButtonHelper.PendingSpinStyleKey}}">
- <Setter Property="SpinStyle" Value="Ring2" />
- </Style>
- </Setter.Value>
- </Setter>
- <Style.Triggers>
- <Trigger Property="pu:ButtonHelper.IsPending" Value="True">
- <Setter Property="pu:ButtonHelper.ClickEffect" Value="Shake" />
- <Setter Property="ContentTemplate">
- <Setter.Value>
- <DataTemplate>
- <TextBlock Text="Click again ?" />
- </DataTemplate>
- </Setter.Value>
- </Setter>
- </Trigger>
- </Style.Triggers>
+ <Setter Property="Cursor" Value="Hand"/>
</Style>
<Style x:Key="EditorTextBoxStyle" TargetType="TextBox" BasedOn="{StaticResource {x:Type TextBox}}">
@@ -133,17 +114,15 @@
<Setter Property="Margin" Value="0,10,0,0" />
</Style>
+ <DataTemplate x:Key="RequiredFormHeader">
+ <StackPanel Orientation="Horizontal">
+ <TextBlock Text="*" Foreground="Red" />
+ <ContentControl Content="{Binding}" />
+ </StackPanel>
+ </DataTemplate>
+
<Style x:Key="RequiredInputFormGroupStyle" TargetType="pu:FormGroup" BasedOn="{StaticResource InputFormGroupStyle}">
- <Setter Property="HeaderTemplate">
- <Setter.Value>
- <DataTemplate>
- <StackPanel Orientation="Horizontal">
- <TextBlock Text="*" Foreground="Red" />
- <ContentControl Content="{Binding}" />
- </StackPanel>
- </DataTemplate>
- </Setter.Value>
- </Setter>
+ <Setter Property="HeaderTemplate" Value="{StaticResource RequiredFormHeader}"/>
</Style>
<Style x:Key="FormComboxStyle" TargetType="ComboBox" BasedOn="{StaticResource {x:Type ComboBox}}">
--
Gitblit v1.9.1