Merge branch 'SCADA系统测试'

yy-admin-master/YY.Admin/ViewModels/RawMaterialEntry/RawMaterialEntryEditDialogViewModel.cs

@@ -114,6 +114,46 @@ public class RawMaterialEntryEditDialogViewModel : BaseViewModel, IDialogResulta
     public ObservableCollection<KeyValuePair<string, string>> IsSpecialAdoptionOptions { get; } = new();
     public ObservableCollection<KeyValuePair<string, string>> StatusOptions { get; } = new();
     public ObservableCollection<RawMaterialSplitDetailItem> SplitCodeDetails { get; } = new();
+
+    private bool _suspendEmbeddedPrintPreviewAirspace;
+
+    /// <summary>
+    /// WebView2 使用独立 HWND（Airspace），会同窗体内浮在 WPF 元素之上，遮挡 HandyControl 内嵌 Dialog。
+    /// 原料入场独立页在弹窗期间通过绑定收起预览宿主；其它页面无 WebView2 时可忽略该属性。
+    /// </summary>
+    public bool SuspendEmbeddedPrintPreviewAirspace
+    {
+        get => _suspendEmbeddedPrintPreviewAirspace;
+        private set
+        {
+            if (!SetProperty(ref _suspendEmbeddedPrintPreviewAirspace, value))
+            {
+                return;
+            }
+
+            OnSuspendEmbeddedPrintPreviewAirspaceChanged();
+        }
+    }
+
+    /// <summary>子类在预览区可见性依赖此标志时，覆写以联动通知。</summary>
+    protected virtual void OnSuspendEmbeddedPrintPreviewAirspaceChanged()
+    {
+    }
+
+    /// <summary>在异步弹窗期间挂起右侧嵌入 WebView2，避免遮挡模态内容。</summary>
+    protected async Task<TResult> SuspendEmbeddedPrintPreviewAirspaceWhileAsync<TResult>(Func<Task<TResult>> action)
+    {
+        SuspendEmbeddedPrintPreviewAirspace = true;
+        try
+        {
+            return await action();
+        }
+        finally
+        {
+            SuspendEmbeddedPrintPreviewAirspace = false;
+        }
+    }
+
     public double SplitCodeTableHeight => CalculateSplitCodeTableHeight();
     public string SplitTotalPortionsDisplay => JoinSplitValue(item => item.Portions?.ToString(CultureInfo.InvariantCulture), true);
     public string SplitPortionWeightDisplay => JoinSplitValue(item => FormatNullableDecimal(item.PortionWeight), true);
