From 40014e6e41f1ec017a07b7a620b3c700807d0519 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期日, 23 三月 2025 13:51:00 +0800
Subject: [PATCH] 新增DOControl

---
 HMI.UI/Style/FormStyle.xaml |   54 ++++++++++++++++++------------------------------------
 1 files changed, 18 insertions(+), 36 deletions(-)

diff --git a/HMI.UI/Style/FormStyle.xaml b/HMI.UI/Style/FormStyle.xaml
index 42eb600..3bda03a 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,15 @@
         </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="Width" Value="30" />
+        <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="&#xe752;"/>
-        <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}}">
@@ -90,7 +72,7 @@
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Style.Triggers>
             <Trigger Property="IsReadOnly" Value="True">
-                <Setter Property="Background" Value="LightGray"/>
+                <Setter Property="Background" Value="#e8e8e8"/>
             </Trigger>
         </Style.Triggers>
     </Style>
@@ -124,26 +106,23 @@
     <Style x:Key="InputFormGroupStyle" TargetType="pu:FormGroup">
         <Style.Resources>
             <Style TargetType="TextBox" BasedOn="{StaticResource EditorTextBoxStyle}">
-                
+
             </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>
 
+    <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}}">
@@ -153,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" />
@@ -172,7 +152,9 @@
         <Setter Property="ItemsHoverBackground" Value="{StaticResource SecondPrimaryColor}"/>
         <Setter Property="ItemsHoverForeground" Value="{StaticResource SecondPrimaryColorContract}"/>
         <Setter Property="TextStringFormat" Value="yyyy-MM-dd HH:mm:ss"/>
+        <Setter Property="MinWidth" 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