From 1fca2167068e9ef2c079ec742f20313fc6697ab1 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期一, 03 三月 2025 09:18:33 +0800
Subject: [PATCH] 完善代码；

---
 HMI.UI/Style/PanuonResource.xaml |   53 +++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/HMI.UI/Style/PanuonResource.xaml b/HMI.UI/Style/PanuonResource.xaml
index 18b061f..792c26e 100644
--- a/HMI.UI/Style/PanuonResource.xaml
+++ b/HMI.UI/Style/PanuonResource.xaml
@@ -4,10 +4,10 @@
                     xmlns:sys="clr-namespace:System;assembly=mscorlib"
                     xmlns:pw="https://opensource.panuon.com/wpf"
                     xmlns:pu="https://opensource.panuon.com/wpf-ui"
-             xmlns:dp="clr-namespace:HMI.UI;assembly=HMI.UI">
+             xmlns:dp="clr-namespace:HMI.UI.DpUtil;assembly=HMI.UI">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="/HMI.UI;component/Style/Colors.xaml"/>
-        <pu:StyleDictionary Includes="TextBox,ComboBox,Button,DataGrid,TreeView" />
+        <pu:StyleDictionary Includes="TextBox,ComboBox,Button,DataGrid,TreeView,Menu" />
         <ResourceDictionary Source="/HMI.UI;component/Resources/Font/Font.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
@@ -15,7 +15,7 @@
     <sys:Double x:Key="ContentFontSize">16</sys:Double>
 
     <Style x:Key="PrimaryButton" TargetType="Button" BasedOn="{StaticResource {x:Static pu:StyleKeys.ButtonStyle}}">
-        <Setter Property="Background" Value="{StaticResource WindowBar}"/>
+        <Setter Property="Background" Value="{StaticResource PrimaryColor}"/>
         <Setter Property="Foreground" Value="#FFF"/>
         <Setter Property="pu:IconHelper.FontFamily" Value="{StaticResource iconfont}"/>
         <Setter Property="pu:IconHelper.Margin" Value="0,0,10,0"/>
@@ -33,6 +33,21 @@
     <Style x:Key="DangerButton" TargetType="Button" BasedOn="{StaticResource PrimaryButton}">
         <Setter Property="Background" Value="{StaticResource DangerColor}"/>
         <Setter Property="Foreground" Value="{StaticResource DangerColorContrast}"/>
+    </Style>
+
+    <Style x:Key="AddBtn" TargetType="Button" BasedOn="{StaticResource PrimaryButton}">
+        <Setter Property="pu:ButtonHelper.Icon" Value="&#xe6a1;"/>
+        <Setter Property="Content" Value="鏂板"/>
+    </Style>
+
+    <Style x:Key="RfhBtn" TargetType="Button" BasedOn="{StaticResource PrimaryButton}">
+        <Setter Property="pu:ButtonHelper.Icon" Value="&#xe6a1;"/>
+        <Setter Property="Content" Value="鍒锋柊"/>
+    </Style>
+
+    <Style x:Key="DelBtn" TargetType="Button" BasedOn="{StaticResource DangerButton}">
+        <Setter Property="pu:ButtonHelper.Icon" Value="&#xe6a1;"/>
+        <Setter Property="Content" Value="鍒犻櫎"/>
     </Style>
 
     <Style x:Key="LinkButton" TargetType="Button" BasedOn="{StaticResource {x:Static pu:StyleKeys.ButtonStyle}}">
@@ -72,6 +87,7 @@
             </Style>
             <Style TargetType="TextBlock">
                 <Setter Property="VerticalAlignment" Value="Center"/>
+                <Setter Property="Padding" Value="10"/>
             </Style>
         </Style.Resources>
 
@@ -80,12 +96,12 @@
         <Setter Property="pu:DataGridHelper.ColumnHeaderSeparatorBrush" Value="{StaticResource TableBoarder}"/>
         <Setter Property="pu:DataGridHelper.ColumnHeaderSeparatorVisibility" Value="Visible"/>
         <Setter Property="pu:DataGridHelper.ColumnHeaderVerticalContentAlignment" Value="Center"/>
