From 771a0e7b6b1276087515bbe94de28358cb92963b Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期四, 04 六月 2026 10:32:27 +0800
Subject: [PATCH] 优化老化；
---
HMI.AlermInfoManage/AlarmSettingList.xaml | 239 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 173 insertions(+), 66 deletions(-)
diff --git a/HMI.AlermInfoManage/AlarmSettingList.xaml b/HMI.AlermInfoManage/AlarmSettingList.xaml
index 573554d..1a296ef 100644
--- a/HMI.AlermInfoManage/AlarmSettingList.xaml
+++ b/HMI.AlermInfoManage/AlarmSettingList.xaml
@@ -14,6 +14,7 @@
pu:WindowXModalDialog.OKButtonContent="{DynamicResource App.Close}"
Width="1000"
Height="600"
+ InteropOwnersMask="False"
Loaded="WindowX_Loaded"
WindowStartupLocation="CenterOwner"
Style="{StaticResource ModalWindow}">
@@ -57,11 +58,11 @@
<Button Style="{StaticResource DelBtn}" x:Name="delBatchBtn" Click="Button_Click"/>
</StackPanel>
- <Border Grid.Row="1" BorderThickness="0" BorderBrush="Gray">
+ <Grid Grid.Row="1">
<TabControl Style="{StaticResource HeaderTabControl}" SelectedIndex="{Binding ItemIndex}" x:Name="tab">
<TabItem Header="DB鍧楁姤璀�">
- <ListView Style="{StaticResource DefaultListTable}" ItemsSource="{Binding Datasource}">
+ <!--<ListView Style="{StaticResource DefaultListTable}" ItemsSource="{Binding Datasource}">
<ListView.View>
<GridView AllowsColumnReorder="False">
@@ -85,7 +86,7 @@
</GridViewColumn.CellTemplate>
</GridViewColumn>
- <GridViewColumn Width="300">
+ <GridViewColumn Width="100">
<GridViewColumn.Header>
<TextBlock Text="{DynamicResource Alm.DbAddress}"/>
</GridViewColumn.Header>
@@ -98,7 +99,7 @@
</DataTemplate>
</GridViewColumn.CellTemplate>
</GridViewColumn>
- <GridViewColumn Width="200">
+ <GridViewColumn Width="150">
<GridViewColumn.Header>
<TextBlock Text="{DynamicResource Alm.StartAddress}"/>
</GridViewColumn.Header>
@@ -111,7 +112,7 @@
</DataTemplate>
</GridViewColumn.CellTemplate>
</GridViewColumn>
- <GridViewColumn Width="200">
+ <GridViewColumn Width="100">
<GridViewColumn.Header>
<TextBlock Text="{DynamicResource Alm.DbLength}"/>
</GridViewColumn.Header>
@@ -124,6 +125,35 @@
</DataTemplate>
</GridViewColumn.CellTemplate>
</GridViewColumn>
+
+ <GridViewColumn Width="150">
+ <GridViewColumn.Header>
+ <TextBlock Text="鎶ヨ浠ｇ爜"/>
+ </GridViewColumn.Header>
+ <GridViewColumn.CellTemplate>
+ <DataTemplate>
+ <Border Style="{StaticResource CellBorder}">
+ <TextBlock Style="{StaticResource ListTableTextBlock}"
+ Text="{Binding AlarmCode}"/>
+ </Border>
+ </DataTemplate>
+ </GridViewColumn.CellTemplate>
+ </GridViewColumn>
+
+ <GridViewColumn Width="250">
+ <GridViewColumn.Header>
+ <TextBlock Text="{DynamicResource Alm.Description}"/>
+ </GridViewColumn.Header>
+ <GridViewColumn.CellTemplate>
+ <DataTemplate>
+ <Border Style="{StaticResource CellBorder}">
+ <TextBlock Style="{StaticResource ListTableTextBlock}"
+Text="{Binding Description}"/>
+ </Border>
+ </DataTemplate>
+ </GridViewColumn.CellTemplate>
+ </GridViewColumn>
+
<GridViewColumn Width="120">
<GridViewColumn.Header>
<TextBlock Text="{DynamicResource App.Opt}"/>
@@ -142,10 +172,140 @@
</GridViewColumn>
</GridView>
</ListView.View>
- </ListView>
+ </ListView>-->
+ <DataGrid Style="{StaticResource DefaultDataGrid}"
+ dp:DataGridHelper.ShowRowNumber="True"
+ ItemsSource="{Binding BlockDatasource}">
+ <DataGrid.Columns>
+ <DataGridTemplateColumn Width="20" CanUserResize="False">
+ <DataGridTemplateColumn.CellTemplate>
+ <DataTemplate>
+ <CheckBox VerticalAlignment="Center"
+HorizontalAlignment="Center" IsChecked="{Binding IsSelected,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
+ </DataTemplate>
+ </DataGridTemplateColumn.CellTemplate>
+ </DataGridTemplateColumn>
+
+ <DataGridTextColumn Header="#"
+ Binding="{Binding Header, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}, Mode=FindAncestor}}"
+ Width="40"/>
+
+ <DataGridTextColumn Width="100" Binding="{Binding DBAddress}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{DynamicResource Alm.DbAddress}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
+
+ <DataGridTextColumn Width="150" Binding="{Binding StartAddress}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{DynamicResource Alm.StartAddress}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
+
+ <DataGridTextColumn Width="100" Binding="{Binding Length}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{DynamicResource Alm.DbLength}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
+
+ <DataGridTextColumn Width="150" Binding="{Binding AlarmCode}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="鎶ヨ浠ｇ爜"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
+
+ <DataGridTextColumn Width="*" Binding="{Binding Level}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="绾у埆"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
+
+ <DataGridTextColumn Width="*" Binding="{Binding Description}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{DynamicResource Alm.Description}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
+
+ <DataGridTemplateColumn Width="120">
+ <DataGridTemplateColumn.Header>
+ <TextBlock Text="{DynamicResource App.Opt}"/>
+ </DataGridTemplateColumn.Header>
+ <DataGridTemplateColumn.CellTemplate>
+ <DataTemplate>
+ <StackPanel Orientation="Horizontal" dp:StackPanelHelper.ChildSpace="10">
+ <Button x:Name="editBtn" Style="{StaticResource EditLink}"
+Click="Button_Click" Tag="{Binding }"/>
+
+ <Button x:Name="delBtn" Style="{StaticResource DeleteLink}"
+Click="Button_Click" Tag="{Binding }"/>
+ </StackPanel>
+ </DataTemplate>
+ </DataGridTemplateColumn.CellTemplate>
+ </DataGridTemplateColumn>
+ </DataGrid.Columns>
+ </DataGrid>
</TabItem>
<TabItem Header="鏍囧織浣嶆姤璀�">
- <ListView Style="{StaticResource DefaultListTable}" ItemsSource="{Binding MarkDatasource}">
+ <DataGrid Style="{StaticResource DefaultDataGrid}"
+ dp:DataGridHelper.ShowRowNumber="True"
+ ItemsSource="{Binding MarkDatasource}">
+ <DataGrid.Columns>
+ <DataGridTemplateColumn Width="Auto" CanUserResize="False">
+ <DataGridTemplateColumn.CellTemplate>
+ <DataTemplate>
+ <CheckBox VerticalAlignment="Center"
+HorizontalAlignment="Center" IsChecked="{Binding IsSelected,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
+ </DataTemplate>
+ </DataGridTemplateColumn.CellTemplate>
+ </DataGridTemplateColumn>
+
+ <DataGridTextColumn Header="#"
+ Binding="{Binding Header, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}, Mode=FindAncestor}}" Width="40"/>
+
+ <DataGridTextColumn Width="100" Binding="{Binding DBAddress}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{DynamicResource Alm.DbAddress}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
+
+ <DataGridTextColumn Width="150" Binding="{Binding StartAddress}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{DynamicResource Alm.StartAddress}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
+
+ <DataGridTextColumn Width="100" Binding="{Binding Length}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{DynamicResource Alm.DbLength}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
+
+ <DataGridTextColumn Width="*" Binding="{Binding Description}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{DynamicResource Alm.Description}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
+
+ <DataGridTemplateColumn Width="120">
+ <DataGridTemplateColumn.Header>
+ <TextBlock Text="{DynamicResource App.Opt}"/>
+ </DataGridTemplateColumn.Header>
+ <DataGridTemplateColumn.CellTemplate>
+ <DataTemplate>
+ <StackPanel Orientation="Horizontal" dp:StackPanelHelper.ChildSpace="10">
+ <Button x:Name="editBtn" Style="{StaticResource EditLink}"
+Click="Button_Click" Tag="{Binding }"/>
+
+ <Button x:Name="delBtn" Style="{StaticResource DeleteLink}"
+Click="Button_Click" Tag="{Binding }"/>
+ </StackPanel>
+ </DataTemplate>
+ </DataGridTemplateColumn.CellTemplate>
+ </DataGridTemplateColumn>
+ </DataGrid.Columns>
+ </DataGrid>
+
+ <!--<ListView Style="{StaticResource DefaultListTable}" ItemsSource="{Binding MarkDatasource}">
<ListView.View>
<GridView AllowsColumnReorder="False">
@@ -239,7 +399,7 @@
</GridViewColumn>
</GridView>
</ListView.View>
- </ListView>
+ </ListView>-->
</TabItem>
</TabControl>
<!--<Grid>
@@ -264,7 +424,9 @@
<ControlTemplate TargetType="ListBoxItem">
<Border x:Name="border" Background="LightGray"
Padding="10" Margin="0" BorderThickness="0">
- --><!-- 鍐呭鍛堢幇鍣� --><!--
+ -->
+ <!-- 鍐呭鍛堢幇鍣� -->
+ <!--
<StackPanel>
<ContentPresenter Content="{TemplateBinding Content}"
ContentStringFormat="{TemplateBinding ContentStringFormat}"
@@ -292,63 +454,8 @@
<Button Style="{StaticResource DelBtn}" x:Name="delBatchBtn" Click="Button_Click"/>
</StackPanel>
- <DataGrid x:Name="table" Grid.Row="2"
- Style="{StaticResource DefaultDataGrid}" ItemsSource="{Binding Datasource}">
- <DataGrid.Columns>
- <DataGridTemplateColumn Header="" Width="Auto" CanUserResize="False">
- <DataGridTemplateColumn.CellTemplate>
- <DataTemplate>
- <CheckBox VerticalAlignment="Center"
- IsChecked="{Binding IsSelected,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
- </DataTemplate>
- </DataGridTemplateColumn.CellTemplate>
- </DataGridTemplateColumn>
- <DataGridTemplateColumn Header="#" CanUserResize="False">
- <DataGridTemplateColumn.CellTemplate>
- <DataTemplate>
- <TextBlock Text="{Binding Converter={StaticResource rowNumber},
-RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow},AncestorLevel=1}}"/>
- </DataTemplate>
- </DataGridTemplateColumn.CellTemplate>
- </DataGridTemplateColumn>
- <DataGridTextColumn Width="*" Binding="{Binding DBAddress}">
- <DataGridTextColumn.Header>
- <TextBlock Text="{DynamicResource Alm.DbAddress}"/>
- </DataGridTextColumn.Header>
- </DataGridTextColumn>
- <DataGridTextColumn Width="*" Binding="{Binding StartAddress}">
- <DataGridTextColumn.Header>
- <TextBlock Text="{DynamicResource Alm.StartAddress}"/>
- </DataGridTextColumn.Header>
- </DataGridTextColumn>
- <DataGridTextColumn Width="*" Binding="{Binding Length}">
- <DataGridTextColumn.Header>
- <TextBlock Text="{DynamicResource Alm.DbLength}"/>
- </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" Tag="{Binding RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow},AncestorLevel=1}}"
- Style="{StaticResource EditLink}"
- Margin="0,0,10,0"
- Click="Button_Click"
- DataContext="{Binding }"/>
- <Button x:Name="delBtn" Tag="{Binding RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow},AncestorLevel=1}}"
- Style="{StaticResource DeleteLink}"
- DataContext="{Binding }"
- Click="Button_Click"/>
- </StackPanel>
- </DataTemplate>
- </DataGridTemplateColumn.CellTemplate>
- </DataGridTemplateColumn>
- </DataGrid.Columns>
- </DataGrid>
+
</Grid>-->
- </Border>
+ </Grid>
</Grid>
</pu:WindowX>
--
Gitblit v1.9.1