From dedcf4174c8540ee3a912daad2ff13e014e495b1 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期五, 28 三月 2025 16:28:30 +0800
Subject: [PATCH] 优化UI组件;

---
 HMI.ParameterManage/ProductModal.xaml |   28 ++++------------------------
 1 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/HMI.ParameterManage/ProductModal.xaml b/HMI.ParameterManage/ProductModal.xaml
index 1b9c033..10d4dd4 100644
--- a/HMI.ParameterManage/ProductModal.xaml
+++ b/HMI.ParameterManage/ProductModal.xaml
@@ -16,31 +16,11 @@
             BorderBrush="#3E3E45"
             BorderThickness="1"
             Foreground="Black"
-            pu:WindowXCaption.Background="{StaticResource PrimaryColor}"
-            pu:WindowXModalDialog.ButtonStyle="{StaticResource ModalButton}"
-            pu:WindowXCaption.Foreground="#FFF"
-            pu:WindowXCaption.Buttons="Close"
-            pu:WindowXModalDialog.Buttons="OKCancel"
-            pu:WindowXModalDialog.CancelButtonContent="鍙栨秷"
-            pu:WindowXModalDialog.OKButtonContent="淇濆瓨"
-            pu:WindowXModalDialog.ButtonPanelMargin="0,30,10,10">
-    <Window.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <pu:StyleDictionary Includes="TreeView" />
-                <ResourceDictionary Source="/HMI.UI;component/Style/PanuonResource.xaml"/>
-                <ResourceDictionary Source="/HMI.UI;component/Resources/Font/Font.xaml"/>
-                <ResourceDictionary Source="/HMI.UI;component/Style/Colors.xaml"/>
-            </ResourceDictionary.MergedDictionaries>
-            <uic:PathImageConverter x:Key="path2Image"/>
-            <uic:DataGridRowNumberConverter x:Key="rowNumber"/>
-        </ResourceDictionary>
-    </Window.Resources>
-
+            Style="{StaticResource ModalWindow}">
     <Grid Margin="10">
         <StackPanel x:Name="formPanel">
             <pu:FormGroup x:Name="FgName" Style="{StaticResource RequiredInputFormGroupStyle}" 
-                              Header="浜у搧鍚嶇О" GroupName="MyFormGroup"
+                              Header="{DynamicResource Pm.Product.Name}" GroupName="MyFormGroup"
                           dp:FormGroupHelper.IsRequired="True"
                           dp:FormGroupHelper.ValidateMethod="ValidateName"
                           >
@@ -48,12 +28,12 @@
             </pu:FormGroup>
 
             <pu:FormGroup x:Name="FgIsMaster" Style="{StaticResource InputFormGroupStyle}" 
-                          Header="鏄惁鏍蜂欢" GroupName="MyFormGroup">
+                          Header="{DynamicResource Pm.Product.IsSample}" GroupName="MyFormGroup">
                 <CheckBox x:Name="TbIsMaster"  />
             </pu:FormGroup>
 
             <pu:FormGroup x:Name="FgParentId" Style="{StaticResource InputFormGroupStyle}" 
-                  Header="缁ф壙" GroupName="MyFormGroup">
+                  Header="{DynamicResource Pm.Product.Extend}" GroupName="MyFormGroup">
                 <TextBox x:Name="TbParentId" Style="{StaticResource EditorTextBoxStyle}" />
             </pu:FormGroup>
         </StackPanel>

--
Gitblit v1.9.1