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

[성현모] Tab기능 개선

Browse Source
This commit is contained in:
SHM
2025-09-05 14:32:40 +09:00
parent 95f137d543
commit 9d6f05a96d
2 changed files with 90 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,9 @@
@page "/tra" @page "/tra"
@rendermode InteractiveServer @rendermode InteractiveServer
@using System.Collections.Concurrent
@using System.Collections.Specialized
@using System.Collections
@using Web.Tra.Services @using Web.Tra.Services
@inject CPXV2LogService CPXV2LogService @inject CPXV2LogService CPXV2LogService
@inject PopupService PopupService @inject PopupService PopupService
@ -78,33 +81,33 @@
<!--Data Grid--> <!--Data Grid-->
<RadzenTabs @ref="@tabs" Style="width:100%; height:100%;" RenderMode="TabRenderMode.Client" @bind-SelectedIndex=@SelectedTabIndex> <RadzenTabs @ref="@tabs" Style="width:100%; height:100%;" RenderMode="TabRenderMode.Client" @bind-SelectedIndex=@SelectedTabIndex>
<Tabs> <Tabs>
@foreach (var tab in ListTabs) @foreach (var tab in Tabs.OrderBy(x=>x.Key.Id))
{ {
<RadzenTabsItem Text="@tab.Key.ToString()"> <RadzenTabsItem Text="@tab.Key.TabName">
<Template> <Template>
<span style="margin-right: 1rem; font-size: 1.5rem;">@context.Text</span> <span style="margin-right: 1rem; font-size: 1.5rem;">@context.Text</span>
<RadzenButton Size="ButtonSize.Small" Icon="close" Click="@(()=>OnClickClose(tab.Key))"></RadzenButton> <RadzenButton Size="ButtonSize.Small" Icon="close" Click="@(()=>OnClickClose(tab.Key.Id))"></RadzenButton>
</Template> </Template>
<ChildContent> <ChildContent>
@if (tab.Key == EnumTabs.OverviewC1.ToString()) @if (tab.Key.EnumTab == EnumTabs.OverviewC1)
{ {
<TraGrid TDataModel="Overview" DataList="@Overviews" OnClickContextMenu="@OnClickDetailOverviewContextMenu" <TraGrid TDataModel="Overview" DataList="@(tab.Value.Cast<Overview>())" OnClickContextMenu="@OnClickDetailOverviewContextMenu"
OnSelectRow="@OnSelectRowOverview" PageSize="@PageSize" DisableColums="@OverviewDisableColums" OnSelectRow="@OnSelectRowOverview" PageSize="@PageSize" DisableColums="@OverviewDisableColums"
OnDoubleClickRow="@OnDoubleClickRowOverview" HostColumnMerge> OnDoubleClickRow="@OnDoubleClickRowOverview" HostColumnMerge>
</TraGrid> </TraGrid>
} }
@if (tab.Key == EnumTabs.OverviewC1Detail.ToString()) @if (tab.Key.EnumTab == EnumTabs.OverviewC1Detail)
{ {
<TraGrid TDataModel="Overview" DataList="@DetailOverviews" OnClickContextMenu="@OnClickDetailOverviewContextMenu" <TraGrid TDataModel="Overview" DataList="@(tab.Value.Cast<Overview>())" OnClickContextMenu="@OnClickDetailOverviewContextMenu"
OnSelectRow="@OnSelectRowOverview" PageSize="@PageSize" DisableColums="@OverviewDisableColums" OnSelectRow="@OnSelectRowOverview" PageSize="@PageSize" DisableColums="@OverviewDisableColums"
OnDoubleClickRow="@OnDoubleClickRowDetailOverview" HostColumnMerge> OnDoubleClickRow="@OnDoubleClickRowDetailOverview" HostColumnMerge>
</TraGrid> </TraGrid>
} }
@if (tab.Key.Contains(EnumTabs.TestHistoryC1.ToString())) @if (tab.Key.EnumTab == EnumTabs.TestHistoryC1)
{ {
<TraGrid TDataModel="TestHistory" DataList="@TestHistories.Where(x=>x.Key == tab.Key).First().Value" OnClickContextMenu="@OnClickDetailOverviewContextMenu" <TraGrid TDataModel="TestHistory" DataList="@(tab.Value.Cast<TestHistory>())" OnClickContextMenu="@OnClickDetailOverviewContextMenu"
OnSelectRow="@OnSelectRowOverview" PageSize="@PageSize" DisableColums="@HistoryDisableColums" OnSelectRow="@OnSelectRowOverview" PageSize="@PageSize" DisableColums="@HistoryDisableColums"
VisibleRowNo HostColumnMerge="false"> VisibleRowNo HostColumnMerge="false">
</TraGrid> </TraGrid>
@ -135,13 +138,10 @@
//tab //tab
RadzenTabs tabs; RadzenTabs tabs;
int SelectedTabIndex = 0; int SelectedTabIndex = 0;
Dictionary<string, EnumTabs> ListTabs = new Dictionary<string, EnumTabs>(); ConcurrentDictionary<OrderdTab, List<IDataModel>> Tabs = new ConcurrentDictionary<OrderdTab, List<IDataModel>>();
//search data //search data
List<SearchData> SearchDataOverviews = new List<SearchData>(); List<SearchData> SearchDataOverviews = new List<SearchData>();
List<Overview> Overviews = new List<Overview>();
List<Overview> DetailOverviews = new List<Overview>();
Dictionary<string,List<TestHistory>> TestHistories = new();
private async Task OnSearch() private async Task OnSearch()
{ {
@ -157,21 +157,20 @@
SearchDataOverviews = await CPXV2LogService.GetSearchDataOverview(RequestSearch); SearchDataOverviews = await CPXV2LogService.GetSearchDataOverview(RequestSearch);
await GetOverviews(); await GetOverviews();
if (ListTabs.ContainsKey(EnumTabs.OverviewC1.ToString()) == false)
ListTabs.Add($"{EnumTabs.OverviewC1}", EnumTabs.OverviewC1);
PopupService.CloseIndicator(); PopupService.CloseIndicator();
} }
private async Task GetOverviews() private async Task GetOverviews()
{ {
List<Overview> overviews = new();
OverviewDisableColums.Clear(); OverviewDisableColums.Clear();
OverviewDisableColums.Add("rn"); OverviewDisableColums.Add("rn");
OverviewDisableColums.Add("stepversion"); OverviewDisableColums.Add("stepversion");
if (IsMergePartNumberOption == false) if (IsMergePartNumberOption == false)
{ {
Overviews = await CPXV2LogService.GetOverviews(SearchDataOverviews); overviews = await CPXV2LogService.GetOverviews(SearchDataOverviews);
} }
else else
{ {
@ -179,8 +178,20 @@
OverviewDisableColums.Add("host"); OverviewDisableColums.Add("host");
OverviewDisableColums.Add("section"); OverviewDisableColums.Add("section");
OverviewDisableColums.Add("testlistcntid"); OverviewDisableColums.Add("testlistcntid");
Overviews = await CPXV2LogService.GetOverviewMerged(SearchDataOverviews); overviews = await CPXV2LogService.GetOverviewMerged(SearchDataOverviews);
} }
int tabId = 0;
if(Tabs.Count > 0)
{
tabId = Tabs.Max(x=>x.Key.Id) + 1;
}
Tabs.AddOrUpdate(
new OrderdTab {Id = tabId, TabName = $"{EnumTabs.OverviewC1} ({tabId})" , EnumTab = EnumTabs.OverviewC1 },
key => overviews.Cast<IDataModel>().ToList(), (key, oldValue) => overviews.Cast<IDataModel>().ToList());
SelectedTabIndex = Tabs.Count - 1;
} }
private void OnSelectRowOverview(IDataModel overview) private void OnSelectRowOverview(IDataModel overview)
@ -196,45 +207,45 @@
private async Task OnDoubleClickRowOverview(IDataModel row) private async Task OnDoubleClickRowOverview(IDataModel row)
{ {
DetailOverviews.Clear(); List<Overview> detailOverviews = new();
if (IsMergePartNumberOption == false) if (IsMergePartNumberOption == false)
{ {
DetailOverviews = await CPXV2LogService.GetDetailOverview(SearchDataOverviews, row); detailOverviews = await CPXV2LogService.GetDetailOverview(SearchDataOverviews, row);
} }
else else
{ {
DetailOverviews = await CPXV2LogService.GetDetailOverviewMerged(SearchDataOverviews, row); detailOverviews = await CPXV2LogService.GetDetailOverviewMerged(SearchDataOverviews, row);
} }
//tab control int tabId = Tabs.Max(x => x.Key.Id) + 1;
if (ListTabs.ContainsKey(EnumTabs.OverviewC1Detail.ToString()) == false) Tabs.AddOrUpdate(
ListTabs.Add($"{EnumTabs.OverviewC1Detail.ToString()}", EnumTabs.OverviewC1Detail); new OrderdTab { Id = tabId, TabName = $"{EnumTabs.OverviewC1Detail} ({tabId})", EnumTab = EnumTabs.OverviewC1Detail },
key => detailOverviews.Cast<IDataModel>().ToList(), (key, oldValue) => detailOverviews.Cast<IDataModel>().ToList());
tabs.Reload(); tabs.Reload();
SelectedTabIndex = ListTabs.Keys.ToList().IndexOf(EnumTabs.OverviewC1Detail.ToString()); SelectedTabIndex = Tabs.Count - 1;
} }
private async Task OnDoubleClickRowDetailOverview(IDataModel row) private async Task OnDoubleClickRowDetailOverview(IDataModel row)
{ {
var historyIndex = TestHistories.Count(); List<TestHistory> histories = new();
string histoiresKey = $"{EnumTabs.TestHistoryC1.ToString()}({historyIndex + 1})";
if (IsMergePartNumberOption == false) if (IsMergePartNumberOption == false)
{ {
var getHistories = await CPXV2LogService.GetTestHistory(SearchDataOverviews, row); histories = await CPXV2LogService.GetTestHistory(SearchDataOverviews, row);
TestHistories.Add(histoiresKey, getHistories);
} }
else else
{ {
var getHistories = await CPXV2LogService.GetTestHistoryMerged(SearchDataOverviews, row); histories = await CPXV2LogService.GetTestHistoryMerged(SearchDataOverviews, row);
TestHistories.Add(histoiresKey, getHistories);
} }
//tab control
ListTabs.Add(histoiresKey, EnumTabs.TestHistoryC1);
tabs.Reload();
SelectedTabIndex = ListTabs.Count - 1; int tabId = Tabs.Max(x => x.Key.Id) + 1;
Tabs.AddOrUpdate(
new OrderdTab { Id = tabId, TabName = $"{EnumTabs.TestHistoryC1}({tabId})", EnumTab = EnumTabs.TestHistoryC1 },
key => histories.Cast<IDataModel>().ToList(), (key, oldValue) => histories.Cast<IDataModel>().ToList());
tabs.Reload();
SelectedTabIndex = Tabs.Count - 1;
} }
private void OnClickDetailOverviewContextMenu() private void OnClickDetailOverviewContextMenu()
@ -260,19 +271,33 @@
// SelectedTabIndex = ListTabs.Keys.ToList().IndexOf($"{EnumTabs.TestHistoryC1}({index})"); // SelectedTabIndex = ListTabs.Keys.ToList().IndexOf($"{EnumTabs.TestHistoryC1}({index})");
} }
void OnClickClose(string tabKey) void OnClickClose(int tabId)
{ {
CloseTab(tabKey); CloseTab(tabId);
} }
void CloseTab(string tabKey) void CloseTab(int tabId)
{ {
if (ListTabs.ContainsKey(tabKey)) var removeTab = Tabs.Where(x => x.Key.Id == tabId)?.First().Key;
{
ListTabs.Remove(tabKey); //remove
if (SelectedTabIndex >= ListTabs.Count) if (removeTab is not null)
SelectedTabIndex = ListTabs.Count - 1; {
Tabs.TryRemove(removeTab, out var value);
} }
//select tab
var currentTab = tabs.SelectedTab;
if (Tabs.Where(x => x.Key.TabName == currentTab.Text)?.Count() > 0)
{
SelectedTabIndex = currentTab.Index;
}
else
{
SelectedTabIndex = Tabs.Count - 1;
}
tabs.Reload(); tabs.Reload();
} }
@ -280,12 +305,13 @@
{ {
PopupService.OpenIndicator(""); PopupService.OpenIndicator("");
foreach(var tab in ListTabs) // foreach(var tab in Tabs)
{ // {
if (tab.Value == EnumTabs.OverviewC1) // if (tab.Value == EnumTabs.OverviewC1)
continue; // continue;
CloseTab(tab.Key.ToString());
} // CloseTab(tab.Key.ToString());
// }
await GetOverviews(); await GetOverviews();

11
Projects/WebClient/Web.Tra/Model/OrderdTab.cs Normal file
View File

@ -0,0 +1,11 @@
using Web.Tra.Model.Enum;
namespace Web.Tra.Model
{
public class OrderdTab
{
public int Id { get; set; }
public string TabName { get; set; }
public EnumTabs EnumTab { get; set; }
}
}