From dedcf4174c8540ee3a912daad2ff13e014e495b1 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期五, 28 三月 2025 16:28:30 +0800
Subject: [PATCH] 优化UI组件；
---
HMI.AlermInfoManage/AlarmInfoManage.xaml | 81 +++++++++++++++++-----------------------
1 files changed, 34 insertions(+), 47 deletions(-)
diff --git a/HMI.AlermInfoManage/AlarmInfoManage.xaml b/HMI.AlermInfoManage/AlarmInfoManage.xaml
index 81ccab8..74e1f8f 100644
--- a/HMI.AlermInfoManage/AlarmInfoManage.xaml
+++ b/HMI.AlermInfoManage/AlarmInfoManage.xaml
@@ -4,6 +4,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:hb="clr-namespace:HMI.Base;assembly=HMI.Base"
+ xmlns:dp="clr-namespace:HMI.UI.DpUtil;assembly=HMI.UI"
xmlns:local="clr-namespace:HMI.AlarmInfoManage"
xmlns:uic="clr-namespace:HMI.UI.Converter;assembly=HMI.UI"
xmlns:pw="https://opensource.panuon.com/wpf"
@@ -12,38 +13,18 @@
Background="{StaticResource WorkspaceBackground}"
Loaded="UserControl_Loaded"
d:DesignHeight="450" d:DesignWidth="800">
- <UserControl.Resources>
- <ResourceDictionary>
- <ResourceDictionary.MergedDictionaries>
- <ResourceDictionary Source="/HMI.UI;component/Style/BaseWindow.xaml"/>
- <ResourceDictionary Source="/HMI.UI;component/Style/FormStyle.xaml"/>
- <ResourceDictionary Source="/HMI.UI;component/Style/Colors.xaml"/>
- <ResourceDictionary Source="/HMI.UI;component/Style/PanuonResource.xaml"/>
- <ResourceDictionary Source="/HMI.UI;component/Style/MsgBoxStyle.xaml"/>
- </ResourceDictionary.MergedDictionaries>
- <uic:PathImageConverter x:Key="path2Image"/>
- <uic:DataGridRowNumberConverter x:Key="rowNumber"/>
- </ResourceDictionary>
- </UserControl.Resources>
<Border Style="{StaticResource CardBoarder}">
<StackPanel>
<DockPanel Margin="0,0,0,10">
<StackPanel DockPanel.Dock="Right" Style="{StaticResource ButtonGroup}">
- <Button Style="{StaticResource PrimaryButton}"
-pu:ButtonHelper.Icon="" x:Name="settingBtn" Click="Button_Click">璁剧疆</Button>
- <Button Style="{StaticResource PrimaryButton}"
-pu:ButtonHelper.Icon="" x:Name="refreshBtn" Click="Button_Click">鍒锋柊</Button>
- <Button Style="{StaticResource PrimaryButton}"
-pu:ButtonHelper.Icon="" x:Name="importBtn" Click="Button_Click">瀵煎叆</Button>
+ <Button Style="{StaticResource SettingBtn}" x:Name="settingBtn" Click="Button_Click"/>
+ <Button Style="{StaticResource RfhBtn}" x:Name="refreshBtn" Click="Button_Click"/>
+ <Button Style="{StaticResource ImportBtn}" x:Name="importBtn" Click="Button_Click"/>
</StackPanel>
- <!--<Button DockPanel.Dock="Right" pu:ButtonHelper.Icon=""
- Style="{StaticResource DangerButton}">鍒犻櫎</Button>-->
-
-
-
+
<TextBlock DockPanel.Dock="Left" FontSize="{StaticResource TitleFontSize}"
- VerticalAlignment="Center" HorizontalAlignment="Left" Text="鎶ヨ淇℃伅鍒楄〃"/>
+ VerticalAlignment="Center" HorizontalAlignment="Left" Text="{DynamicResource Alm.Title}"/>
</DockPanel>
<DataGrid x:Name="table" Style="{StaticResource DefaultDataGrid}" ItemsSource="{Binding Datasource}">
@@ -63,35 +44,41 @@
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
- <DataGridTextColumn Width="*" Binding="{Binding Source}" Header="鏉ユ簮" />
- <DataGridTextColumn Width="*" Binding="{Binding Code}" Header="缂栫爜" />
- <DataGridTextColumn Width="*" Binding="{Binding Info}" Header="淇℃伅" />
- <DataGridTextColumn Width="*" Binding="{Binding Time}" Header="鏃堕棿" />
- <DataGridTemplateColumn Header="鎿嶄綔" Width="100" IsReadOnly="True" CanUserResize="False">
+ <DataGridTextColumn Width="*" Binding="{Binding Source}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{DynamicResource Alm.Source}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
+ <DataGridTextColumn Width="*" Binding="{Binding Code}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{DynamicResource Alm.Code}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
+ <DataGridTextColumn Width="*" Binding="{Binding Info}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{DynamicResource Alm.Info}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
+ <DataGridTextColumn Width="*" Binding="{Binding Time}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{DynamicResource Alm.Time}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
+ <DataGridTemplateColumn Width="100" IsReadOnly="True" CanUserResize="False">
+ <DataGridTemplateColumn.Header>
+ <TextBlock Text="{DynamicResource App.Opt}"/>
+ </DataGridTemplateColumn.Header>
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<StackPanel Orientation="Horizontal">
- <Button x:Name="editBtn" Style="{StaticResource LinkButton}"
+ <Button x:Name="editBtn" Style="{StaticResource EditLink}"
Margin="0,0,10,0"
Click="Button_Click"
- DataContext="{Binding }">缂栬緫</Button>
- <Button x:Name="delBtn" Style="{StaticResource DangerLinkButton}"
+ DataContext="{Binding }"/>
+ <Button x:Name="delBtn" Style="{StaticResource DeleteLink}"
DataContext="{Binding }"
- Click="Button_Click">鍒犻櫎</Button>
+ Click="Button_Click"/>
</StackPanel>
-
- <DataTemplate.Triggers>
- <DataTrigger Binding="{Binding Path=IsMouseOver,
- RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow},AncestorLevel=1}}"
- Value="True">
- <Setter TargetName="editBtn" Property="Foreground" Value="#FFF"/>
- </DataTrigger>
- <DataTrigger Binding="{Binding Path=IsSelected,
- RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow},AncestorLevel=1}}"
- Value="True">
- <Setter TargetName="editBtn" Property="Foreground" Value="#FFF"/>
- </DataTrigger>
- </DataTemplate.Triggers>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
--
Gitblit v1.9.1