@@ -439,13 +479,14 @@ public class RawMaterialEntryEditDialogViewModel : BaseViewModel, IDialogResulta
         bool confirmed;
         try
         {
-            confirmed = await HandyControl.Controls.Dialog.Show<WeightRecordPickerDialogView>()
-                .Initialize<WeightRecordPickerDialogViewModel>(vm =>
-                {
-                    pickerVm = vm;
-                    vm.Initialize(Entry?.BillNo);
-                })
-                .GetResultAsync<bool>();
+            confirmed = await SuspendEmbeddedPrintPreviewAirspaceWhileAsync(() =>
+                HandyControl.Controls.Dialog.Show<WeightRecordPickerDialogView>()
+                    .Initialize<WeightRecordPickerDialogViewModel>(vm =>
+                    {
+                        pickerVm = vm;
+                        vm.Initialize(Entry?.BillNo);
+                    })
+                    .GetResultAsync<bool>());
         }
         catch
         {
@@ -490,13 +531,14 @@ public class RawMaterialEntryEditDialogViewModel : BaseViewModel, IDialogResulta
         bool confirmed;
         try
         {
-            confirmed = await HandyControl.Controls.Dialog.Show<WarehouseAreaPickerDialogView>()
-                .Initialize<WarehouseAreaPickerDialogViewModel>(vm =>
-                {
-                    pickerVm = vm;
-                    vm.Initialize(row.WarehouseLocation);
-                })
-                .GetResultAsync<bool>();
+            confirmed = await SuspendEmbeddedPrintPreviewAirspaceWhileAsync(() =>
+                HandyControl.Controls.Dialog.Show<WarehouseAreaPickerDialogView>()
+                    .Initialize<WarehouseAreaPickerDialogViewModel>(vm =>
+                    {
+                        pickerVm = vm;
+                        vm.Initialize(row.WarehouseLocation);
+                    })
+                    .GetResultAsync<bool>());
         }
         catch (Exception ex)
         {
@@ -521,13 +563,14 @@ public class RawMaterialEntryEditDialogViewModel : BaseViewModel, IDialogResulta
         bool confirmed;
         try
         {
-            confirmed = await HandyControl.Controls.Dialog.Show<RawMaterialEntryMaterialPickerDialogView>()
-                .Initialize<RawMaterialEntryMaterialPickerDialogViewModel>(vm =>
-                {
-                    pickerVm = vm;
-                    vm.Initialize(Entry?.MaterialCode, Entry?.MaterialName);
-                })
-                .GetResultAsync<bool>();
+            confirmed = await SuspendEmbeddedPrintPreviewAirspaceWhileAsync(() =>
+                HandyControl.Controls.Dialog.Show<RawMaterialEntryMaterialPickerDialogView>()
+                    .Initialize<RawMaterialEntryMaterialPickerDialogViewModel>(vm =>
+                    {
+                        pickerVm = vm;
+                        vm.Initialize(Entry?.MaterialCode, Entry?.MaterialName);
+                    })
+                    .GetResultAsync<bool>());
         }
         catch
         {
@@ -582,9 +625,10 @@ public class RawMaterialEntryEditDialogViewModel : BaseViewModel, IDialogResulta
         bool confirmed;
         try
         {
-            confirmed = await HandyControl.Controls.Dialog.Show<SupplierPickerDialogView>()
-                .Initialize<SupplierPickerDialogViewModel>(vm => pickerVm = vm)
-                .GetResultAsync<bool>();
+            confirmed = await SuspendEmbeddedPrintPreviewAirspaceWhileAsync(() =>
+                HandyControl.Controls.Dialog.Show<SupplierPickerDialogView>()
+                    .Initialize<SupplierPickerDialogViewModel>(vm => pickerVm = vm)
+                    .GetResultAsync<bool>());
         }
         catch { return; }
 

yy-admin-master/YY.Admin/ViewModels/RawMaterialEntry/RawMaterialEntryOperationViewModel.cs

@@ -170,9 +170,18 @@ public class RawMaterialEntryOperationViewModel : RawMaterialEntryEditDialogView
         {
             if (!SetProperty(ref _isPrintPreviewExpanded, value)) return;
             if (value) _lastPreviewSnapshot = string.Empty;
+            RaisePropertyChanged(nameof(IsPrintPreviewWebAreaVisible));
         }
     }
 
+    /// <summary>右侧下方预览区是否显示 WebView2 宿主（HandyControl 内嵌弹窗期间因 Airspace 临时隐藏）。</summary>
+    public bool IsPrintPreviewWebAreaVisible => !SuspendEmbeddedPrintPreviewAirspace && IsPrintPreviewExpanded;
+
+    protected override void OnSuspendEmbeddedPrintPreviewAirspaceChanged()
+    {
+        RaisePropertyChanged(nameof(IsPrintPreviewWebAreaVisible));
+    }
+
     private string _printPreviewStatus = string.Empty;
     /// <summary>预览区状态提示（如离线、加载中、错误摘要）。</summary>
     public string PrintPreviewStatus
@@ -744,7 +753,9 @@ public class RawMaterialEntryOperationViewModel : RawMaterialEntryEditDialogView
             Owner = Application.Current.MainWindow,
             WindowStartupLocation = WindowStartupLocation.CenterOwner
         };
-        var confirmed = confirmWindow.ShowDialog() == true;
+        // WebView2 Airspace：模态子窗体仍可能与本窗体内 HWND 叠层异常，弹窗期间收起嵌入预览
+        var confirmed = await SuspendEmbeddedPrintPreviewAirspaceWhileAsync(() =>
+            Task.FromResult(confirmWindow.ShowDialog() == true));
         if (!confirmed) return;
         var selectedPrinterName = confirmWindow.SelectedPrinterName;
         if (string.IsNullOrWhiteSpace(selectedPrinterName))

yy-admin-master/YY.Admin/Views/RawMaterialEntry/RawMaterialCardGenerateConfirmWindow.xaml

@@ -70,6 +70,8 @@
                           ItemsSource="{Binding PlanItems}"
                           SelectedItem="{Binding SelectedPlanItem, Mode=TwoWay}"
                           AutoGenerateColumns="False"
+                          EnableRowVirtualization="False"
+                          EnableColumnVirtualization="False"
                           HeadersVisibility="Column"
                           CanUserResizeColumns="True"
                           CanUserReorderColumns="False"
@@ -85,10 +87,10 @@
                           SelectionMode="Single"
                           SelectionUnit="FullRow"
                           ScrollViewer.HorizontalScrollBarVisibility="Auto"
-                          ScrollViewer.VerticalScrollBarVisibility="Auto"
-                          SelectionChanged="PlanGrid_OnSelectionChanged">
+                          ScrollViewer.VerticalScrollBarVisibility="Auto">
                     <DataGrid.Resources>
                         <Style x:Key="CenteredCellTextStyle" TargetType="TextBlock">
+                            <Setter Property="Foreground" Value="#262626"/>
                             <Setter Property="HorizontalAlignment" Value="Center"/>
                             <Setter Property="VerticalAlignment" Value="Center"/>
                             <Setter Property="TextAlignment" Value="Center"/>
@@ -104,13 +106,21 @@
                             <Setter Property="VerticalAlignment" Value="Center"/>
                         </Style>
                     </DataGrid.ColumnHeaderStyle>
+                    <!-- 勿覆盖默认选中配色：显式写出 IsSelected/悬停背景 + 深色文字，避免出现白字白底、“整表发白”的假死感 -->
                     <DataGrid.RowStyle>
                         <Style TargetType="DataGridRow">
-                            <Setter Property="Margin" Value="0,0,0,3"/>
+                            <Setter Property="SnapsToDevicePixels" Value="True"/>
                             <Setter Property="BorderThickness" Value="0"/>
                             <Setter Property="BorderBrush" Value="Transparent"/>
                             <Setter Property="Background" Value="#FFFFFF"/>
-                            <Setter Property="SnapsToDevicePixels" Value="True"/>
+                            <Style.Triggers>
+                                <Trigger Property="IsMouseOver" Value="True">
+                                    <Setter Property="Background" Value="#F5F5F5"/>
+                                </Trigger>
+                                <Trigger Property="IsSelected" Value="True">
+                                    <Setter Property="Background" Value="#E6F7FF"/>
+                                </Trigger>
+                            </Style.Triggers>
                         </Style>
                     </DataGrid.RowStyle>
                     <DataGrid.CellStyle>
@@ -119,10 +129,17 @@
                             <Setter Property="BorderBrush" Value="Transparent"/>
                             <Setter Property="Padding" Value="8,10"/>
                             <Setter Property="Background" Value="Transparent"/>
+                            <Setter Property="Foreground" Value="#262626"/>
                             <Setter Property="HorizontalContentAlignment" Value="Center"/>
                             <Setter Property="VerticalContentAlignment" Value="Center"/>
                             <Setter Property="VerticalAlignment" Value="Center"/>
                             <Setter Property="TextBlock.TextAlignment" Value="Center"/>
+                            <Style.Triggers>
+                                <Trigger Property="IsSelected" Value="True">
+                                    <Setter Property="Foreground" Value="#1F1F1F"/>
+                                    <Setter Property="Background" Value="Transparent"/>
+                                </Trigger>
+                            </Style.Triggers>
                         </Style>
                     </DataGrid.CellStyle>
                     <DataGrid.Columns>
@@ -159,7 +176,8 @@
                         <TextBlock Text="打印模板预览" FontSize="14" FontWeight="SemiBold"/>
                         <TextBlock Text="{Binding TemplateText}" Margin="0,4,0,0" FontSize="12" Foreground="#8C8C8C"/>
                     </StackPanel>
-                    <wv2:WebView2 x:Name="PreviewWebView" Grid.Row="1" DefaultBackgroundColor="#FFFFFFFF"/>
+                    <!-- 与入场页预览区一致：加载 NavigateToString 间隙减少刺眼的整片白闪烁 -->
+                    <wv2:WebView2 x:Name="PreviewWebView" Grid.Row="1" DefaultBackgroundColor="#FF525659"/>
                 </Grid>
             </Border>
         </Grid>

yy-admin-master/YY.Admin/Views/RawMaterialEntry/RawMaterialCardGenerateConfirmWindow.xaml.cs

@@ -6,6 +6,7 @@ using System.IO;
 using System.Linq;
 using System.Text.Json;
 using System.Threading;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls.Primitives;
 using YY.Admin.Core.Services;
@@ -37,8 +38,12 @@ public partial class RawMaterialCardGenerateConfirmWindow : HandyControl.Control
     private readonly Func<RawMaterialCardGeneratePlanRow, string> _previewHtmlBuilder;
     private readonly IPrintDotService _printDotService;
     private bool _webViewReady;
+    /// <summary>增大表示又有新的预览请求，旧的后台渲染结果应丢弃。</summary>
+    private int _previewVersion;
     private bool _isRefreshingPrinters;
     private bool _suppressPrinterSave;
+    /// <summary>Loaded 中批量赋值选中行时跳过 Setter 内的去抖预览，再由 Loaded 单次立即刷新。</summary>
+    private bool _suppressPreviewSchedule;
     private string? _preferredPrinterNameOnLoad;
 
     private string _printerStatus = "加载打印机中...";
@@ -78,6 +83,11 @@ public partial class RawMaterialCardGenerateConfirmWindow : HandyControl.Control
             if (ReferenceEquals(_selectedPlanItem, value)) return;
             _selectedPlanItem = value;
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(SelectedPlanItem)));
+            // 仅用属性变更触发预览刷新，避免 SelectionChanged + 绑定 双重 Navigate 造成卡顿
+            if (!_suppressPreviewSchedule)
+            {
+                SchedulePreviewNavigate(skipDebounce: false);
+            }
         }
     }
 
