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.IOMonitor/IPManageModal.xaml | 14 ++++----------
1 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/HMI.IOMonitor/IPManageModal.xaml b/HMI.IOMonitor/IPManageModal.xaml
index 963a325..f3e2cae 100644
--- a/HMI.IOMonitor/IPManageModal.xaml
+++ b/HMI.IOMonitor/IPManageModal.xaml
@@ -8,6 +8,7 @@
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"
@@ -16,22 +17,15 @@
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}">
<Grid Margin="10">
<StackPanel x:Name="formPanel">
- <pu:FormGroup ui:FormGroupHelper.IsRequired="True"
+ <pu:FormGroup dp:FormGroupHelper.IsRequired="True"
Header="I鐐硅鍙栨爣绛�" GroupName="MyFormGroup">
<TextBox Style="{StaticResource EditorTextBoxStyle}" x:Name="iTag"/>
</pu:FormGroup>
- <pu:FormGroup ui:FormGroupHelper.IsRequired="True"
+ <pu:FormGroup dp:FormGroupHelper.IsRequired="True"
Header="Q鐐硅鍙栨爣绛�" GroupName="MyFormGroup">
<TextBox Style="{StaticResource EditorTextBoxStyle}" x:Name="qTag"/>
</pu:FormGroup>
--
Gitblit v1.9.1