From 9211ec11c112e18cd99e77f889a01110a70031ce Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期一, 24 十一月 2025 17:47:15 +0800
Subject: [PATCH] 优化项目结构

---
 HMI.UI/Style/PanuonResource.xaml |  242 +++++++++++++++++++++++++++++++-----------------
 1 files changed, 157 insertions(+), 85 deletions(-)

diff --git a/HMI.UI/Style/PanuonResource.xaml b/HMI.UI/Style/PanuonResource.xaml
index 3e74649..23a2dcb 100644
--- a/HMI.UI/Style/PanuonResource.xaml
+++ b/HMI.UI/Style/PanuonResource.xaml
@@ -1,28 +1,35 @@
-锘�<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+锘�<ResourceDictionary 
+     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                    mc:Ignorable="d"
                     xmlns:ui="clr-namespace:HMI.UI"
                     xmlns:sys="clr-namespace:System;assembly=mscorlib"
                     xmlns:pw="https://opensource.panuon.com/wpf"
                     xmlns:pu="https://opensource.panuon.com/wpf-ui"
+             xmlns:uic="clr-namespace:HMI.UI.Converter;assembly=HMI.UI"
              xmlns:dp="clr-namespace:HMI.UI.DpUtil;assembly=HMI.UI">
     <ResourceDictionary.MergedDictionaries>
+        <pu:StyleDictionary Includes="PasswordBox,TextBox,ComboBox,Button,TreeView,Menu,ListBox,ContextMenu,TabControl" />
         <ResourceDictionary Source="/HMI.UI;component/Style/Colors.xaml"/>
-        <pu:StyleDictionary Includes="TextBox,ComboBox,Button,DataGrid,TreeView,Menu" />
+        <ResourceDictionary Source="/HMI.UI;component/Style/PanuonDataGrid.xaml"/>
+        <ResourceDictionary Source="/HMI.UI;component/Style/ScrollBarResource.xaml"/>
         <ResourceDictionary Source="/HMI.UI;component/Resources/Font/Font.xaml"/>
     </ResourceDictionary.MergedDictionaries>
-
     <sys:Double x:Key="TitleFontSize">20</sys:Double>
     <sys:Double x:Key="ContentFontSize">16</sys:Double>
     <sys:Double x:Key="ContentFontSize2">14</sys:Double>
 
     <Style x:Key="PrimaryButton" TargetType="Button" BasedOn="{StaticResource {x:Static pu:StyleKeys.ButtonStyle}}">
-        <Setter Property="Background" Value="{StaticResource PrimaryColor}"/>
+        <Setter Property="Background" Value="{StaticResource VerBar}"/>
         <Setter Property="Foreground" Value="#FFF"/>
         <Setter Property="pu:IconHelper.FontFamily" Value="{StaticResource iconfont}"/>
         <Setter Property="pu:IconHelper.Margin" Value="0,0,10,0"/>
-        <Setter Property="Padding" Value="10"/>
+        <Setter Property="Padding" Value="8"/>
         <Setter Property="BorderThickness" Value="0"/>
         <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="Focusable" Value="False"/>
     </Style>
 
     <Style x:Key="CommonButton" TargetType="Button" BasedOn="{StaticResource PrimaryButton}">
@@ -32,33 +39,74 @@
     </Style>
 
     <Style x:Key="DangerButton" TargetType="Button" BasedOn="{StaticResource PrimaryButton}">
-        <Setter Property="Background" Value="{StaticResource DangerColor}"/>
+        <Setter Property="Background" Value="{StaticResource DangerVerBar}"/>
+        <Setter Property="Foreground" Value="{StaticResource DangerColorContrast}"/>
+    </Style>
+
+    <Style x:Key="SuccessButton" TargetType="Button" BasedOn="{StaticResource PrimaryButton}">
+        <Setter Property="Background" Value="{StaticResource GreenVerBar}"/>
         <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="鏂板"/>
+        <Setter Property="pu:ButtonHelper.Icon" Value="&#xe61a;"/>
+        <Setter Property="Content" Value="{DynamicResource App.Add}"/>
+    </Style>
+
+    <Style x:Key="EditBtn" TargetType="Button" BasedOn="{StaticResource PrimaryButton}">
+        <Setter Property="pu:ButtonHelper.Icon" Value="&#xe643;"/>
+        <Setter Property="Content" Value="{DynamicResource App.Edit}"/>
     </Style>
 
     <Style x:Key="RfhBtn" TargetType="Button" BasedOn="{StaticResource PrimaryButton}">
