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="加载中..." />
-
+
@@ -165,8 +168,14 @@
+ ItemsSource="{Binding Data, IsAsync=True}"
+ ScrollViewer.CanContentScroll="True"
+ VirtualizingPanel.IsContainerVirtualizable="True"
+ VirtualizingPanel.IsVirtualizing="True"
+ VirtualizingPanel.VirtualizationMode="Recycling">
@@ -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">
@@ -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">
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.Instance["Report_ExpFilter", "Report_ExpFilter"],
- FilterIndex = StudioSettings.Instance.ReportExport_FilterIndex,
+ Filter = "MS Excel (*.xlsx)|*.xlsx",//Singleton.Instance["Report_ExpFilter", "Report_ExpFilter"],
+ FilterIndex = 1,
FileName = $"单芯线下单{DateTime.Now:yyyy_MM_dd}.xlsx",
AddExtension = true,
InitialDirectory = StudioSettings.Instance.ReportExport_Path,