From 9d1660270272180cd71147d6ddd53d1382643d2e Mon Sep 17 00:00:00 2001
From: wenxiangchao <wenxiangchao@ihengxin.com.cn>
Date: 星期一, 02 十一月 2026 18:00:14 +0800
Subject: [PATCH] merge: 并入远程 Initial commit 作为历史根节点
---
HMI.SettingControl/SystemConfig.xaml | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/HMI.SettingControl/SystemConfig.xaml b/HMI.SettingControl/SystemConfig.xaml
index 9a14cfc..4c84da8 100644
--- a/HMI.SettingControl/SystemConfig.xaml
+++ b/HMI.SettingControl/SystemConfig.xaml
@@ -15,7 +15,6 @@
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<pu:StyleDictionary Includes="TabControl" />
- <ResourceDictionary Source="/HMI.UI;component/Style/PanuonResource.xaml"/>
<ResourceDictionary Source="/HMI.UI;component/Resources/Font/Font.xaml"/>
</ResourceDictionary.MergedDictionaries>
@@ -23,7 +22,7 @@
<uic:DataGridRowNumberConverter x:Key="rowNumber"/>
</ResourceDictionary>
</UserControl.Resources>
-
+
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
@@ -49,6 +48,22 @@
</Grid>
</pu:FormGroup>
+ <pu:FormGroup x:Name="FgLoginLogo" Style="{StaticResource InputFormGroupStyle}"
+ HeaderWidth="Auto"
+ Header="Login Logo" GroupName="MyFormGroup">
+ <Grid>
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition />
+ <ColumnDefinition Width="30" />
+ </Grid.ColumnDefinitions>
+ <TextBox x:Name="TbLoginLogo" IsReadOnly="True"
+ Text="{Binding LoginLogoPath}"
+ FontFamily="{StaticResource iconfont}" Style="{StaticResource EditorTextBoxStyle}" />
+ <Button Grid.Column="1" BorderThickness="0,1,1,1" Style="{StaticResource SearchButton}"
+ x:Name="BtnLoginLogo" Click="Button_Click"/>
+ </Grid>
+ </pu:FormGroup>
+
<pu:FormGroup Header="{DynamicResource Setting.Title}" HeaderWidth="Auto" GroupName="MyFormGroup">
<TextBox Text="{Binding WindowTitle}"/>
</pu:FormGroup>
@@ -57,15 +72,22 @@
<ComboBox x:Name="CbLang" Style="{StaticResource FormComboxStyle}"
SelectedValue="{Binding CurrentLanguage}" SelectedValuePath="Code" DisplayMemberPath="Name"/>
</pu:FormGroup>
+
+ <pu:FormGroup Header="{DynamicResource Setting.LogExpiredDays}" HeaderWidth="Auto" GroupName="MyFormGroup">
+ <pu:NumberInput Interval="1" x:Name="NiLogExpiredDays" Style="{StaticResource FormNumberInput}"
+ Value="{Binding LogExpiredDays}"/>
+ </pu:FormGroup>
</StackPanel>
</GroupBox>
<GroupBox Grid.Row="1" Header="{DynamicResource Setting.PlcSetting}" Padding="10">
<StackPanel>
<pu:FormGroup Header="{DynamicResource Setting.PlcIp}" HeaderWidth="Auto" GroupName="MyFormGroup">
- <TextBox Text="{Binding PlcIp}"/>
+ <TextBox Text="{Binding PlcIp,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
</pu:FormGroup>
-
+ <pu:FormGroup Header="PLC Port" HeaderWidth="Auto" GroupName="MyFormGroup">
+ <pu:NumberInput Value="{Binding PlcPort,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
+ </pu:FormGroup>
<pu:FormGroup Header="{DynamicResource Setting.PlcEnabled}" HeaderWidth="Auto" GroupName="MyFormGroup">
<CheckBox IsChecked="{Binding PlcEnabled,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
</pu:FormGroup>
--
Gitblit v1.9.1