-        <Setter Property="pu:ButtonHelper.Icon" Value="&#xe6a1;"/>
-        <Setter Property="Content" Value="鍒锋柊"/>
+        <Setter Property="pu:ButtonHelper.Icon" Value="&#xe631;"/>
+        <Setter Property="Content" Value="{DynamicResource App.Refresh}"/>
+    </Style>
+
+    <Style x:Key="QueryBtn" TargetType="Button" BasedOn="{StaticResource PrimaryButton}">
+        <Setter Property="pu:ButtonHelper.Icon" Value="&#xe752;"/>
+        <Setter Property="Content" Value="{DynamicResource App.Query}"/>
+    </Style>
+
+    <Style x:Key="ExportBtn" TargetType="Button" BasedOn="{StaticResource PrimaryButton}">
+        <Setter Property="pu:ButtonHelper.Icon" Value="&#xe638;"/>
+        <Setter Property="Content" Value="{DynamicResource App.Export}"/>
+    </Style>
+
+    <Style x:Key="ImportBtn" TargetType="Button" BasedOn="{StaticResource PrimaryButton}">
+        <Setter Property="pu:ButtonHelper.Icon" Value="&#xe639;"/>
+        <Setter Property="Content" Value="{DynamicResource App.Import}"/>
+    </Style>
+
+    <Style x:Key="SaveBtn" TargetType="Button" BasedOn="{StaticResource PrimaryButton}">
+        <Setter Property="pu:ButtonHelper.Icon" Value="&#xe60d;"/>
+        <Setter Property="Content" Value="{DynamicResource App.Save}"/>
+    </Style>
+
+    <Style x:Key="ResetBtn" TargetType="Button" BasedOn="{StaticResource RfhBtn}">
+        <Setter Property="Content" Value="{DynamicResource App.Reset}"/>
+    </Style>
+
+    <Style x:Key="SettingBtn" TargetType="Button" BasedOn="{StaticResource PrimaryButton}">
+        <Setter Property="pu:ButtonHelper.Icon" Value="&#xe688;"/>
+        <Setter Property="Content" Value="{DynamicResource App.Setting}"/>
     </Style>
 
     <Style x:Key="DelBtn" TargetType="Button" BasedOn="{StaticResource DangerButton}">
-        <Setter Property="pu:ButtonHelper.Icon" Value="&#xe6a1;"/>
-        <Setter Property="Content" Value="鍒犻櫎"/>
+        <Setter Property="pu:ButtonHelper.Icon" Value="&#xe626;"/>
+        <Setter Property="Content" Value="{DynamicResource App.Delete}"/>
     </Style>
 
     <Style x:Key="LinkButton" TargetType="Button" BasedOn="{StaticResource {x:Static pu:StyleKeys.ButtonStyle}}">
         <Setter Property="Background" Value="{x:Null}" />
+        <Setter Property="Margin" Value="0" />
+        <Setter Property="Padding" Value="0" />
         <Setter Property="Foreground" Value="{StaticResource PrimaryColor}" />
         <Setter Property="Cursor" Value="Hand" />
         <Setter Property="ContentTemplate">
             <Setter.Value>
                 <DataTemplate>
-                    <TextBlock Text="{Binding}" TextDecorations="Underline" />
+                    <TextBlock Text="{Binding}" Padding="0" HorizontalAlignment="Left" VerticalAlignment="Center" TextDecorations="Underline" />
                 </DataTemplate>
             </Setter.Value>
         </Setter>
@@ -66,6 +114,29 @@
 
     <Style x:Key="DangerLinkButton" TargetType="Button" BasedOn="{StaticResource LinkButton}">
         <Setter Property="Foreground" Value="{StaticResource DangerColor}"/>
+    </Style>
+
+    <Style x:Key="DeleteLink" TargetType="Button" BasedOn="{StaticResource DangerLinkButton}">
+        <Setter Property="Content" Value="{DynamicResource App.Delete}"/>
+    </Style>
+
+    <Style x:Key="RowLink" TargetType="Button" BasedOn="{StaticResource LinkButton}">
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding Path=IsMouseOver,
+                RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow},AncestorLevel=1}}" 
+         Value="True">
+                <Setter Property="Foreground" Value="#FFF"/>
+            </DataTrigger>
+            <DataTrigger Binding="{Binding Path=IsSelected,
+       RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow},AncestorLevel=1}}" 
+Value="True">
+                <Setter Property="Foreground" Value="#FFF"/>
+            </DataTrigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style x:Key="EditLink" TargetType="Button" BasedOn="{StaticResource RowLink}">
+        <Setter Property="Content" Value="{DynamicResource App.Edit}"/>
     </Style>
 
     <Style x:Key="CommonToggle" TargetType="ToggleButton" BasedOn="{StaticResource {x:Static pu:StyleKeys.ToggleButtonStyle}}">
