From c4a3f8db90530a727ffab77c3bb5bb7d782792bf Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期一, 25 八月 2025 15:50:27 +0800
Subject: [PATCH] 上传代码；
---
Plugin.TestResult/ViewControl.xaml | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/Plugin.TestResult/ViewControl.xaml b/Plugin.TestResult/ViewControl.xaml
index d87530e..48d2036 100644
--- a/Plugin.TestResult/ViewControl.xaml
+++ b/Plugin.TestResult/ViewControl.xaml
@@ -1,4 +1,4 @@
-锘�<hb:PluginControl x:Class="Plugin.TestResult_WPF.ViewControl"
+锘�<hb:PluginMaskControl 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"
@@ -11,6 +11,7 @@
xmlns:pu="https://opensource.panuon.com/wpf-ui"
xmlns:dp="clr-namespace:HMI.UI.DpUtil;assembly=HMI.UI"
mc:Ignorable="d"
+ Style="{StaticResource pluginMaskControl}"
Loaded="UserControl_Loaded"
d:DesignHeight="450" d:DesignWidth="800">
<UserControl.Resources>
@@ -41,7 +42,8 @@
<StackPanel Grid.Column="1" Background="#FFF">
<GroupBox Header="{DynamicResource Tr.ProductInfo}">
<ComboBox x:Name="modelSelect" Style="{StaticResource FormComboxStyle}"
- SelectionChanged="modelSelect_SelectionChanged"></ComboBox>
+ pu:ComboBoxHelper.ClearButtonVisibility="Collapsed"
+ SelectionChanged="modelSelect_SelectionChanged"/>
</GroupBox>
<GroupBox Header="{DynamicResource Tr.Status}">
<StackPanel>
@@ -100,13 +102,19 @@
<Button x:Name="btnStop" Click="Stop_Click" Style="{StaticResource DangerButton}"
Content="{DynamicResource App.Stop}"/>
- <Button x:Name="btnScan1" Click="Scan_Click_1" Style="{StaticResource PrimaryButton}"
+ <Button x:Name="btnClear" Click="BtnClear_Click" Style="{StaticResource PrimaryButton}"
+ Content="{DynamicResource Ts.BtnClearNum}"/>
+
+ <Button x:Name="scannerSetting" Click="ScannerSetting_Click" Style="{StaticResource PrimaryButton}"
+ Content="鎵爜鏋缃�"/>
+
+ <!--<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}"/>
+ Content="{DynamicResource Tr.Zone2Scan}"/>-->
</StackPanel>
</GroupBox>
</StackPanel>
</Grid>
-</hb:PluginControl>
+</hb:PluginMaskControl>
--
Gitblit v1.9.1