From 9211ec11c112e18cd99e77f889a01110a70031ce Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期一, 24 十一月 2025 17:47:15 +0800
Subject: [PATCH] 优化项目结构
---
HMI.DataViewer/DbSettingModal.xaml | 64 +++++++++++++++++++++----------
1 files changed, 43 insertions(+), 21 deletions(-)
diff --git a/HMI.DataViewer/DbSettingModal.xaml b/HMI.DataViewer/DbSettingModal.xaml
index b91d95f..1268725 100644
--- a/HMI.DataViewer/DbSettingModal.xaml
+++ b/HMI.DataViewer/DbSettingModal.xaml
@@ -17,21 +17,20 @@
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" Header="鍚嶇О" GroupName="MyFormGroup">
+ <pu:FormGroup Header="{DynamicResource Dv.Datasource.Name}"
+ dp:FormGroupHelper.IsRequired="True"
+ Style="{StaticResource InputFormGroupStyle}"
+ GroupName="MyFormGroup">
<TextBox Style="{StaticResource EditorTextBoxStyle}" x:Name="programInput"/>
</pu:FormGroup>
- <pu:FormGroup ui:FormGroupHelper.IsRequired="True" Header="鏁版嵁鏂囦欢" GroupName="MyFormGroup">
+ <pu:FormGroup Header="{DynamicResource Dv.Datasource.File}"
+ dp:FormGroupHelper.IsRequired="True"
+ Style="{StaticResource InputFormGroupStyle}"
+ GroupName="MyFormGroup">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition/>
@@ -42,12 +41,15 @@
</Grid>
</pu:FormGroup>
- <pu:FormGroup ui:FormGroupHelper.IsRequired="True" Header="鏁版嵁琛�" GroupName="MyFormGroup">
+ <pu:FormGroup Header="{DynamicResource Dv.Datasource.Table}"
+ dp:FormGroupHelper.IsRequired="True"
+ Style="{StaticResource InputFormGroupStyle}"
+ GroupName="MyFormGroup">
<ComboBox Style="{StaticResource FormComboxStyle}" SelectedValuePath="Content"
x:Name="tableNameInput" SelectionChanged="ComboxSelectionChanged"/>
</pu:FormGroup>
- <pu:FormGroup Header="瀛楁璁剧疆" Orientation="Vertical" GroupName="MyFormGroup">
+ <pu:FormGroup Header="{DynamicResource Dv.Datasource.Fields}" Orientation="Vertical" GroupName="MyFormGroup">
<Grid dp:GridHelper.Space="10">
<Grid.ColumnDefinitions>
<ColumnDefinition/>
@@ -69,19 +71,29 @@
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
- <DataGridTextColumn Width="*" Binding="{Binding }" Header="瀛楁鍚�" />
+ <DataGridTextColumn Width="*" Binding="{Binding }">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{DynamicResource Dv.Datasource.FieldName}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
</DataGrid.Columns>
</DataGrid>
<StackPanel Grid.Column="1" VerticalAlignment="Stretch" dp:StackPanelHelper.ChildSpace="10">
- <Button Style="{StaticResource PrimaryButton}" x:Name="selectAllBtn" Click="Button_Click">鍏ㄩ��</Button>
- <Button Style="{StaticResource PrimaryButton}" x:Name="addBtn" Click="Button_Click">娣诲姞</Button>
- <Button Style="{StaticResource PrimaryButton}" x:Name="delBtn" Click="Button_Click">鍒犻櫎</Button>
+ <Button Style="{StaticResource PrimaryButton}" x:Name="selectAllBtn" Click="Button_Click"
+ Content="{DynamicResource App.SelectAll}"
+ />
+ <Button Style="{StaticResource PrimaryButton}" x:Name="addBtn" Click="Button_Click"
+ Content="{DynamicResource App.AddTo}"/>
+ <Button Style="{StaticResource PrimaryButton}" x:Name="delBtn" Click="Button_Click"
+ Content="{DynamicResource App.Delete}"
+ />
</StackPanel>
<DataGrid Grid.Column="2" Style="{StaticResource DefaultDataGrid}"
BorderThickness="1"
IsReadOnly="False"
+ SelectionMode="Extended"
pu:DataGridHelper.ColumnHeaderFontSize="12"
ItemsSource="{Binding Conditions}" x:Name="conditionTable">
<DataGrid.Columns>
@@ -93,14 +105,24 @@
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
- <DataGridTextColumn Width="*" IsReadOnly="True" Binding="{Binding Key}" Header="瀛楁鍚�" />
- <DataGridTextColumn Width="*" Binding="{Binding Desc}" Header="鏄剧ず鍚�" />
- <DataGridTemplateColumn Width="*" Header="鏄犲皠鏃堕棿" IsReadOnly="True">
+ <DataGridTextColumn Width="*" IsReadOnly="True" Binding="{Binding Key}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{DynamicResource Dv.Datasource.FieldName}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
+ <DataGridTextColumn Width="*" Binding="{Binding Desc}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{DynamicResource Dv.Datasource.Desc}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
+ <DataGridTemplateColumn Width="*" IsReadOnly="True">
+ <DataGridTemplateColumn.Header>
+ <TextBlock Text="{DynamicResource Dv.Datasource.TimeField}"/>
+ </DataGridTemplateColumn.Header>
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<RadioButton IsChecked="{Binding IsTimeCol,Mode=OneWay}"
- Click="RadioButton_Click"
- ></RadioButton>
+ Click="RadioButton_Click"/>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
--
Gitblit v1.9.1