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.AlermInfoManage/Modal/AlarmSettingModal.xaml | 22 ++++++++--------------
1 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/HMI.AlermInfoManage/Modal/AlarmSettingModal.xaml b/HMI.AlermInfoManage/Modal/AlarmSettingModal.xaml
index 6edad5f..da381d3 100644
--- a/HMI.AlermInfoManage/Modal/AlarmSettingModal.xaml
+++ b/HMI.AlermInfoManage/Modal/AlarmSettingModal.xaml
@@ -17,30 +17,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">
+ Style="{StaticResource ModalWindow}">
<Grid Margin="10">
<StackPanel x:Name="formPanel">
- <pu:FormGroup dp:FormGroupHelper.IsRequired="True"
+ <pu:FormGroup Header="{DynamicResource Alm.DbAddress}"
+ dp:FormGroupHelper.IsRequired="True"
dp:FormGroupHelper.ValidateMethod="ValidateDBAddress"
- Header="DB鍦板潃" GroupName="MyFormGroup">
+ GroupName="MyFormGroup">
<pu:NumberInput Style="{StaticResource FormNumberInput}"
x:Name="dbAddress" Interval="1"/>
</pu:FormGroup>
- <pu:FormGroup dp:FormGroupHelper.IsRequired="True"
- Header="璧峰鍦板潃" GroupName="MyFormGroup">
+ <pu:FormGroup Header="{DynamicResource Alm.StartAddress}" dp:FormGroupHelper.IsRequired="True"
+ GroupName="MyFormGroup">
<pu:NumberInput Style="{StaticResource FormNumberInput}" x:Name="startAddress" Interval="1"/>
</pu:FormGroup>
- <pu:FormGroup dp:FormGroupHelper.IsRequired="True"
- Header="闀垮害" GroupName="MyFormGroup">
+ <pu:FormGroup Header="{DynamicResource Alm.DbLength}" dp:FormGroupHelper.IsRequired="True"
+ GroupName="MyFormGroup">
<pu:NumberInput Style="{StaticResource FormNumberInput}" x:Name="length" Interval="1"/>
</pu:FormGroup>
</StackPanel>
--
Gitblit v1.9.1