@@ -124,15 +134,24 @@ public partial class RawMaterialCardGenerateConfirmWindow : HandyControl.Control
         {
             await PreviewWebView.EnsureCoreWebView2Async();
             _webViewReady = true;
-            if (SelectedPlanItem == null && PlanItems.Count > 0)
+            try
             {
-                SelectedPlanItem = PlanItems[0];
+                _suppressPreviewSchedule = true;
+                if (SelectedPlanItem == null && PlanItems.Count > 0)
+                {
+                    SelectedPlanItem = PlanItems[0];
+                }
             }
-            RenderSelectedPreview();
+            finally
+            {
+                _suppressPreviewSchedule = false;
+            }
+
+            SchedulePreviewNavigate(skipDebounce: true);
         }
         catch
         {
-            PreviewWebView.NavigateToString("<html><body style='font-family:Microsoft YaHei;padding:24px;'>模板预览加载失败</body></html>");
+            PreviewWebView.NavigateToString("<html><body style='font-family:Microsoft YaHei;padding:24px;color:#eee;background:#525659;'>模板预览加载失败</body></html>");
         }
     }
 
@@ -247,6 +266,7 @@ public partial class RawMaterialCardGenerateConfirmWindow : HandyControl.Control
 
     private void OnClosing(object? sender, CancelEventArgs e)
     {
+        Interlocked.Increment(ref _previewVersion);
         SavePaneRatio(GetCurrentLeftRatio());
         SaveCurrentColumnWidths();
     }
