From c401a2f2fd1a509cdeb33e850bb5c2827074af48 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期一, 17 三月 2025 08:44:51 +0800
Subject: [PATCH] 完善框架，新增两个close方法；
---
HMI.ParameterManage/ProductModal.xaml | 34 +++++++++-------------------------
1 files changed, 9 insertions(+), 25 deletions(-)
diff --git a/HMI.ParameterManage/ProductModal.xaml b/HMI.ParameterManage/ProductModal.xaml
index dd216e1..10d4dd4 100644
--- a/HMI.ParameterManage/ProductModal.xaml
+++ b/HMI.ParameterManage/ProductModal.xaml
@@ -7,6 +7,7 @@
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"
mc:Ignorable="d"
Title="Form"
SizeToContent="Height"
@@ -15,41 +16,24 @@
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>
+ <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"
+ >
<TextBox x:Name="TbName" Style="{StaticResource EditorTextBoxStyle}" />
</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