From 2e54b439c64e0adbb7e010243c1f33aa5fc5f503 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期二, 11 三月 2025 14:08:57 +0800
Subject: [PATCH] 完善程序； Merge branch 'master' of http://58.211.88.246:3600/r/WPF/WPFProject
---
HMI.ParameterManage/ParameterModal.xaml | 23 ++++++++---------------
1 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/HMI.ParameterManage/ParameterModal.xaml b/HMI.ParameterManage/ParameterModal.xaml
index 08bc442..eb6f928 100644
--- a/HMI.ParameterManage/ParameterModal.xaml
+++ b/HMI.ParameterManage/ParameterModal.xaml
@@ -8,37 +8,30 @@
xmlns:pu="https://opensource.panuon.com/wpf-ui"
xmlns:uic="clr-namespace:HMI.UI.Converter;assembly=HMI.UI"
xmlns:ui="clr-namespace:HMI.UI;assembly=HMI.UI"
+ xmlns:dp="clr-namespace:HMI.UI.DpUtil;assembly=HMI.UI"
mc:Ignorable="d"
Title="Form"
SizeToContent="Height"
Width="600"
WindowStartupLocation="CenterOwner"
- 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">
+ Style="{StaticResource ModalWindow}"
+ pu:WindowXModalDialog.OKButtonContent=
+ "{Binding Converter={StaticResource lc},ConverterParameter='App.Save'}">
<Grid Margin="10">
<StackPanel x:Name="formPanel">
- <pu:FormGroup x:Name="FgProductName" ui:FormGroupHelper.IsRequired="True"
+ <pu:FormGroup x:Name="FgProductName" dp:FormGroupHelper.IsRequired="True"
Header="浜у搧鍚嶇О" GroupName="MyFormGroup">
<TextBox x:Name="TbProductName" IsReadOnly="True" Style="{StaticResource EditorTextBoxStyle}" />
</pu:FormGroup>
- <pu:FormGroup x:Name="FgName" ui:FormGroupHelper.IsRequired="True"
- ui:FormGroupHelper.ValidateMethod="ValidateName"
+ <pu:FormGroup x:Name="FgName" dp:FormGroupHelper.IsRequired="True"
+ dp:FormGroupHelper.ValidateMethod="ValidateName"
Header="鍙傛暟鍚嶇О" GroupName="MyFormGroup">
<TextBox x:Name="TbName" Style="{StaticResource EditorTextBoxStyle}" />
</pu:FormGroup>
<pu:FormGroup x:Name="FgValue" Style="{StaticResource RequiredInputFormGroupStyle}"
- ui:FormGroupHelper.IsRequired="True"
+ dp:FormGroupHelper.IsRequired="True"
Header="鍙傛暟鍊�" GroupName="MyFormGroup">
<TextBox x:Name="TbValue" Style="{StaticResource EditorTextBoxStyle}" />
</pu:FormGroup>
--
Gitblit v1.9.1