-        <Setter Property="pu:DataGridHelper.RowHeaderBackground" Value="#ffffff"/>
+        <Setter Property="pu:DataGridHelper.RowHeaderBackground" Value="White"/>
         <Setter Property="pu:DataGridHelper.RowHeaderSeparatorBrush" Value="{StaticResource PrimaryColor}"/>
         <Setter Property="pu:DataGridHelper.RowHoverForeground" Value="{StaticResource SecondPrimaryColorContract}"/>
         <Setter Property="pu:DataGridHelper.RowHoverBackground" Value="{StaticResource SecondPrimaryColor}"/>
         <Setter Property="pu:DataGridHelper.RowSelectedBackground" Value="{StaticResource PrimaryColor}"/>
-        <Setter Property="pu:DataGridHelper.RowSelectedForeground" Value="#ffffff"/>
+        <Setter Property="pu:DataGridHelper.RowSelectedForeground" Value="White"/>
         <Setter Property="HorizontalGridLinesBrush" Value="{StaticResource TableBoarder}"/>
         <Setter Property="VerticalGridLinesBrush" Value="{StaticResource TableBoarder}"/>
         <Setter Property="BorderBrush" Value="{StaticResource TableBoarder}" />
@@ -96,11 +112,13 @@
         <Setter Property="RowHeaderWidth" Value="0"/>
         <Setter Property="IsReadOnly" Value="True"/>
         <Setter Property="GridLinesVisibility" Value="All"/>
-        <Setter Property="BorderThickness" Value="1,1,0,0"/>
+        <Setter Property="BorderThickness" Value="0"/>
         <Setter Property="FontSize" Value="{StaticResource ContentFontSize}"/>
         <Setter Property="RowHeight" Value="24"/>
         <Setter Property="ForceCursor" Value="True"/>
         <Setter Property="SelectionMode" Value="Single"/>
+        <Setter Property="pu:DataGridHelper.ColumnHeaderBorderThickness" Value="0"/>
+        <Setter Property="pu:DataGridHelper.ColumnHeaderPadding" Value="0"/>
     </Style>
 
     <Style x:Key="DefaultTreeView" TargetType="TreeView" BasedOn="{StaticResource {x:Static pu:StyleKeys.TreeViewStyle}}">
@@ -130,4 +148,27 @@
             </DataTrigger>
         </Style.Triggers>
     </Style>
+
+    <Style x:Key="DefaultTabControl" TargetType="TabControl">
+        <Setter Property="pu:TabControlHelper.ItemsHorizontalHeaderAlignment" Value="Left"/>
+        <Setter Property="pu:TabControlHelper.ItemsHoverBackground" Value="{StaticResource SecondPrimaryColor}"/>
+        <Setter Property="pu:TabControlHelper.ItemsHoverForeground" Value="{StaticResource SecondPrimaryColorContract}"/>
+        <Setter Property="pu:TabControlHelper.ItemsRibbonLineMargin" Value="0,5,0,5"/>
+        <Setter Property="pu:TabControlHelper.ItemsRibbonLineThickness" Value="4"/>
+        <Setter Property="pu:TabControlHelper.ItemsRibbonLineVisibility" Value="Visible"/>
+        <Setter Property="pu:TabControlHelper.ItemsSelectedRibbonLineBrush" Value="{StaticResource PrimaryColor}"/>
+        <Setter Property="pu:TabControlHelper.ItemsSelectedRibbonLineThickness" Value="2"/>
+    </Style>
+
+    <Style x:Key="ButtonGroup" TargetType="StackPanel">
+        <Setter Property="Orientation" Value="Horizontal"/>
+        <Setter Property="HorizontalAlignment" Value="Right"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="dp:StackPanelHelper.ChildSpace" Value="10"/>
+    </Style>
+
+    <Style x:Key="TitleBox" TargetType="TextBlock">
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="FontSize" Value="{StaticResource TitleFontSize}"/>
+    </Style>
 </ResourceDictionary>
\ No newline at end of file

--
Gitblit v1.9.1