From 0940f31b7eba1cf6b6a8c1fca72d97cf686e79f2 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期五, 04 七月 2025 10:43:00 +0800
Subject: [PATCH] 优化插件，完善TreeListView
---
HMI.ParameterManage/ParameterSetting.xaml | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/HMI.ParameterManage/ParameterSetting.xaml b/HMI.ParameterManage/ParameterSetting.xaml
index c4e41b5..cc093dc 100644
--- a/HMI.ParameterManage/ParameterSetting.xaml
+++ b/HMI.ParameterManage/ParameterSetting.xaml
@@ -10,12 +10,17 @@
xmlns:pu="https://opensource.panuon.com/wpf-ui"
xmlns:dp="clr-namespace:HMI.UI.DpUtil;assembly=HMI.UI"
xmlns:cc="clr-namespace:HMI.Core;assembly=HMI.Core"
- mc:Ignorable="d"
- Padding="10"
+ mc:Ignorable="d"
Loaded="UserControl_Loaded"
Background="{StaticResource WorkspaceBackground}"
d:DesignHeight="450" d:DesignWidth="800">
-
+ <UserControl.Resources>
+ <ResourceDictionary>
+ <ResourceDictionary.MergedDictionaries>
+ <ResourceDictionary Source="/HMI.UI;component/Style/PanuonDataGrid.xaml"/>
+ </ResourceDictionary.MergedDictionaries>
+ </ResourceDictionary>
+ </UserControl.Resources>
<Border Style="{StaticResource CardBoarder}">
<Grid dp:GridHelper.Space="10" Cursor="">
<Grid.RowDefinitions>
@@ -24,10 +29,7 @@
<RowDefinition/>
</Grid.RowDefinitions>
- <TextBlock FontSize="{StaticResource TitleFontSize}"
- VerticalAlignment="Center" HorizontalAlignment="Left" Text="{DynamicResource Pm.Setting.Title}"/>
-
- <DockPanel Grid.Row="1" Cursor="">
+ <DockPanel Grid.Row="1">
<StackPanel DockPanel.Dock="Right" Style="{StaticResource ButtonGroup}">
<Button Style="{StaticResource AddBtn}"
x:Name="addBtn" Click="Button_Click"/>
@@ -40,17 +42,18 @@
<Button x:Name="importBtn"
Style="{StaticResource ImportBtn}" Click="Button_Click"/>
</StackPanel>
+ <TextBlock FontSize="{StaticResource TitleFontSize}"
+ VerticalAlignment="Center" HorizontalAlignment="Left" Text="{DynamicResource Pm.Setting.Title}"/>
- <StackPanel Style="{StaticResource ButtonGroup}" HorizontalAlignment="Left">
+ <!--<StackPanel Style="{StaticResource ButtonGroup}" HorizontalAlignment="Left">
<TextBlock Style="{StaticResource TitleBox}" FontSize="14" Text="{DynamicResource HMI.Line}"/>
<ComboBox Style="{StaticResource FormComboxStyle}" Width="160" x:Name="CbLine"/>
<TextBlock Style="{StaticResource TitleBox}" FontSize="14" Text="{DynamicResource HMI.Station}"/>
<ComboBox Style="{StaticResource FormComboxStyle}" Width="160" x:Name="CbStation"/>
- </StackPanel>
+ </StackPanel>-->
</DockPanel>
-
<DataGrid Grid.Row="2" x:Name="table" Style="{StaticResource DefaultDataGrid}"
ItemsSource="{Binding Datasource}">
--
Gitblit v1.9.1