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

[성현모] Overview Merged 통합, 컬럼 필터링 추가

Browse Source
This commit is contained in:
SHM
2025-09-03 16:45:28 +09:00
parent 32139123ba
commit 9a18f51bef
5 changed files with 106 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,8 +19,12 @@
@foreach (var col in typeof(TDataModel).GetProperties())
{
if (col.Name.ToLower().Equals("rn") || col.Name.ToLower().Equals("stepversion"))
if(DisableColums?.Contains(col.Name.ToLower()) == true)
continue;
@*
if (col.Name.ToLower().Equals("rn") || col.Name.ToLower().Equals("stepversion"))
continue; *@
if (col.Name.ToLower().Equals("testdate"))
{
@ -85,6 +89,9 @@
[Parameter]
public int PageSize { get; set; } = 30;
[Parameter]
public List<string> DisableColums { get; set; }
private IList<TDataModel> SelectedRow;
private void CellRender(DataGridCellRenderEventArgs<TDataModel> args)

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

@ -65,11 +65,11 @@
<RadzenStack Style="font-size:1.5rem;" Orientation="Orientation.Vertical" AlignItems="AlignItems.Start" JustifyContent="JustifyContent.Center">
<RadzenStack Style="width: 18rem;" Orientation="Orientation.Horizontal" AlignItems="AlignItems.Center" JustifyContent="JustifyContent.SpaceBetween">
<RadzenLabel Text="Merge By PartNumber"></RadzenLabel>
<RadzenSwitch @bind-Value=@IsMergePartNumberOption></RadzenSwitch>
<RadzenSwitch @bind-Value=@IsMergePartNumberOption Change="@OnChangeMergePartNumberOption"></RadzenSwitch>
</RadzenStack>
<RadzenStack Style="width: 18rem;" Orientation="Orientation.Horizontal" JustifyContent="JustifyContent.SpaceBetween">
<RadzenLabel Text="Page Size"></RadzenLabel>
<RadzenNumeric @bind-Value=@PageSize></RadzenNumeric>
<RadzenNumeric Style="width: 8rem;" @bind-Value=@PageSize Min="10" Max="200"></RadzenNumeric>
</RadzenStack>
</RadzenStack>
</RadzenStack>
@ -87,8 +87,8 @@
<ChildContent>
@if (tab.Key == EnumTabs.OverviewC1.ToString())
{
<TraGrid TDataModel="OverviewMerged" DataList="@Overviews" OnClickContextMenu="@OnClickDetailOverviewContextMenu"
OnSelectRow="@OnSelectRowOverview" PageSize="@PageSize">
<TraGrid TDataModel="Overview" DataList="@Overviews" OnClickContextMenu="@OnClickDetailOverviewContextMenu"
OnSelectRow="@OnSelectRowOverview" PageSize="@PageSize" DisableColums="@DisableColums">
</TraGrid>
}
@ -122,12 +122,15 @@
private bool IsMergePartNumberOption = false;
private int PageSize = 30;
private List<string> DisableColums = new List<string>();
RadzenTabs tabs;
int SelectedTabIndex = 0;
Dictionary<string, EnumTabs> ListTabs = new Dictionary<string, EnumTabs>();
List<OverviewMerged> Overviews = new List<OverviewMerged>();
List<Overview> DetailOverviews = new List<Overview>();
List<SearchData> SearchDataOverviews = new List<SearchData>();
List<Overview> Overviews = new List<Overview>();
//List<Overview> DetailOverviews = new List<Overview>();
// List<TestHistory> TestHistories = new List<TestHistory>();
protected override async Task OnInitializedAsync()
@ -145,13 +148,35 @@
PopupService.OpenIndicator("Search Data");
Overviews = await CPXV2LogService.GetOverviewMerged(RequestSearch);
SearchDataOverviews = await CPXV2LogService.GetSearchDataOverview(RequestSearch);
await GetOverviews();
if (ListTabs.ContainsKey(EnumTabs.OverviewC1.ToString()) == false)
ListTabs.Add($"{EnumTabs.OverviewC1}", EnumTabs.OverviewC1);
PopupService.CloseIndicator();
}
private async Task GetOverviews()
{
DisableColums.Clear();
DisableColums.Add("rn");
DisableColums.Add("stepversion");
if (IsMergePartNumberOption == false)
{
Overviews = await CPXV2LogService.GetOverviews(SearchDataOverviews);
}
else
{
DisableColums.Add("stationname");
DisableColums.Add("host");
DisableColums.Add("section");
DisableColums.Add("testlistcntid");
Overviews = await CPXV2LogService.GetOverviewMerged(SearchDataOverviews);
}
}
protected override void OnInitialized()
{
@ -172,7 +197,7 @@
// ListTabs.Add($"{EnumTabs.OverviewC1}", EnumTabs.OverviewC1);
}
private void OnSelectRowOverview(OverviewMerged overview)
private void OnSelectRowOverview(IDataModel overview)
{
// SelectionStationName = $"{overview.StationName} ({overview.Host},{overview.Section})";
// SelectionProductNO = $"{overview.ProductNo} ({overview.TestCode})";
@ -216,4 +241,14 @@
}
tabs.Reload();
}
async Task OnChangeMergePartNumberOption()
{
PopupService.OpenIndicator("");
await GetOverviews();
await Task.Delay(300);
PopupService.CloseIndicator();
}
}