105040 调整进度条样式与选择文件框过滤

This commit is contained in:
lihanbo 2024-10-25 15:16:39 +08:00
parent ea543c8992
commit ecb6f69383
2 changed files with 30 additions and 15 deletions

View File

@ -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="机构代号" />

View File

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