From 3a471ae651b228231bebb3a2d438baa1d4ac0261 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期五, 21 十一月 2025 08:57:52 +0800
Subject: [PATCH] 优化
---
HMI.AlermInfoManage/Modal/AlarmSettingModal.xaml | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/HMI.AlermInfoManage/Modal/AlarmSettingModal.xaml b/HMI.AlermInfoManage/Modal/AlarmSettingModal.xaml
index 36941a7..6dca9df 100644
--- a/HMI.AlermInfoManage/Modal/AlarmSettingModal.xaml
+++ b/HMI.AlermInfoManage/Modal/AlarmSettingModal.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,32 +17,32 @@
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"
- ui:FormGroupHelper.ValidateMethod="ValidateDBAddress"
- Header="DB鍦板潃" GroupName="MyFormGroup">
- <pu:NumberInput Style="{StaticResource FormNumberInput}"
- x:Name="dbAddress" Interval="1"/>
+ <pu:FormGroup Header="{DynamicResource Alm.DbAddress}"
+ dp:FormGroupHelper.IsRequired="True"
+ dp:FormGroupHelper.ValidateMethod="ValidateDBAddress"
+ GroupName="MyFormGroup">
+ <TextBox Style="{StaticResource EditorTextBoxStyle}"
+ x:Name="dbAddress"/>
</pu:FormGroup>
- <pu:FormGroup ui:FormGroupHelper.IsRequired="True"
- Header="璧峰鍦板潃" GroupName="MyFormGroup">
- <pu:NumberInput Style="{StaticResource FormNumberInput}" x:Name="startAddress" Interval="1"/>
+ <pu:FormGroup Header="{DynamicResource Alm.StartAddress}" dp:FormGroupHelper.IsRequired="True"
+ GroupName="MyFormGroup">
+ <TextBox Style="{StaticResource EditorTextBoxStyle}"
+ x:Name="startAddress"/>
</pu:FormGroup>
- <pu:FormGroup ui: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>
+
+ <pu:FormGroup x:Name="FgDesc" Header="{DynamicResource Alm.Description}" dp:FormGroupHelper.IsRequired="True"
+ GroupName="MyFormGroup">
+ <TextBox Style="{StaticResource EditorTextBoxStyle}" x:Name="TbDesc"/>
+ </pu:FormGroup>
</StackPanel>
</Grid>
</pu:WindowX>
--
Gitblit v1.9.1