From ef52fd6fd07508883dce4eb002acda59f0169e59 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期四, 23 四月 2026 10:19:33 +0800
Subject: [PATCH] 优化；
---
HMI.DataViewer/DbSettingModal.xaml | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/HMI.DataViewer/DbSettingModal.xaml b/HMI.DataViewer/DbSettingModal.xaml
index 1268725..fa82faa 100644
--- a/HMI.DataViewer/DbSettingModal.xaml
+++ b/HMI.DataViewer/DbSettingModal.xaml
@@ -22,6 +22,7 @@
<StackPanel x:Name="formPanel">
<pu:FormGroup Header="{DynamicResource Dv.Datasource.Name}"
dp:FormGroupHelper.IsRequired="True"
+ dp:FormGroupHelper.ValidateMethod="ValidateName"
Style="{StaticResource InputFormGroupStyle}"
GroupName="MyFormGroup">
<TextBox Style="{StaticResource EditorTextBoxStyle}" x:Name="programInput"/>
@@ -36,7 +37,7 @@
<ColumnDefinition/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
- <TextBox Style="{StaticResource EditorTextBoxStyle}" IsReadOnly="True" x:Name="dbFilePathInput"/>
+ <TextBox Style="{StaticResource EditorTextBoxStyle}" IsReadOnly="False" x:Name="dbFilePathInput"/>
<Button Style="{StaticResource SearchButton}" x:Name="searchBtn" Click="Button_Click" Grid.Column="1"/>
</Grid>
</pu:FormGroup>
@@ -49,6 +50,10 @@
x:Name="tableNameInput" SelectionChanged="ComboxSelectionChanged"/>
</pu:FormGroup>
+ <pu:FormGroup Header="閫氶厤绗�" Style="{StaticResource InputFormGroupStyle}" GroupName="MyFormGroup">
+ <TextBox Style="{StaticResource EditorTextBoxStyle}" x:Name="TbPattern"/>
+ </pu:FormGroup>
+
<pu:FormGroup Header="{DynamicResource Dv.Datasource.Fields}" Orientation="Vertical" GroupName="MyFormGroup">
<Grid dp:GridHelper.Space="10">
<Grid.ColumnDefinitions>
@@ -59,7 +64,6 @@
<DataGrid Style="{StaticResource DefaultDataGrid}"
BorderThickness="1"
- pu:DataGridHelper.ColumnHeaderFontSize="12"
SelectionMode="Extended"
ItemsSource="{Binding Columns}" x:Name="columnTable">
<DataGrid.Columns>
@@ -86,15 +90,13 @@
<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}"
- />
+ 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>
<DataGridTemplateColumn Header="#" CanUserResize="False" IsReadOnly="True">
--
Gitblit v1.9.1