优化

alielie

2026-03-02 12e606635c42ea20f4b7c2bdda5204237a4b4c96

 Plugin.TestResult/ViewControl.xaml

@@ -1,16 +1,15 @@
<hb:PluginControl x:Class="Plugin.TestResult_WPF.ViewControl"
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
             xmlns:local="clr-namespace:Plugin.TestResult_WPF"
             xmlns:hb="clr-namespace:HMI.Base;assembly=HMI.Base"
                  xmlns:uic="clr-namespace:HMI.UI.Converter;assembly=HMI.UI"
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.DpUtil;assembly=HMI.UI"
             mc:Ignorable="d" 
<hb:PluginMaskControl x:Class="Plugin.TestResult_WPF.ViewControl"
                      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                      xmlns:hb="clr-namespace:HMI.Base;assembly=HMI.Base"
                      xmlns:std="clr-namespace:HMI.StdControl;assembly=HMI.StdControl"
                      xmlns:dp="clr-namespace:HMI.UI.DpUtil;assembly=HMI.UI"
                      xmlns:local="clr-namespace:Plugin.TestResult_WPF"
                      xmlns:pu="https://opensource.panuon.com/wpf-ui"
                      mc:Ignorable="d" 
                      Style="{StaticResource pluginMaskControl}"
             Loaded="UserControl_Loaded"
             d:DesignHeight="450" d:DesignWidth="800">
    <UserControl.Resources>
@@ -33,20 +32,61 @@
        </Style>
    </UserControl.Resources>
    <Grid>
        <Grid.ColumnDefinitions>
        <Grid.RowDefinitions>
            <RowDefinition Height="Auto"/>
            <RowDefinition/>
        </Grid.RowDefinitions>
        <!--<Grid.ColumnDefinitions>
            <ColumnDefinition Width="7.5*"/>
            <ColumnDefinition Width="*"/>
        </Grid.ColumnDefinitions>
        <local:TestResultView x:Name="testResultView" Grid.Column="0" Loaded="testResultView_Loaded" />
        <StackPanel Grid.Column="1" Background="#FFF">
            <GroupBox Header="{DynamicResource Tr.ProductInfo}">
                <ComboBox x:Name="modelSelect" Style="{StaticResource FormComboxStyle}"
        </Grid.ColumnDefinitions>-->
        <local:TestResultView x:Name="testResultView" Grid.Row="1" Grid.Column="0" Loaded="testResultView_Loaded" />
        <DockPanel Margin="10,0" Grid.Row="0" Grid.Column="1" Background="#FFF" VerticalAlignment="Center">
            <pu:FormGroup DockPanel.Dock="Right">
                <StackPanel Orientation="Horizontal" VerticalAlignment="Center" dp:StackPanelHelper.ChildSpace="20">
                    <Button x:Name="btnStart" Click="Start_Click" Style="{StaticResource SuccessButton}"
                       Width="100" FontSize="14" Padding="0" Height="30" Content="{DynamicResource App.Start}"/>

                    <Button x:Name="btnStop" Click="Stop_Click" Style="{StaticResource DangerButton}"
                            Width="100" FontSize="14" Padding="0" Height="30"
                    Content="{DynamicResource App.Stop}"/>

                    <Button x:Name="btnClear" Click="BtnClear_Click" Style="{StaticResource PrimaryButton}"
                            Width="100" FontSize="14" Padding="0" Height="30"
                    Content="{DynamicResource Ts.BtnClearNum}"/>

                    <Button x:Name="scannerSetting" Click="ScannerSetting_Click" Style="{StaticResource PrimaryButton}"
                            Width="100" FontSize="14" Padding="0" Height="30" Content="{DynamicResource App.ScannerSetting}" Cursor="Hand"/>

                    <!--<Button x:Name="btnScan1" Click="Scan_Click_1" Style="{StaticResource PrimaryButton}"
                    Content="{DynamicResource Tr.Zone1Scan}"/>

            <Button x:Name="btnScan2" Click="Scan_Click_2" Style="{StaticResource PrimaryButton}"
                    Content="{DynamicResource Tr.Zone2Scan}"/>-->
                </StackPanel>
            </pu:FormGroup>
            <pu:FormGroup Header="{DynamicResource Tr.ProductInfo}" FontSize="16" Visibility="Collapsed">
                <ComboBox x:Name="modelSelect" Style="{StaticResource FormComboxStyle}" Width="200"
                          Height="28"
                          pu:ComboBoxHelper.ClearButtonVisibility="Collapsed"
                          SelectionChanged="modelSelect_SelectionChanged"></ComboBox>
            </GroupBox>
            <GroupBox Header="{DynamicResource Tr.Status}">
                <StackPanel>
                    <Label HorizontalContentAlignment="Center" HorizontalAlignment="Stretch">
                          SelectionChanged="modelSelect_SelectionChanged"/>
            </pu:FormGroup>

            <pu:FormGroup Header="{DynamicResource Tr.TestProgram}" FontSize="16">
                <TextBox IsReadOnly="True" x:Name="tbFileName" Style="{StaticResource EditorTextBoxStyle}" Width="200"
Height="28" Text="{Binding FileName}"/>
            </pu:FormGroup>

            <pu:FormGroup>
                <std:StdEnableMes DockPanel.Dock="Left" FontSize="20" 
                                  x:Name="stdEnableMes"
                                  ValueChanged="StdEnableMes_ValueChanged"/>
            </pu:FormGroup>


            <!--<pu:FormGroup Header="{DynamicResource Tr.Status}" FontSize="16">
                <StackPanel Orientation="Horizontal" dp:StackPanelHelper.ChildSpace="10">
                    <Label HorizontalContentAlignment="Center" VerticalAlignment="Center">
                        <Label.Style>
                            <Style TargetType="Label">
                                <Setter Property="HorizontalContentAlignment"  Value="Center"/>
@@ -72,6 +112,7 @@
                            <Style TargetType="Label">
                                <Setter Property="HorizontalContentAlignment"  Value="Center"/>
                                <Setter Property="HorizontalAlignment"  Value="Stretch"/>
                                <Setter Property="VerticalAlignment"  Value="Center"/>
                                <Setter Property="Content" Value="{Binding produceStatus}"/>
                                <Setter Property="Margin" Value="0,10"/>
                                <Style.Triggers>
@@ -92,25 +133,7 @@
                        </Label.Style>
                    </Label>
                </StackPanel>
            </GroupBox>
            <GroupBox Header="操作">
                <StackPanel dp:StackPanelHelper.ChildSpace="20">
                    <Button x:Name="btnStart" Click="Start_Click" Style="{StaticResource SuccessButton}"
                            Content="{DynamicResource App.Start}"/>

                    <Button x:Name="btnStop" Click="Stop_Click" Style="{StaticResource DangerButton}"
                            Content="{DynamicResource App.Stop}"/>

                    <Button x:Name="btnClear" Click="BtnClear_Click" Style="{StaticResource PrimaryButton}"
                            Content="{DynamicResource Ts.BtnClearNum}"/>

                    <!--<Button x:Name="btnScan1" Click="Scan_Click_1" Style="{StaticResource PrimaryButton}"
                            Content="{DynamicResource Tr.Zone1Scan}"/>

                    <Button x:Name="btnScan2" Click="Scan_Click_2" Style="{StaticResource PrimaryButton}"
                            Content="{DynamicResource Tr.Zone2Scan}"/>-->
                </StackPanel>
            </GroupBox>
        </StackPanel>
            </pu:FormGroup>-->
        </DockPanel>
    </Grid>
</hb:PluginControl>
</hb:PluginMaskControl>