chenx/qhmes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增强原材料入场记录视图模型，新增 SuspendEmbeddedPrintPreviewAirspace 属性以处理 WebView2 的嵌入式打印预览遮挡问题。重构相关对话框调用逻辑，确保在弹窗期间正确管理预览状态。同时，优化原材料卡片生成确认窗口的预览逻辑，提升用户体验和界面响应性。

Browse Source
This commit is contained in:
geht
2026-05-15 15:46:25 +08:00
parent 0c5e29044a
commit 9201c7ca15
5 changed files with 172 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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>

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

@@ -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>");
/* 窗口关闭或调度异常时忽略 */
}
}

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

@@ -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>