From 2e54b439c64e0adbb7e010243c1f33aa5fc5f503 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期二, 11 三月 2025 14:08:57 +0800
Subject: [PATCH] 完善程序； Merge branch 'master' of http://58.211.88.246:3600/r/WPF/WPFProject
---
Plugin.TestResult/InfoWindow.xaml | 67 ++++++++++++++++++++++++++-------
1 files changed, 52 insertions(+), 15 deletions(-)
diff --git a/Plugin.TestResult/InfoWindow.xaml b/Plugin.TestResult/InfoWindow.xaml
index e80ad29..b1e73e9 100644
--- a/Plugin.TestResult/InfoWindow.xaml
+++ b/Plugin.TestResult/InfoWindow.xaml
@@ -1,25 +1,62 @@
-锘�<Window x:Class="Plugin.TestResult_WPF.InfoWindow"
+锘�<pu:WindowX x:Class="Plugin.TestResult_WPF.InfoWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Plugin.TestResult_WPF"
mc:Ignorable="d"
+ Style="{StaticResource ModalWindow}"
+ xmlns:hb="clr-namespace:HMI.Base;assembly=HMI.Base"
+ xmlns:uic="clr-namespace:HMI.UI.Converter;assembly=HMI.UI"
+ xmlns:pw="https://opensource.panuon.com/wpf"
+ 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"
+ InteropOwnersMask="False"
+ Topmost="False"
+ pu:WindowXModalDialog.Buttons="{x:Null}"
Title="{Binding title}" Height="500" Width="800">
- <DataGrid ItemsSource="{Binding dataSource}" AutoGenerateColumns="False"
- CanUserAddRows="False"
- CanUserDeleteRows="False"
- IsReadOnly="True"
- ColumnWidth="*"
- FontSize="16"
- >
+ <DataGrid ItemsSource="{Binding dataSource}"
+ Style="{StaticResource DefaultDataGrid}">
<DataGrid.Columns>
- <DataGridTextColumn Header="娴嬭瘯椤瑰悕绉�" Binding="{Binding step}"/>
- <DataGridTextColumn Header="娴嬭瘯鍊�" Binding="{Binding value}"/>
- <DataGridTextColumn Header="娴嬭瘯缁撴灉" Binding="{Binding result}"/>
- <DataGridTextColumn Header="娴嬭瘯鑼冨洿" Binding="{Binding range}"/>
- <DataGridTextColumn Header="娴嬭瘯鏉′欢" Binding="{Binding condition}"/>
- <DataGridTextColumn Header="鏇存柊鏃堕棿" Binding="{Binding updateTime}"/>
+ <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 step}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{Binding Converter={StaticResource lc},ConverterParameter='Ts.TestName'}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
+ <DataGridTextColumn Width="*" Binding="{Binding value}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{Binding Converter={StaticResource lc},ConverterParameter='Ts.TestValue'}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
+ <DataGridTextColumn Width="*" Binding="{Binding result}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{Binding Converter={StaticResource lc},ConverterParameter='Ts.TestResult'}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
+ <DataGridTextColumn Width="*" Binding="{Binding range}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{Binding Converter={StaticResource lc},ConverterParameter='Test.Range'}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
+ <DataGridTextColumn Width="*" Binding="{Binding condition}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{Binding Converter={StaticResource lc},ConverterParameter='Test.Condition'}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
+ <DataGridTextColumn Width="*" Binding="{Binding updateTime}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{Binding Converter={StaticResource lc},ConverterParameter='Test.UpdateTime'}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
</DataGrid.Columns>
</DataGrid>
-</Window>
+</pu:WindowX>
--
Gitblit v1.9.1