@@ -330,28 +350,61 @@ public partial class RawMaterialCardGenerateConfirmWindow : HandyControl.Control
         }
     }
 
-    private void PlanGrid_OnSelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
+    /// <summary>
+    /// RenderToHtml 在 UI 线程会阻塞鼠标/选中反馈；移至后台线程并做短去抖合并连点。
+    /// </summary>
+    private async void SchedulePreviewNavigate(bool skipDebounce)
     {
-        RenderSelectedPreview();
-    }
-
-    private void RenderSelectedPreview()
-    {
-        if (!_webViewReady) return;
-        if (SelectedPlanItem == null)
+        if (!_webViewReady)
         {
-            PreviewWebView.NavigateToString("<html><body style='font-family:Microsoft YaHei;padding:24px;'>请先选择左侧卡片记录</body></html>");
             return;
         }
 
+        var token = Interlocked.Increment(ref _previewVersion);
+
         try
         {
-            var html = _previewHtmlBuilder.Invoke(SelectedPlanItem);
+            if (!skipDebounce)
+            {
+                await Task.Delay(45).ConfigureAwait(true);
+                if (token != _previewVersion)
+                {
+                    return;
+                }
+            }
+
+            var row = SelectedPlanItem;
+            if (row == null)
+            {
+                PreviewWebView.NavigateToString(
+                    "<html><body style='font-family:Microsoft YaHei;padding:24px;color:#eee;background:#525659;'>请先选择左侧卡片记录</body></html>");
+                return;
+            }
+
+            string html;
+            try
+            {
+                var capturedRow = row;
+                html = await Task.Run(() => _previewHtmlBuilder(capturedRow)).ConfigureAwait(true);
+            }
+            catch (Exception ex)
+            {
+                html =
+                    "<html><body style='font-family:Microsoft YaHei;padding:24px;color:#eee;background:#525659;'>模板预览失败："
+                    + System.Net.WebUtility.HtmlEncode(ex.Message)
+                    + "</body></html>";
+            }
+
+            if (token != _previewVersion || !ReferenceEquals(SelectedPlanItem, row))
+            {
+                return;
+            }
+
             PreviewWebView.NavigateToString(html);
         }
         catch
         {
-            PreviewWebView.NavigateToString("<html><body style='font-family:Microsoft YaHei;padding:24px;'>模板预览加载失败</body></html>");
+            /* 窗口关闭或调度异常时忽略 */
         }
     }
 

yy-admin-master/YY.Admin/Views/RawMaterialEntry/RawMaterialEntryOperationView.xaml

@@ -1136,7 +1136,7 @@
                                 MinHeight="200"
                                 MaxHeight="420"
                                 Background="#525659"
-                                Visibility="{Binding IsPrintPreviewExpanded, Converter={StaticResource Boolean2VisibilityConverter}}">
+                                Visibility="{Binding IsPrintPreviewWebAreaVisible, Converter={StaticResource Boolean2VisibilityConverter}}">
                             <wv2:WebView2 x:Name="PrintPreviewWebView"
                                           DefaultBackgroundColor="#FF525659"/>
                         </Border>