From f90615921589586c1f9efde22620b45243d94657 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期一, 03 三月 2025 19:04:34 +0800
Subject: [PATCH] sb
---
HMI.ParameterManage/ParameterManage.xaml | 86 +++++++++++++++++++++++++-----------------
1 files changed, 51 insertions(+), 35 deletions(-)
diff --git a/HMI.ParameterManage/ParameterManage.xaml b/HMI.ParameterManage/ParameterManage.xaml
index c87940f..ac5b69b 100644
--- a/HMI.ParameterManage/ParameterManage.xaml
+++ b/HMI.ParameterManage/ParameterManage.xaml
@@ -8,7 +8,7 @@
xmlns:ui="clr-namespace:HMI.UI;assembly=HMI.UI"
xmlns:pw="https://opensource.panuon.com/wpf"
xmlns:pu="https://opensource.panuon.com/wpf-ui"
- xmlns:dp="clr-namespace:HMI.UI;assembly=HMI.UI"
+ xmlns:dp="clr-namespace:HMI.UI.DpUtil;assembly=HMI.UI"
xmlns:hb="clr-namespace:HMI.Base;assembly=HMI.Base"
mc:Ignorable="d"
Padding="10"
@@ -17,29 +17,38 @@
d:DesignHeight="450" d:DesignWidth="800">
<Grid>
<Grid.ColumnDefinitions>
- <ColumnDefinition Width="2*"/>
- <ColumnDefinition Width="8*"/>
+ <ColumnDefinition Width="3*"/>
+ <ColumnDefinition Width="7*"/>
</Grid.ColumnDefinitions>
<Border Style="{StaticResource CardBoarder}" Margin="0,0,2,0">
- <StackPanel>
- <DockPanel Margin="0,0,0,10" Cursor="">
- <Button DockPanel.Dock="Right" x:Name="delBatchBtn" pu:ButtonHelper.Icon="" Style="{StaticResource DangerButton}">鍒犻櫎</Button>
- <Button DockPanel.Dock="Right" Style="{StaticResource PrimaryButton}"
- pu:ButtonHelper.Icon="" Margin="0,0,10,0" x:Name="refreshBtn" Click="Button_Click">鍒锋柊</Button>
- <Button DockPanel.Dock="Right" Style="{StaticResource PrimaryButton}"
- pu:ButtonHelper.Icon="" Margin="0,0,10,0" x:Name="addBtn" Click="Button_Click">鏂板</Button>
+ <Grid dp:GridHelper.Space="10">
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto"/>
+ <RowDefinition />
+ </Grid.RowDefinitions>
+ <DockPanel>
+ <StackPanel DockPanel.Dock="Right" Style="{StaticResource ButtonGroup}">
+ <Button Style="{StaticResource PrimaryButton}"
+ pu:ButtonHelper.Icon="" x:Name="addBtn" Click="Button_Click">鏂板</Button>
+ <Button Style="{StaticResource PrimaryButton}"
+pu:ButtonHelper.Icon="" x:Name="refreshBtn" Click="Button_Click">鍒锋柊</Button>
+ <Button x:Name="delBatchBtn"
+ pu:ButtonHelper.Icon="" Style="{StaticResource DangerButton}"
+ Click="Button_Click">鍒犻櫎</Button>
+ </StackPanel>
<TextBlock DockPanel.Dock="Left" FontSize="{StaticResource TitleFontSize}"
- VerticalAlignment="Center" HorizontalAlignment="Left" Text="浜у搧鍒楄〃"/>
+VerticalAlignment="Center" HorizontalAlignment="Left" Text="浜у搧鍒楄〃"/>
</DockPanel>
- <DataGrid Grid.Column="1" x:Name="table" Style="{StaticResource DefaultDataGrid}"
+
+ <DataGrid Grid.Row="1" x:Name="productTable" Style="{StaticResource DefaultDataGrid}"
SelectedItem="{Binding SelectedProduct}" ItemsSource="{Binding Products}">
<DataGrid.Columns>
<DataGridTemplateColumn Width="Auto" CanUserResize="False">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<CheckBox VerticalAlignment="Center"
- IsChecked="{Binding Selected,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
+ IsChecked="{Binding IsSelected,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
@@ -55,7 +64,7 @@
<DataGridTemplateColumn Header="鎿嶄綔" Width="100" IsReadOnly="True" CanUserResize="False">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
- <StackPanel Orientation="Horizontal" ui:StackPanelHelper.ChildSpace="10">
+ <StackPanel Orientation="Horizontal" dp:StackPanelHelper.ChildSpace="10">
<Button x:Name="editProductBtn" Style="{StaticResource RowLink}" DataContext="{Binding }"
Click="Button_Click">缂栬緫</Button>
<Button x:Name="delProductBtn" Style="{StaticResource DangerLinkButton}"
@@ -67,38 +76,45 @@
</DataGridTemplateColumn>
</DataGrid.Columns>
</DataGrid>
- </StackPanel>
+ </Grid>
</Border>
<Border Grid.Column="1" Style="{StaticResource CardBoarder}" Margin="2,0,0,0">
- <StackPanel>
- <DockPanel Margin="0,0,0,10" >
- <Button DockPanel.Dock="Right" pu:ButtonHelper.Icon="" Style="{StaticResource DangerButton}">鍒犻櫎</Button>
- <Button DockPanel.Dock="Right" Style="{StaticResource PrimaryButton}"
- pu:ButtonHelper.Icon="" Margin="0,0,10,0" x:Name="refreshParameterBtn" Click="Button_Click">鍒锋柊</Button>
- <Button DockPanel.Dock="Right" Style="{StaticResource PrimaryButton}"
- pu:ButtonHelper.Icon="" Margin="0,0,10,0" x:Name="addParameterBtn" Click="Button_Click">鏂板</Button>
+ <Grid dp:GridHelper.Space="10">
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto"/>
+ <RowDefinition />
+ </Grid.RowDefinitions>
+ <DockPanel>
+ <StackPanel DockPanel.Dock="Right" Style="{StaticResource ButtonGroup}">
+ <Button Style="{StaticResource PrimaryButton}"
+pu:ButtonHelper.Icon="" x:Name="addParameterBtn" Click="Button_Click">鏂板</Button>
+ <Button Style="{StaticResource PrimaryButton}"
+pu:ButtonHelper.Icon="" x:Name="refreshParameterBtn" Click="Button_Click">鍒锋柊</Button>
+ <Button pu:ButtonHelper.Icon="" x:Name="deleteBatchParameterBtn"
+ Style="{StaticResource DangerButton}" Click="Button_Click">鍒犻櫎</Button>
+ </StackPanel>
<TextBlock DockPanel.Dock="Left" FontSize="{StaticResource TitleFontSize}"
- VerticalAlignment="Center" HorizontalAlignment="Left" Text="浜у搧鍒楄〃"/>
- <TextBlock DockPanel.Dock="Left" FontSize="{StaticResource TitleFontSize}"
- VerticalAlignment="Center" HorizontalAlignment="Left" Text="浜у搧鍙傛暟"/>
+VerticalAlignment="Center" HorizontalAlignment="Left" Text="浜у搧鍙傛暟"/>
</DockPanel>
- <DataGrid x:Name="roleTable" Style="{StaticResource DefaultDataGrid}" SelectionMode="Single"
- ItemsSource="{Binding Parameters}">
+
+ <DataGrid Grid.Row="1" x:Name="parameterTable" Style="{StaticResource DefaultDataGrid}" SelectionMode="Single"
+ SelectedItem="{Binding SelectedParameter}"
+ ItemsSource="{Binding Parameters}">
<DataGrid.Columns>
<DataGridTemplateColumn Header="" Width="Auto" CanUserResize="False">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<CheckBox VerticalAlignment="Center"
- HorizontalAlignment="Center" IsChecked="{Binding Selected,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
+ HorizontalAlignment="Center" IsChecked="{Binding IsSelected,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<DataGridTextColumn Header="#" Binding="{Binding Converter={StaticResource rowNumber},
- RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow},AncestorLevel=1}}"
- CanUserResize="False"/>
+RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow},AncestorLevel=1}}"
+ CanUserResize="False"/>
<DataGridTextColumn Width="*" Binding="{Binding Name}" Header="鍚嶇О" />
<DataGridTextColumn Width="*" Binding="{Binding Value}" Header="鍊�" />
<DataGridTextColumn Width="*" Binding="{Binding Unit}" Header="鍗曚綅" />
@@ -109,18 +125,18 @@
<DataTemplate>
<StackPanel Orientation="Horizontal">
<Button x:Name="editParameterBtn" Style="{StaticResource RowLink}" Margin="0,0,10,0"
- DataContext="{Binding }"
- Click="Button_Click">缂栬緫</Button>
+ DataContext="{Binding }"
+ Click="Button_Click">缂栬緫</Button>
<Button x:Name="delParameterBtn" Style="{StaticResource DangerLinkButton}"
- DataContext="{Binding }"
- Click="Button_Click">鍒犻櫎</Button>
+ DataContext="{Binding }"
+ Click="Button_Click">鍒犻櫎</Button>
</StackPanel>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
</DataGrid.Columns>
</DataGrid>
- </StackPanel>
+ </Grid>
</Border>
</Grid>
</hb:PluginControl>
\ No newline at end of file
--
Gitblit v1.9.1