完善框架，新增两个close方法；

alielie

2025-03-17 c401a2f2fd1a509cdeb33e850bb5c2827074af48

 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="{DynamicResource Test.Name}"/>
                </DataGridTextColumn.Header>
            </DataGridTextColumn>
            <DataGridTextColumn Width="*" Binding="{Binding value}">
                <DataGridTextColumn.Header>
                    <TextBlock Text="{DynamicResource Test.Value}"/>
                </DataGridTextColumn.Header>
            </DataGridTextColumn>
            <DataGridTextColumn Width="*" Binding="{Binding result}">
                <DataGridTextColumn.Header>
                    <TextBlock Text="{DynamicResource Test.Result}"/>
                </DataGridTextColumn.Header>
            </DataGridTextColumn>
            <DataGridTextColumn Width="*" Binding="{Binding range}">
                <DataGridTextColumn.Header>
                    <TextBlock Text="{DynamicResource Test.Range}"/>
                </DataGridTextColumn.Header>
            </DataGridTextColumn>
            <DataGridTextColumn Width="*" Binding="{Binding condition}">
                <DataGridTextColumn.Header>
                    <TextBlock Text="{DynamicResource Test.Condition}"/>
                </DataGridTextColumn.Header>
            </DataGridTextColumn>
            <DataGridTextColumn Width="*" Binding="{Binding updateTime}">
                <DataGridTextColumn.Header>
                    <TextBlock Text="{DynamicResource Test.UpdateTime}"/>
                </DataGridTextColumn.Header>
            </DataGridTextColumn>
        </DataGrid.Columns>
    </DataGrid>
</Window>
</pu:WindowX>