@@ -87,66 +158,16 @@
     <Style x:Key="CardBoarder" TargetType="Border">
         <Setter Property="BorderBrush" Value="{StaticResource CommonBoarder}"/>
         <Setter Property="BorderThickness" Value="2"/>
-        <Setter Property="Background" Value="#FFF"/>
-        <Setter Property="Margin" Value="10"/>
+        <Setter Property="Background" Value="#f3f9ff"/>
+        <Setter Property="Margin" Value="5"/>
         <Setter Property="Padding" Value="10"/>
     </Style>
 
-    <Style x:Key="DefaultDataGrid" TargetType="DataGrid" BasedOn="{StaticResource {x:Static pu:StyleKeys.DataGridStyle}}">
-        <Style.Resources>
-            <Style TargetType="DataGridCell" 
-                   BasedOn="{StaticResource {x:Static pu:StyleKeys.DataGridCellStyle}}">
-                <Setter Property="Background" Value="Transparent"/>
-                <Setter Property="Padding" Value="5"/>
-                <Setter Property="BorderThickness" Value="0"/>
-                <Setter Property="VerticalAlignment" Value="Stretch"/>
-                <Setter Property="Background" Value="Transparent"/>
-            </Style>
-            <!--<Style TargetType="TextBlock">
-                <Setter Property="VerticalAlignment" Value="Center"/>
-                <Setter Property="Padding" Value="5"/>
-            </Style>-->
-
-            <Style TargetType="DataGridColumnHeader" 
-       BasedOn="{StaticResource {x:Static pu:StyleKeys.DataGridColumnHeaderStyle}}">
-                <Setter Property="Padding" Value="10"/>
-                <Setter Property="BorderThickness" Value="0"/>
-            </Style>
-
-        </Style.Resources>
-        <Setter Property="Foreground" Value="#FF9B9B9B"/>
-        <Setter Property="pu:DataGridHelper.ColumnHeaderForeground" Value="#878787"/>
-        <Setter Property="pu:DataGridHelper.ColumnHeaderBackground" Value="{StaticResource TableHeaderBackground}"/>
-        <Setter Property="pu:DataGridHelper.ColumnHeaderHoverBackground" Value="{StaticResource TableHeaderBackground}"/>
-        <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.ColumnHeaderHorizontalContentAlignment" Value="Left"/>
-        <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="White"/>
-        <Setter Property="HorizontalGridLinesBrush" Value="{StaticResource TableBoarder}"/>
-        <Setter Property="VerticalGridLinesBrush" Value="{StaticResource TableBoarder}"/>
-        <Setter Property="BorderBrush" Value="{StaticResource TableBoarder}" />
-        <Setter Property="AutoGenerateColumns" Value="False"/>
-        <Setter Property="CanUserAddRows" Value="False"/>
-        <Setter Property="CanUserSortColumns" Value="False"/>
-        <Setter Property="CanUserDeleteRows" Value="False"/>
-        <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="BorderBrush" Value="{StaticResource CommonBoarder}"/>
-        <Setter Property="FontSize" Value="{StaticResource ContentFontSize2}"/>
-        <Setter Property="RowHeight" Value="30"/>
-        <Setter Property="ColumnHeaderHeight" Value="36"/>
-        <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 x:Key="TableTextBlock" TargetType="TextBlock">
+        <Setter Property="Padding" Value="0,2"/>
+        <Setter Property="Margin" Value="0"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="TextWrapping" Value="Wrap"/>
     </Style>
 
     <Style x:Key="DefaultTreeView" TargetType="TreeView" BasedOn="{StaticResource {x:Static pu:StyleKeys.TreeViewStyle}}">
@@ -160,21 +181,6 @@
         <Setter Property="FontSize" Value="{StaticResource ContentFontSize}"/>
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="BorderThickness" Value="0"/>
-    </Style>
-
-    <Style x:Key="RowLink" TargetType="Button" BasedOn="{StaticResource LinkButton}">
-        <Style.Triggers>
-            <DataTrigger Binding="{Binding Path=IsMouseOver,
-                RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow},AncestorLevel=1}}" 
-         Value="True">
-                <Setter Property="Foreground" Value="#FFF"/>
-            </DataTrigger>
-            <DataTrigger Binding="{Binding Path=IsSelected,
-       RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow},AncestorLevel=1}}" 
-Value="True">
-                <Setter Property="Foreground" Value="#FFF"/>
-            </DataTrigger>
-        </Style.Triggers>
     </Style>
 
     <Style x:Key="DefaultTabControl" TargetType="TabControl">
