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/PanuonResource.xaml |   27 ++++++++++++++++-----------
 1 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/HMI.UI/Style/PanuonResource.xaml b/HMI.UI/Style/PanuonResource.xaml
index 908245f..0b103f5 100644
--- a/HMI.UI/Style/PanuonResource.xaml
+++ b/HMI.UI/Style/PanuonResource.xaml
@@ -8,7 +8,6 @@
                     xmlns:sys="clr-namespace:System;assembly=mscorlib"
                     xmlns:pw="https://opensource.panuon.com/wpf"
                     xmlns:pu="https://opensource.panuon.com/wpf-ui"
-             xmlns:hc="clr-namespace:HMI.Core;assembly=HMI.Core"
              xmlns:uic="clr-namespace:HMI.UI.Converter;assembly=HMI.UI"
              xmlns:dp="clr-namespace:HMI.UI.DpUtil;assembly=HMI.UI">
     <ResourceDictionary.MergedDictionaries>
@@ -16,8 +15,6 @@
         <pu:StyleDictionary Includes="PasswordBox,TextBox,ComboBox,Button,DataGrid,TreeView,Menu" />
         <ResourceDictionary Source="/HMI.UI;component/Resources/Font/Font.xaml"/>
     </ResourceDictionary.MergedDictionaries>
-
-    <hc:LangConverter x:Key="lc"/>
     <sys:Double x:Key="TitleFontSize">20</sys:Double>
     <sys:Double x:Key="ContentFontSize">16</sys:Double>
     <sys:Double x:Key="ContentFontSize2">14</sys:Double>
@@ -53,6 +50,11 @@
         <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="&#xe631;"/>
         <Setter Property="Content" Value="{DynamicResource App.Refresh}"/>
@@ -153,7 +155,7 @@
     <Style x:Key="CardBoarder" TargetType="Border">
         <Setter Property="BorderBrush" Value="{StaticResource CommonBoarder}"/>
         <Setter Property="BorderThickness" Value="2"/>
-        <Setter Property="Background" Value="#FFF"/>
+        <Setter Property="Background" Value="#f3f9ff"/>
         <Setter Property="Margin" Value="10"/>
         <Setter Property="Padding" Value="10"/>
     </Style>
@@ -170,7 +172,6 @@
 
     <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"/>
@@ -183,13 +184,11 @@
                 <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="pu:DataGridHelper.ColumnHeaderPadding" Value="0"/>
         <Setter Property="RowHeight" Value="30"/>
@@ -198,7 +197,7 @@
         <Setter Property="SelectionMode" Value="Single"/>
         <Setter Property="RowStyle" Value="{StaticResource DefaultDataGridRow}"/>
         <Setter Property="AlternationCount" Value="2"></Setter>
-        <Setter Property="Foreground" Value="#878787"/>
+        <Setter Property="Foreground" Value="#3a3a3a"/>
         <Setter Property="HorizontalGridLinesBrush" Value="{StaticResource TableBoarder}"/>
         <Setter Property="VerticalGridLinesBrush" Value="{StaticResource TableBoarder}"/>
         <Setter Property="BorderBrush" Value="{StaticResource TableBoarder}" />
@@ -226,7 +225,6 @@
         <Setter Property="pu:DataGridHelper.RowSelectedBackground" Value="{StaticResource PrimaryColor}"/>
         <Setter Property="pu:DataGridHelper.RowSelectedForeground" Value="White"/>
         <Setter Property="pu:DataGridHelper.RowHeaderBorderThickness" Value="10,0,0,0"/>
-        <Setter Property="pu:DataGridHelper.RowHeaderBackground" Value="Red"/>
         <Setter Property="pu:DataGridHelper.ColumnHeaderBorderThickness" Value="0"/>
         <Setter Property="pu:DataGridHelper.ColumnHeaderPadding" Value="0"/>
     </Style>
@@ -280,9 +278,16 @@
         <Setter Property="pu:WindowXCaption.Buttons" Value="Close"/>
         <Setter Property="pu:WindowXModalDialog.Buttons" Value="OKCancel"/>
         <Setter Property="pu:WindowXModalDialog.CancelButtonContent" 
-                Value="{Binding Converter={StaticResource lc},ConverterParameter='App.Cancel'}"/>
+                Value="{DynamicResource App.Cancel}"/>
         <Setter Property="pu:WindowXModalDialog.OKButtonContent" 
-                Value="{Binding Converter={StaticResource lc},ConverterParameter='App.Save'}"/>
+                Value="{DynamicResource App.Save}"/>
         <Setter Property="pu:WindowXModalDialog.ButtonPanelMargin" Value="0,30,10,10"/>
     </Style>
+
+    <Popup x:Key="testPop" Placement="Relative" StaysOpen="True" Width="1920" Height="1080">
+        <Rectangle x:Name="RectMask"
+           Fill="Red"
+           Opacity="0"
+           Visibility="Visible" />
+    </Popup>
 </ResourceDictionary>
\ No newline at end of file

--
Gitblit v1.9.1