From 9d1660270272180cd71147d6ddd53d1382643d2e Mon Sep 17 00:00:00 2001
From: wenxiangchao <wenxiangchao@ihengxin.com.cn>
Date: 星期一, 02 十一月 2026 18:00:14 +0800
Subject: [PATCH] merge: 并入远程 Initial commit 作为历史根节点

---
 Plugin.TestResult/Scanner.xaml |   70 +++++++++++++++++++++++-----------
 1 files changed, 47 insertions(+), 23 deletions(-)

diff --git a/Plugin.TestResult/Scanner.xaml b/Plugin.TestResult/Scanner.xaml
index 3a7c2ad..62ed4aa 100644
--- a/Plugin.TestResult/Scanner.xaml
+++ b/Plugin.TestResult/Scanner.xaml
@@ -1,4 +1,4 @@
-锘�<Window x:Class="Plugin.TestResult_WPF.Scanner"
+锘�<pu:WindowX x:Class="Plugin.TestResult_WPF.Scanner"
         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"
@@ -6,49 +6,73 @@
         xmlns:local="clr-namespace:Plugin.TestResult_WPF"
         WindowStartupLocation="CenterScreen"
         Closing="Window_Closing"
+        FontSize="20"
         mc:Ignorable="d"
-        Title="{Binding title}" Height="450" Width="800">
+        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"
+        SizeToContent="Height"
+        pu:WindowXModalDialog.Buttons="{x:Null}"
+        Title="{Binding title}" Width="600">
     <Window.Resources>
         <local:FontSizeConverter x:Key="FontSizeConverter"/>
         <Style TargetType="Label">
             <Setter Property="HorizontalAlignment" Value="Right"/>
             <Setter Property="FontSize" Value="{Binding ActualWidth,RelativeSource={RelativeSource AncestorType=Window}, 
-Converter={StaticResource FontSizeConverter}, ConverterParameter='100,1920'}" />
+Converter={StaticResource FontSizeConverter}, ConverterParameter='80,1920'}" />
         </Style>
         <Style TargetType="TextBox">
             <Setter Property="FontSize" Value="{Binding ActualWidth,RelativeSource={RelativeSource AncestorType=Window}, 
 Converter={StaticResource FontSizeConverter}, ConverterParameter='100,1920'}" />
         </Style>
-        <Style TargetType="Button">
+        <Style TargetType="Button" BasedOn="{StaticResource PrimaryButton}">
             <Setter Property="FontSize" Value="{Binding ActualWidth,RelativeSource={RelativeSource AncestorType=Window}, 
-Converter={StaticResource FontSizeConverter}, ConverterParameter='100,1920'}" />
+Converter={StaticResource FontSizeConverter}, ConverterParameter='20,1920'}" />
         </Style>
     </Window.Resources>
 
-    <Grid>
+    <Grid Margin="10">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
-            <RowDefinition />
-            <!--<RowDefinition />-->
-            <RowDefinition />
+            <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
+
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition />
+            <ColumnDefinition/>
+            <ColumnDefinition/>
         </Grid.ColumnDefinitions>
-        <Label Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" HorizontalContentAlignment="Center" HorizontalAlignment="Stretch">璇蜂緷娆℃壂涓嬪垪鏉＄爜</Label>
-        <Label Grid.Row="1" Grid.Column="0">鍌ㄤ綅鏉＄爜</Label>
-        <!--<Label Grid.Row="2" Grid.Column="0">澶瑰叿鏉＄爜</Label>-->
-        <Label Grid.Row="2" Grid.Column="0">浜у搧鏉＄爜</Label>
 
-        <TextBox Grid.Row="1" Grid.Column="1" x:Name="positionText" TextWrapping="NoWrap"/>
-        <!--<TextBox Grid.Row="2" Grid.Column="1"/>-->
-        <TextBox Grid.Row="2" Grid.Column="1" x:Name="snrText"/>
+        <!--<Label Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" Padding="0"
+               Content="{DynamicResource Tr.PleaseScanSnr}"
+               Margin="0,0,0,20"
+               />-->
+        <GroupBox Grid.Row="1" Header="{DynamicResource Tr.PleaseScanSnr}" Padding="0,0,0,10" Grid.ColumnSpan="2" >
+            <StackPanel>
+                <pu:FormGroup 
+         Header="{DynamicResource Tr.PositionSnr}"
+         dp:FormGroupHelper.IsRequired="True"
+         Style="{StaticResource InputFormGroupStyle}">
+                    <TextBox Style="{StaticResource EditorTextBoxStyle}" x:Name="positionText" TextWrapping="NoWrap" KeyDown="TextBox_KeyDown"/>
+                </pu:FormGroup>
 
-        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2">
-            <Button Margin="20" Padding="15" Click="Con_Click">缁х画鎵弿</Button>
-            <Button Margin="20" Padding="15" Click="Ok_Click">鎵弿瀹屾垚</Button>
-        </StackPanel>
+                <pu:FormGroup 
+         Header="{DynamicResource Tr.ProductSnr}"
+         dp:FormGroupHelper.IsRequired="True" Style="{StaticResource InputFormGroupStyle}">
+                    <TextBox Style="{StaticResource EditorTextBoxStyle}" x:Name="snrText" TextWrapping="NoWrap" KeyDown="TextBox_KeyDown"/>
+                </pu:FormGroup>
+            </StackPanel>
+
+        </GroupBox>
+
+        <!--<Button Grid.Row="2" Click="Con_Click" Style="{StaticResource PrimaryButton}"
+        Content="{DynamicResource Tr.ContinueScan}"/>-->
+        <Button Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Click="Ok_Click" Style="{StaticResource SuccessButton}"
+        Content="{DynamicResource Tr.FinishScan}"/>
     </Grid>
-</Window>
+</pu:WindowX>

--
Gitblit v1.9.1