Ling
/
EPLAN_PROD_Plugin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Sinvo.EplanHpD.Plugin.WPFUI/MainWindow.xaml
View File

@ -90,7 +90,10 @@
HorizontalAlignment="Center" HorizontalAlignment="Center"
FontSize="16" FontSize="16"
Text="加载中..." /> Text="加载中..." />
<ProgressBar IsIndeterminate="True" /> <ProgressBar
Width="200"
Height="10"
IsIndeterminate="True" />
</StackPanel> </StackPanel>
</Grid> </Grid>
</DataTemplate> </DataTemplate>
@ -165,8 +168,14 @@
<DataGrid <DataGrid
x:Name="OriginialDataGrid" x:Name="OriginialDataGrid"
AutoGenerateColumns="False" AutoGenerateColumns="False"
EnableColumnVirtualization="True"
EnableRowVirtualization="True"
IsReadOnly="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> <DataGrid.Resources>
<Style BasedOn="{StaticResource DefaultDataGridRowStyle}" TargetType="DataGridRow" /> <Style BasedOn="{StaticResource DefaultDataGridRowStyle}" TargetType="DataGridRow" />
<Style BasedOn="{StaticResource DefaultDataGridCellStyle}" TargetType="DataGridCell" /> <Style BasedOn="{StaticResource DefaultDataGridCellStyle}" TargetType="DataGridCell" />
@ -180,12 +189,14 @@
CanUserAddRows="False" CanUserAddRows="False"
CanUserDeleteRows="False" CanUserDeleteRows="False"
ClipboardCopyMode="IncludeHeader" ClipboardCopyMode="IncludeHeader"
ItemsSource="{Binding StuffedData}" EnableColumnVirtualization="True"
ScrollViewer.CanContentScroll="False" EnableRowVirtualization="True"
ItemsSource="{Binding StuffedData, IsAsync=True}"
ScrollViewer.CanContentScroll="True"
SelectionUnit="FullRow" SelectionUnit="FullRow"
SnapsToDevicePixels="True" VirtualizingPanel.IsContainerVirtualizable="True"
VirtualizingPanel.IsVirtualizing="False" VirtualizingPanel.IsVirtualizing="True"
VirtualizingPanel.ScrollUnit="Pixel"> VirtualizingPanel.VirtualizationMode="Recycling">
<DataGrid.ContextMenu> <DataGrid.ContextMenu>
<ContextMenu> <ContextMenu>
<MenuItem Click="IgnoreSelectedError_Click" Header="忽略选中项的异常" /> <MenuItem Click="IgnoreSelectedError_Click" Header="忽略选中项的异常" />
@ -350,8 +361,14 @@
AlternatingRowBackground="#f5f5f5" AlternatingRowBackground="#f5f5f5"
AlternationCount="2" AlternationCount="2"
AutoGenerateColumns="False" AutoGenerateColumns="False"
EnableColumnVirtualization="True"
EnableRowVirtualization="True"
IsReadOnly="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> <DataGrid.Columns>
<DataGridTextColumn Binding="{Binding SeqNo}" Header="清单序号" /> <DataGridTextColumn Binding="{Binding SeqNo}" Header="清单序号" />
<DataGridTextColumn Binding="{Binding MechanismNo}" Header="机构代号" /> <DataGridTextColumn Binding="{Binding MechanismNo}" Header="机构代号" />

12
Sinvo.EplanHpD.Plugin.WPFUI/MainWindow.xaml.cs
View File

@ -1,6 +1,4 @@
using EPLAN.Harness.Common; using EPLAN.Harness.Common.Extensions;
using EPLAN.Harness.Common.Extensions;
using EPLAN.Harness.Common.LrsSystem;
using EPLAN.Harness.Core.Controls; using EPLAN.Harness.Core.Controls;
using EPLAN.Harness.Core.Settings; using EPLAN.Harness.Core.Settings;
using EPLAN.Harness.IO; using EPLAN.Harness.IO;
@ -146,7 +144,7 @@ public partial class MainWindow : Window
Task.WaitAll(dataColumns, data); Task.WaitAll(dataColumns, data);
var stuffedData = ViewModel.StuffData(data.Result); var stuffedData = ViewModel.StuffData(data.Result);
stuffedData.ContinueWith(x => _ = stuffedData.ContinueWith(x =>
{ {
_ = this.Dispatcher.BeginInvoke(delegate () _ = this.Dispatcher.BeginInvoke(delegate ()
{ {
@ -179,10 +177,10 @@ public partial class MainWindow : Window
} }
else else
{ {
SaveFileDialog saveFileDialog = new SaveFileDialog SaveFileDialog saveFileDialog = new()
{ {
Filter = Singleton<LRS>.Instance["Report_ExpFilter", "Report_ExpFilter"], Filter = "MS Excel (*.xlsx)|*.xlsx",//Singleton<LRS>.Instance["Report_ExpFilter", "Report_ExpFilter"],
FilterIndex = StudioSettings.Instance.ReportExport_FilterIndex, FilterIndex = 1,
FileName = $"单芯线下单{DateTime.Now:yyyy_MM_dd}.xlsx", FileName = $"单芯线下单{DateTime.Now:yyyy_MM_dd}.xlsx",
AddExtension = true, AddExtension = true,
InitialDirectory = StudioSettings.Instance.ReportExport_Path, InitialDirectory = StudioSettings.Instance.ReportExport_Path,