@@ -205,4 +211,70 @@
         <Setter Property="HorizontalAlignment" Value="Center"/>
         <Setter Property="FontSize" Value="{StaticResource ContentFontSize2}"/>
     </Style>
+
+    <Style x:Key="ModalWindow" TargetType="pu:WindowX">
+        <Setter Property="pu:WindowXCaption.Background" Value="{StaticResource ReHoriBar}"/>
+        <Setter Property="pu:WindowXModalDialog.ButtonStyle" Value="{StaticResource ModalButton}"/>
+        <Setter Property="pu:WindowXCaption.Foreground" Value="#FFF"/>
+        <Setter Property="pu:WindowXCaption.Buttons" Value="Close"/>
+        <Setter Property="pu:WindowXModalDialog.Buttons" Value="OKCancel"/>
+        <Setter Property="pu:WindowXModalDialog.CancelButtonContent" 
+                Value="{DynamicResource App.Cancel}"/>
+        <Setter Property="pu:WindowXModalDialog.OKButtonContent" 
+                Value="{DynamicResource App.Save}"/>
+        <Setter Property="pu:WindowXModalDialog.ButtonPanelMargin" Value="0,30,10,10"/>
+    </Style>
+
+    <Style x:Key="DefaultListBox" TargetType="ListBox" BasedOn="{StaticResource {x:Static pu:StyleKeys.ListBoxStyle}}">
+        <Setter Property="pu:ListBoxHelper.ItemsHoverBackground" Value="{StaticResource SecondPrimaryColor}"/>
+        <Setter Property="pu:ListBoxHelper.ItemsHoverForeground" Value="{StaticResource SecondPrimaryColorContract}"/>
+        <Setter Property="pu:ListBoxHelper.ItemsSelectedBackground" Value="{StaticResource PrimaryColor}"/>
+        <Setter Property="pu:ListBoxHelper.ItemsSelectedForeground" Value="{StaticResource PrimaryColorContract}"/>
+        <Setter Property="pu:ListBoxHelper.ItemsMargin" Value="0"/>
+        <Setter Property="pu:ListBoxHelper.ItemsPadding" Value="7,5,7,5"/>
+        <Setter Property="FontSize" Value="{StaticResource ContentFontSize}"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="0"/>
+    </Style>
+
+    <Style x:Key="HeaderTabControl" TargetType="TabControl">
+        <Setter Property="pu:TabControlHelper.HeaderPanelAlignment" Value="Stretch"/>
+        <Setter Property="pu:TabControlHelper.ItemsBackground" Value="{DynamicResource VerBar}"/>
+        <Setter Property="pu:TabControlHelper.ItemsForeground" Value="#FFF"/>
+        <Setter Property="pu:TabControlHelper.ItemsSelectedForeground" Value="{DynamicResource PrimaryColor}"/>
+        <Setter Property="pu:TabControlHelper.ItemsFontSize" Value="14"/>
+        <Setter Property="pu:TabControlHelper.ItemsHeight" Value="30"/>
+        <Setter Property="pu:TabControlHelper.ItemsHorizontalHeaderAlignment" Value="Left"/>
+        <Setter Property="pu:TabControlHelper.ItemsHoverBackground" Value="{DynamicResource SecondPrimaryColor}"/>
+        <Setter Property="pu:TabControlHelper.ItemsHoverForeground" Value="#FFF"/>
+        <Setter Property="pu:TabControlHelper.ItemsPadding" Value="20,5,0,0"/>
+        <Setter Property="pu:TabControlHelper.ItemsRibbonLineCornerRadius" Value="4"/>
+        <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.ItemsSelectedBackground" Value="#FFF"/>
+        <Setter Property="pu:TabControlHelper.ItemsSelectedRibbonLineBrush" Value="#FFF"/>
+        <Setter Property="pu:TabControlHelper.ItemsSelectedRibbonLineThickness" Value="2"/>
+        <Setter Property="pu:TabControlHelper.ItemsWidth" Value="100"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type TabControl}">
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="*"/>
+                        </Grid.RowDefinitions>
+                        <Border BorderThickness="1,1,1,0" BorderBrush="#acacac" Background="{DynamicResource VerBar}" Padding="2,2,10,0">
+                            <TabPanel x:Name="HeaderPanel" Grid.Row="0" Panel.ZIndex="1" IsItemsHost="True"/>
+                        </Border>
+
+                        <Border Grid.Row="1" BorderBrush="{TemplateBinding BorderBrush}" 
+        BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+                            <ContentPresenter x:Name="PART_SelectedContentHost" ContentSource="SelectedContent"/>
+                        </Border>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 </ResourceDictionary>
\ No newline at end of file

--
Gitblit v1.9.1