SW/SystemX.Web
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[성현모] Grid 성능 개선

Browse Source
This commit is contained in:
SHM
2025-09-17 09:32:33 +09:00
parent a57734308f
commit 89fe237e52
10 changed files with 287 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
Projects/WebClient/Web.Tra/Components/Module/TraGrid.razor
View File

@ -2,9 +2,9 @@
@inject ContextMenuService ContextMenuService
<RadzenDataGrid class="rz-shadow-1" TItem="TDataModel" Data="@DataList" AllowPaging="@AllowPaging" PageSize="@PageSize"
AllowFiltering FilterMode="FilterMode.Advanced" CellRender="@CellRender" AllowColumnResize
SelectionMode="DataGridSelectionMode.Single" @bind-Value="@SelectedRow"
<RadzenDataGrid class="rz-shadow-1" TItem="TDataModel" Data="@DataList" GridLines="DataGridGridLines.Both"
AllowFiltering FilterMode="FilterMode.Advanced" CellRender="@CellRender" AllowColumnResize AllowVirtualization
SelectionMode="DataGridSelectionMode.Single" @bind-Value="@SelectedRow" Density="@Density.Default"
RowSelect="@SelectRow" RowDoubleClick="@OnRowDoublClick">
<Columns>
@if (VisibleRowNo == true)
@ -20,8 +20,8 @@
@foreach (var col in typeof(TDataModel).GetProperties())
{
if(DisableColums?.Contains(col.Name.ToLower()) == true)
continue;
@* if(DisableColums?.Contains(col.Name.ToLower()) == true)
continue; *@
if (col.Name.ToLower().Equals("testdate"))
{
@ -33,6 +33,16 @@
</Template>
</RadzenDataGridColumn>
}
else if (col.Name.ToLower().Equals("testdatetime"))
{
<RadzenDataGridColumn Property="@col.Name" Title="@col.Name" Width="20rem">
<Template>
<span>
@Convert.ToDateTime(col.GetValue(context)).ToString("yyyy-MM-dd HH:mm:ss")
</span>
</Template>
</RadzenDataGridColumn>
}
else if (col.Name.ToLower().Equals("ok"))
{
<RadzenDataGridColumn Property="@col.Name" Title="@col.Name">
@ -52,17 +62,7 @@
</span>
</Template>
</RadzenDataGridColumn>
}
else if (col.Name.ToLower().Equals("testdatetime"))
{
<RadzenDataGridColumn Property="@col.Name" Title="@col.Name" Width="20rem">
<Template>
<span>
@col.GetValue(context)
</span>
</Template>
</RadzenDataGridColumn>
}
}
else if (col.Name.ToLower().Contains("cntid") || col.Name.ToLower().Contains("reqid"))
{
<RadzenDataGridColumn Property="@col.Name" Title="@col.Name" Width="20rem">
@ -106,25 +106,20 @@
[Parameter]
public bool HostColumnMerge { get; set; }
[Parameter]
public bool AllowPaging { get; set; } = true;
[Parameter]
public int PageSize { get; set; } = 30;
[Parameter]
public List<string> DisableColums { get; set; }
private IList<TDataModel> SelectedRow;
private string SummaryTestResult = string.Empty;
private string SummaryTestTime = string.Empty;
private void CellRender(DataGridCellRenderEventArgs<TDataModel> args)
{
if (args.Column.Property == null)
return;
var cellData = args.Data as Overview;
if (cellData is null)
return;
if ((args.Column.Property.ToLower().Equals("testdate") || args.Column.Property.ToLower().Equals("host")) == false)
return;
@ -134,12 +129,12 @@
if (args.Column.Property.ToLower().Equals("testdate"))
{
int rowCount = 0;
var take = DataList.Skip(index).Take(((index / PageSize) + 1) * PageSize - index);
var take = DataList.Skip(index).Cast<Overview>();
foreach (var r in take)
{
if (r.TestDate.Value.Date == args.Data.TestDate.Value.Date)
if (r.TestDate.Value.Date == cellData.TestDate.Value.Date)
{
if (r.ModelName == args.Data.ModelName)
if (r.ModelName == cellData.ModelName)
{
rowCount += 1;
}
@ -160,10 +155,10 @@
return;
int rowCount = 0;
var take = DataList.Skip(index).Take(((index / PageSize) + 1) * PageSize - index);
var take = DataList.Skip(index).Cast<Overview>();
foreach (var r in take)
{
if (r.Host == args.Data.Host)
if (r.Host == cellData.Host)
{
rowCount += 1;
}

42
Projects/WebClient/Web.Tra/Components/Pages/TRA.razor
View File

@ -69,10 +69,6 @@
<RadzenStack Style="width: 18rem;" Orientation="Orientation.Horizontal" AlignItems="AlignItems.Center" JustifyContent="JustifyContent.SpaceBetween">
<RadzenLabel Text="Merge By PartNumber"></RadzenLabel>
<RadzenSwitch @bind-Value=@IsMergePartNumberOption Change="@OnChangeMergePartNumberOption"></RadzenSwitch>
</RadzenStack>
<RadzenStack Style="width: 18rem;" Orientation="Orientation.Horizontal" JustifyContent="JustifyContent.SpaceBetween">
<RadzenLabel Text="Page Size"></RadzenLabel>
<RadzenNumeric Style="width: 8rem;" @bind-Value=@PageSize Min="10" Max="200"></RadzenNumeric>
</RadzenStack>
</RadzenStack>
</RadzenStack>
@ -108,24 +104,21 @@
@if (tab.Key.EnumTab == EnumTabs.OverviewC1)
{
<TraGrid TDataModel="Overview" DataList="@(tab.Value.Cast<Overview>())" OnClickContextMenu="@OnClickDetailOverviewContextMenu"
OnSelectRow="@OnSelectRowOverview" PageSize="@PageSize" DisableColums="@OverviewDisableColums"
OnDoubleClickRow="@OnDoubleClickRowOverview" HostColumnMerge>
OnSelectRow="@OnSelectRowOverview" OnDoubleClickRow="@OnDoubleClickRowOverview" HostColumnMerge>
</TraGrid>
}
@if (tab.Key.EnumTab == EnumTabs.OverviewC1Detail)
{
<TraGrid TDataModel="Overview" DataList="@(tab.Value.Cast<Overview>())" OnClickContextMenu="@OnClickDetailOverviewContextMenu"
OnSelectRow="@OnSelectRowOverview" PageSize="@PageSize" DisableColums="@OverviewDisableColums"
OnDoubleClickRow="@OnDoubleClickRowDetailOverview" HostColumnMerge>
OnSelectRow="@OnSelectRowOverview" OnDoubleClickRow="@OnDoubleClickRowDetailOverview" HostColumnMerge>
</TraGrid>
}
@if (tab.Key.EnumTab == EnumTabs.TestHistoryC1)
{
<TraGrid TDataModel="TestHistory" DataList="@(tab.Value.Cast<TestHistory>())" OnClickContextMenu="@OnClickDetailOverviewContextMenu"
OnSelectRow="@OnSelectRowOverview" PageSize="@PageSize" DisableColums="@HistoryDisableColums"
OnDoubleClickRow="@OnDoubleClickRowHistory" VisibleRowNo HostColumnMerge="false">
OnSelectRow="@OnSelectRowOverview" OnDoubleClickRow="@OnDoubleClickRowHistory" VisibleRowNo HostColumnMerge="false">
</TraGrid>
}
@ -169,8 +162,8 @@
<!--TestResult-->
<RadzenStack Style="height:inherit;">
<TraGrid TDataModel="DecompressTestResult" DataList="@(tab.Value.Cast<DecompressTestResult>())" OnClickContextMenu="@OnClickDetailOverviewContextMenu"
AllowPaging="false" DisableColums="@HistoryDisableColums" VisibleRowNo HostColumnMerge="false">
<TraGrid TDataModel="ParseTestResult" DataList="@(tab.Value.Cast<ParseTestResult>())" OnClickContextMenu="@OnClickDetailOverviewContextMenu"
HostColumnMerge="false">
</TraGrid>
</RadzenStack>
</RadzenStack>
@ -196,9 +189,7 @@
//options
private bool IsMergePartNumberOption = false;
private int PageSize = 30;
private List<string> OverviewDisableColums = new List<string>();
private List<string> HistoryDisableColums = new List<string> { "testdate", "modelname", "firsttesttime", "finaltesttime", "testlistcntid" };
private int PageSize = 30;
//tab
RadzenTabs tabs;
@ -227,11 +218,7 @@
private async Task GetOverviews()
{
List<Overview> overviews = new();
OverviewDisableColums.Clear();
OverviewDisableColums.Add("rn");
OverviewDisableColums.Add("stepversion");
List<Overview> overviews = new();
if (IsMergePartNumberOption == false)
{
@ -239,10 +226,6 @@
}
else
{
OverviewDisableColums.Add("stationname");
OverviewDisableColums.Add("host");
OverviewDisableColums.Add("section");
OverviewDisableColums.Add("testlistcntid");
overviews = await CPXV2LogService.GetOverviewMerged(SearchDataOverviews);
}
@ -323,12 +306,19 @@
private async Task OnDoubleClickRowHistory(IDataModel row)
{
var s = await CPXV2LogService.GetTestResult(row);
var selectRow = row as TestHistory;
int testStepVersion = selectRow.StepVersion;
if(Int32.TryParse(SelectionStepVersion, out var inputStepVersion) == true)
{
testStepVersion = inputStepVersion;
}
var s = await CPXV2LogService.GetTestResult(row, testStepVersion);
int tabId = Tabs.Max(x => x.Key.Id) + 1;
Tabs.AddOrUpdate(
new OrderdTab { Id = tabId, TabName = $"{EnumTabs.TestResultC1}({tabId})", EnumTab = EnumTabs.TestResultC1, Parent = row },
key => s.DecompressTestResult.Cast<IDataModel>().ToList(), (key, oldValue) => s.DecompressTestResult.Cast<IDataModel>().ToList());
key => s.ParseTestResult.Cast<IDataModel>().ToList(), (key, oldValue) => s.ParseTestResult.Cast<IDataModel>().ToList());
tabs.Reload();
SelectedTabIndex = Tabs.Count - 1;