From 3a471ae651b228231bebb3a2d438baa1d4ac0261 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期五, 21 十一月 2025 08:57:52 +0800
Subject: [PATCH] 优化
---
Plugin.DataBoard/DataBoard.xaml | 45 ++++++++++++++++++++++++++++++++-------------
1 files changed, 32 insertions(+), 13 deletions(-)
diff --git a/Plugin.DataBoard/DataBoard.xaml b/Plugin.DataBoard/DataBoard.xaml
index 81d6c11..c512b0f 100644
--- a/Plugin.DataBoard/DataBoard.xaml
+++ b/Plugin.DataBoard/DataBoard.xaml
@@ -14,8 +14,11 @@
Loaded="PluginControl_Loaded"
d:DesignHeight="450" d:DesignWidth="800">
<UserControl.Resources>
- <Style TargetType="ComboBox" BasedOn="{StaticResource FormComboxStyle}">
+ <Style x:Key="cbDate" TargetType="ComboBox" BasedOn="{StaticResource FormComboxStyle}">
<EventSetter Event="SelectionChanged" Handler="ComboBox_SelectionChanged"/>
+ <Setter Property="pu:ComboBoxHelper.ClearButtonVisibility" Value="Collapsed"/>
+ <Setter Property="SelectedValuePath" Value="Value"/>
+ <Setter Property="DisplayMemberPath" Value="Name"/>
</Style>
<Style TargetType="pu:DateTimePicker" BasedOn="{StaticResource TimePicker}">
<Setter Property="MinWidth" Value="0"/>
@@ -28,6 +31,7 @@
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
+ <RowDefinition Height="Auto"/>
<RowDefinition/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
@@ -37,17 +41,32 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
- <ComboBox x:Name="cb0" ItemsSource="{Binding Options}" SelectedValuePath="Value" DisplayMemberPath="Name"/>
+ <pu:FormGroup Header="鍨嬪彿">
+ <Grid>
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition/>
+ <ColumnDefinition Width="Auto"/>
+ </Grid.ColumnDefinitions>
+ <ComboBox x:Name="modelSelect" Style="{StaticResource FormComboxStyle}"
+ pu:ComboBoxHelper.ClearButtonVisibility="Visible" SelectionChanged="modelSelect_SelectionChanged"/>
+ <Button x:Name="btnAll" Grid.Column="1" Click="Button_Click"
+ Style="{StaticResource RfhBtn}" Content="鍏ㄩ儴鍒锋柊"/>
+ </Grid>
+ </pu:FormGroup>
- <ComboBox x:Name="cb1" Grid.Column="1" ItemsSource="{Binding Options}"
- SelectedValuePath="Value" DisplayMemberPath="Name"/>
- <ComboBox x:Name="cb2" Grid.Column="2" ItemsSource="{Binding Options}"
- SelectedValuePath="Value" DisplayMemberPath="Name"/>
+ <ComboBox Grid.Row="1" Grid.Column="0" x:Name="cb0" ItemsSource="{Binding Options}"
+ Style="{StaticResource cbDate}"/>
- <ComboBox x:Name="cb3" Grid.Column="3" ItemsSource="{Binding Options}"
- SelectedValuePath="Value" DisplayMemberPath="Name"/>
+ <ComboBox Grid.Row="1" Grid.Column="1" x:Name="cb1" ItemsSource="{Binding Options}"
+ Style="{StaticResource cbDate}"/>
- <Grid Grid.Row="1" Grid.Column="0">
+ <ComboBox Grid.Row="1" Grid.Column="2" x:Name="cb2" ItemsSource="{Binding Options}"
+ Style="{StaticResource cbDate}"/>
+
+ <ComboBox Grid.Row="1" Grid.Column="3" x:Name="cb3" ItemsSource="{Binding Options}"
+ Style="{StaticResource cbDate}"/>
+
+ <Grid Grid.Row="2" Grid.Column="0">
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition Width="Auto"/>
@@ -63,7 +82,7 @@
Content="{DynamicResource bd.btn}"/>
</Grid>
- <Grid Grid.Row="1" Grid.Column="1">
+ <Grid Grid.Row="2" Grid.Column="1">
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition Width="Auto"/>
@@ -79,7 +98,7 @@
Content="{DynamicResource bd.btn}"/>
</Grid>
- <Grid Grid.Row="1" Grid.Column="2">
+ <Grid Grid.Row="2" Grid.Column="2">
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition Width="Auto"/>
@@ -95,7 +114,7 @@
Content="{DynamicResource bd.btn}"/>
</Grid>
- <Grid Grid.Row="1" Grid.Column="3">
+ <Grid Grid.Row="2" Grid.Column="3">
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition Width="Auto"/>
@@ -111,7 +130,7 @@
Content="{DynamicResource bd.btn}"/>
</Grid>
- <wv2:WebView2 Grid.Row="2" Grid.ColumnSpan="4" Name = "webview2"
+ <wv2:WebView2 Grid.Row="3" Grid.ColumnSpan="4" Name = "webview2"
SizeChanged="webview2_SizeChanged"
NavigationCompleted="Webview2_NavigationCompleted"
Loaded="webview2_Loaded"/>
--
Gitblit v1.9.1