From ecb6f693836c82153b74309c59c351da228012e2 Mon Sep 17 00:00:00 2001
From: lihanbo <lihanbo@sinvo.cn>
Date: Fri, 25 Oct 2024 15:16:39 +0800
Subject: [PATCH] =?UTF-8?q?105040=20=E8=B0=83=E6=95=B4=E8=BF=9B=E5=BA=A6?=
 =?UTF-8?q?=E6=9D=A1=E6=A0=B7=E5=BC=8F=E4=B8=8E=E9=80=89=E6=8B=A9=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E6=A1=86=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Sinvo.EplanHpD.Plugin.WPFUI/MainWindow.xaml   | 33 ++++++++++++++-----
 .../MainWindow.xaml.cs                        | 12 +++----
 2 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/MainWindow.xaml b/Sinvo.EplanHpD.Plugin.WPFUI/MainWindow.xaml
index 51e7dc9..87a4814 100644
--- a/Sinvo.EplanHpD.Plugin.WPFUI/MainWindow.xaml
+++ b/Sinvo.EplanHpD.Plugin.WPFUI/MainWindow.xaml
@@ -90,7 +90,10 @@
                         HorizontalAlignment="Center"
                         FontSize="16"
                         Text="加载中..." />
-                    <ProgressBar IsIndeterminate="True" />
+                    <ProgressBar
+                        Width="200"
+                        Height="10"
+                        IsIndeterminate="True" />
                 </StackPanel>
             </Grid>
         </DataTemplate>
@@ -165,8 +168,14 @@
                 <DataGrid
                     x:Name="OriginialDataGrid"
                     AutoGenerateColumns="False"
+                    EnableColumnVirtualization="True"
+                    EnableRowVirtualization="True"
                     IsReadOnly="True"
-                    ItemsSource="{Binding Data}">
+                    ItemsSource="{Binding Data, IsAsync=True}"
+                    ScrollViewer.CanContentScroll="True"
+                    VirtualizingPanel.IsContainerVirtualizable="True"
+                    VirtualizingPanel.IsVirtualizing="True"
+                    VirtualizingPanel.VirtualizationMode="Recycling">
                     <DataGrid.Resources>
                         <Style BasedOn="{StaticResource DefaultDataGridRowStyle}" TargetType="DataGridRow" />
                         <Style BasedOn="{StaticResource DefaultDataGridCellStyle}" TargetType="DataGridCell" />
@@ -180,12 +189,14 @@
                     CanUserAddRows="False"
                     CanUserDeleteRows="False"
                     ClipboardCopyMode="IncludeHeader"
-                    ItemsSource="{Binding StuffedData}"
-                    ScrollViewer.CanContentScroll="False"
+                    EnableColumnVirtualization="True"
+                    EnableRowVirtualization="True"
+                    ItemsSource="{Binding StuffedData, IsAsync=True}"
+                    ScrollViewer.CanContentScroll="True"
                     SelectionUnit="FullRow"
-                    SnapsToDevicePixels="True"
-                    VirtualizingPanel.IsVirtualizing="False"
-                    VirtualizingPanel.ScrollUnit="Pixel">
+                    VirtualizingPanel.IsContainerVirtualizable="True"
+                    VirtualizingPanel.IsVirtualizing="True"
+                    VirtualizingPanel.VirtualizationMode="Recycling">
                     <DataGrid.ContextMenu>
                         <ContextMenu>
                             <MenuItem Click="IgnoreSelectedError_Click" Header="忽略选中项的异常" />
@@ -350,8 +361,14 @@
                         AlternatingRowBackground="#f5f5f5"
                         AlternationCount="2"
                         AutoGenerateColumns="False"
+                        EnableColumnVirtualization="True"
+                        EnableRowVirtualization="True"
                         IsReadOnly="True"
-                        ItemsSource="{Binding ExportData}">
+                        ItemsSource="{Binding ExportData, IsAsync=True}"
+                        ScrollViewer.CanContentScroll="True"
+                        VirtualizingPanel.IsContainerVirtualizable="True"
+                        VirtualizingPanel.IsVirtualizing="True"
+                        VirtualizingPanel.VirtualizationMode="Recycling">
                         <DataGrid.Columns>
                             <DataGridTextColumn Binding="{Binding SeqNo}" Header="清单序号" />
                             <DataGridTextColumn Binding="{Binding MechanismNo}" Header="机构代号" />
diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/MainWindow.xaml.cs b/Sinvo.EplanHpD.Plugin.WPFUI/MainWindow.xaml.cs
index 50e31d0..b95eb85 100644
--- a/Sinvo.EplanHpD.Plugin.WPFUI/MainWindow.xaml.cs
+++ b/Sinvo.EplanHpD.Plugin.WPFUI/MainWindow.xaml.cs
@@ -1,6 +1,4 @@
-using EPLAN.Harness.Common;
-using EPLAN.Harness.Common.Extensions;
-using EPLAN.Harness.Common.LrsSystem;
+using EPLAN.Harness.Common.Extensions;
 using EPLAN.Harness.Core.Controls;
 using EPLAN.Harness.Core.Settings;
 using EPLAN.Harness.IO;
@@ -146,7 +144,7 @@ public partial class MainWindow : Window
         Task.WaitAll(dataColumns, data);
         var stuffedData = ViewModel.StuffData(data.Result);
 
-        stuffedData.ContinueWith(x =>
+        _ = stuffedData.ContinueWith(x =>
         {
             _ = this.Dispatcher.BeginInvoke(delegate ()
              {
@@ -179,10 +177,10 @@ public partial class MainWindow : Window
             }
             else
             {
-                SaveFileDialog saveFileDialog = new SaveFileDialog
+                SaveFileDialog saveFileDialog = new()
                 {
-                    Filter = Singleton<LRS>.Instance["Report_ExpFilter", "Report_ExpFilter"],
-                    FilterIndex = StudioSettings.Instance.ReportExport_FilterIndex,
+                    Filter = "MS Excel (*.xlsx)|*.xlsx",//Singleton<LRS>.Instance["Report_ExpFilter", "Report_ExpFilter"],
+                    FilterIndex = 1,
                     FileName = $"单芯线下单{DateTime.Now:yyyy_MM_dd}.xlsx",
                     AddExtension = true,
                     InitialDirectory = StudioSettings.Instance.ReportExport_Path,