From 771a0e7b6b1276087515bbe94de28358cb92963b Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期四, 04 六月 2026 10:32:27 +0800
Subject: [PATCH] 优化老化；
---
HMI.ParameterManage/ParameterModal.xaml | 79 ++++++++++++++++++++++++++++-----------
1 files changed, 56 insertions(+), 23 deletions(-)
diff --git a/HMI.ParameterManage/ParameterModal.xaml b/HMI.ParameterManage/ParameterModal.xaml
index ba73ce9..2fb7f11 100644
--- a/HMI.ParameterManage/ParameterModal.xaml
+++ b/HMI.ParameterManage/ParameterModal.xaml
@@ -8,54 +8,87 @@
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 MainBorder}"
- 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"
- Header="浜у搧鍚嶇О" GroupName="MyFormGroup">
+ <pu:FormGroup x:Name="FgProductName"
+ Header="{DynamicResource Pm.Product.Name}"
+ dp:FormGroupHelper.IsRequired="True"
+ 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"
- Header="鍙傛暟鍚嶇О" GroupName="MyFormGroup">
+ <pu:FormGroup x:Name="FgName"
+ dp:FormGroupHelper.ValidateMethod="ValidateName"
+ Header="{DynamicResource Pm.Parameter.Name}"
+ dp:FormGroupHelper.IsRequired="True" GroupName="MyFormGroup">
<TextBox x:Name="TbName" Style="{StaticResource EditorTextBoxStyle}" />
</pu:FormGroup>
+ <pu:FormGroup x:Name="FgType"
+ Header="{DynamicResource Pm.Parameter.Type}"
+ dp:FormGroupHelper.IsRequired="True" GroupName="MyFormGroup">
+ <ComboBox x:Name="CbType" Style="{StaticResource FormComboxStyle}"
+ SelectionChanged="CbType_SelectionChanged"
+ SelectedValuePath="Content">
+ <ComboBoxItem>Int</ComboBoxItem>
+ <ComboBoxItem>Double</ComboBoxItem>
+ <ComboBoxItem>Bool</ComboBoxItem>
+ <ComboBoxItem>String</ComboBoxItem>
+ </ComboBox>
+ </pu:FormGroup>
+
+ <pu:FormGroup x:Name="FgIsArray" Header="IsArray" dp:FormGroupHelper.IsRequired="True" GroupName="MyFormGroup">
+ <CheckBox x:Name="CbIsArray" />
+ </pu:FormGroup>
+
<pu:FormGroup x:Name="FgValue" Style="{StaticResource RequiredInputFormGroupStyle}"
- ui:FormGroupHelper.IsRequired="True"
- Header="鍙傛暟鍊�" GroupName="MyFormGroup">
- <TextBox x:Name="TbValue" Style="{StaticResource EditorTextBoxStyle}" />
+ Header="{DynamicResource Pm.Parameter.Value}"
+dp:FormGroupHelper.IsRequired="True" GroupName="MyFormGroup">
+ <Grid>
+ <ComboBox x:Name="CbBoolValue" Style="{StaticResource FormComboxStyle}"
+ Visibility="Collapsed"
+ SelectedValuePath="Content">
+ <ComboBoxItem>True</ComboBoxItem>
+ <ComboBoxItem>False</ComboBoxItem>
+ </ComboBox>
+ <ui:NumberInput x:Name="NiNumberValue" Visibility="Collapsed" Style="{StaticResource EditorTextBoxStyle}"/>
+ <Grid x:Name="StringValueGrid">
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition/>
+ <ColumnDefinition Width="Auto"/>
+ </Grid.ColumnDefinitions>
+ <TextBox x:Name="TbStringValue" Style="{StaticResource EditorTextBoxStyle}"/>
+ <Button Grid.Column="1" Click="Button_Click" Style="{StaticResource SearchButton}"/>
+ </Grid>
+ </Grid>
</pu:FormGroup>
<pu:FormGroup x:Name="FgUnit" Style="{StaticResource InputFormGroupStyle}"
- Header="鍗曚綅" GroupName="MyFormGroup">
+ Header="{DynamicResource Pm.Parameter.Unit}"
+dp:FormGroupHelper.IsRequired="False" GroupName="MyFormGroup">
<TextBox x:Name="TbUnit" Style="{StaticResource EditorTextBoxStyle}" />
</pu:FormGroup>
<pu:FormGroup x:Name="FgDescription" Style="{StaticResource InputFormGroupStyle}"
-Header="鎻忚堪" GroupName="MyFormGroup">
+Header="{DynamicResource Pm.Parameter.Desc}"
+dp:FormGroupHelper.IsRequired="False" GroupName="MyFormGroup">
<TextBox x:Name="TbDescription" Style="{StaticResource MultilineEditorTextBoxStyle}" />
</pu:FormGroup>
<pu:FormGroup x:Name="FgPGroup" Style="{StaticResource InputFormGroupStyle}"
-Header="缁�" GroupName="MyFormGroup">
- <TextBox x:Name="TbPGroup" Style="{StaticResource EditorTextBoxStyle}" />
+Header="{DynamicResource Pm.Parameter.Group}"
+dp:FormGroupHelper.IsRequired="False" GroupName="MyFormGroup">
+ <!--<TextBox x:Name="TbPGroup" Style="{StaticResource EditorTextBoxStyle}" />-->
+ <ComboBox x:Name="CbGroup" IsEditable="True" Style="{StaticResource FormComboxStyle}"/>
</pu:FormGroup>
</StackPanel>
</Grid>
--
Gitblit v1.9.1