Egalware/webwindowconfigurator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Possibilità di nascondere figli multipli nella pagina con la gerarchia

Browse Source 
- Gestione bottom rail del frame
This commit is contained in:
Annamaria Sassi
2026-02-10 12:17:00 +01:00
parent 3d092b53fb
commit a898ccced5
9 changed files with 377 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WebWindowComplex/Compo/CardTree.razor
+73 -38
View File
@@ -5,48 +5,83 @@
@for (int i = 0; i < ItemTableList.Count; i++)
{
<tr>
@for (int j = 0; j < maxCol; j++)
@for (int j = 0; j < maxCol - 1; j++)
{
CompileStep cs = CompileStep.Frame;
int ind = -1;
string s = "Vai a step ";
@if (j + 1 == ItemTableList[i].Col)
{
@if (ItemTableList[i].Type is Json.WindowConst.AreaTypes.FRAME)
{
cs = CompileStep.Frame;
s = s + cs.ToString();
}
else if (ItemTableList[i].Type is Json.WindowConst.AreaTypes.SPLIT)
{
cs = CompileStep.Split;
ind = ItemTableList[i].IndexItem;
s = s + cs.ToString() + ((ind + 1) > 0 ? (ind + 1): "");
}
else if (ItemTableList[i].Type is Json.WindowConst.AreaTypes.SASH)
{
cs = CompileStep.Sash;
ind = ItemTableList[i].IndexItem;
s = s + cs.ToString() + ((ind + 1) > 0 ? (ind + 1) : "");
}
else if (ItemTableList[i].Type is Json.WindowConst.AreaTypes.FILL)
{
cs = CompileStep.Fill;
ind = ItemTableList[i].IndexItem;
s = s + cs.ToString() + ((ind + 1) > 0 ? (ind + 1) : "");
}
<td>
<button class="btn btn-sm btn-secondary" style="font-size: 1rem;" @onclick="() => RaiseNextStep(cs, ind)" title="@(s)">@ItemTableList[i].Desc</button>
@* @if (ItemTableList[i].Type is Json.WindowConst.AreaTypes.SASH ||
ItemTableList[i].Type is Json.WindowConst.AreaTypes.SPLIT)
{
<button class="btn btn-sm btn-secondary" style="font-size: 1rem;" @onclick="() => Remove(cs, ind)" title="Remove">Canc</button>
} *@
</td>
var index = RowCollapsedDict.Keys.Where(k => k <= i).LastOrDefault();
@if ((RowCollapsedDict.ContainsValue(true) && RowCollapsedDict.GetValueOrDefault(index))
&& i - 1 > 0 && ItemTableList.ElementAt(i).Col > ItemTableList.ElementAt(index-1).Col){
continue;
}
else
{
<td>@FillTable(i, j)</td>
CompileStep cs = CompileStep.Frame;
int row = i;
int ind = -1;
string s = "Vai a step ";
@if (j + 1 == ItemTableList[i].Col)
{
@if (ItemTableList[i].Type is Json.WindowConst.AreaTypes.FRAME)
{
cs = CompileStep.Frame;
s = s + cs.ToString();
}
else if (ItemTableList[i].Type is Json.WindowConst.AreaTypes.SPLIT)
{
cs = CompileStep.Split;
ind = ItemTableList[i].IndexItem;
s = s + cs.ToString() + ((ind + 1) > 0 ? (ind + 1): "");
}
else if (ItemTableList[i].Type is Json.WindowConst.AreaTypes.SASH)
{
cs = CompileStep.Sash;
ind = ItemTableList[i].IndexItem;
s = s + cs.ToString() + ((ind + 1) > 0 ? (ind + 1) : "");
}
else if (ItemTableList[i].Type is Json.WindowConst.AreaTypes.FILL)
{
cs = CompileStep.Fill;
ind = ItemTableList[i].IndexItem;
s = s + cs.ToString() + ((ind + 1) > 0 ? (ind + 1) : "");
}
<td>
<div class="d-flex flex-row align-items-center justify-content-center">
<div class="card text-center p-1 shadow-sm hover-shadow" >
<button class="btn btn-sm btn-rounded" @onclick="() => RaiseNextStep(cs, ind)" title="@(s)"
style="font-size: 1rem;">
@ItemTableList[i].Desc
</button>
</div>
@if (ItemTableList[row].NumChild > 4)
{
<div class="card border-light text-center">
<button class="btn btn-sm" @onclick="() => ChangeCollapsed(ItemTableList[row].Row)"
style="--bs-btn-padding-y: .25rem; --bs-btn-padding-x: .5rem; --bs-btn-font-size: .75rem;">
<i class="@hwIcon(ItemTableList[i].Row)" style="width:0.5rem;"></i>
</button>
</div>
@* <button class="btn btn-xs btn-light btn-rounded" style="width:2rem;"
@onclick="() => changeCollapsed(ItemTableList[row].Row)">
<i class="@hwIcon(ItemTableList[i].Row)" style="width:0.5rem;"></i>
</button> *@
}
@* <div class="card text-center m-1 p-1 shadow-sm hover-shadow">
<button class="btn btn-sm btn-danger btn-rounded"
style="font-size: 1rem;">
<i class="bi bi-trash3-fill"></i>
</button>
</div> *@
</div>
@* @if (ItemTableList[i].Type is Json.WindowConst.AreaTypes.SASH ||
ItemTableList[i].Type is Json.WindowConst.AreaTypes.SPLIT)
{
<button class="btn btn-sm btn-secondary" style="font-size: 1rem;" @onclick="() => Remove(cs, ind)" title="Remove">Canc</button>
} *@
</td>
}
else
{
<td>@FillTable(i, j)</td>
}
}
}
</tr>
WebWindowComplex/Compo/CardTree.razor.cs
+234
View File
@@ -22,12 +22,30 @@ namespace WebWindowComplex.Compo
[Parameter]
public int maxCol { get; set; } = 0;
/// <summary>
/// Dizionario con elementi che possono collassare
/// </summary>
[Parameter]
public Dictionary<int, bool> RowCollapsedDict { get; set; } = new Dictionary<int, bool>();
/// <summary>
/// Dizionario con numero di figli per elementi che possono collassare
/// </summary>
[Parameter]
public Dictionary<int, int> ChildDict { get; set; } = new Dictionary<int, int>();
/// <summary>
/// Evento richiesta prossimo step
/// </summary>
[Parameter]
public EventCallback<DataNextStep> EC_NextStep { get; set; }
/// <summary>
/// Evento aggiornamento dizionari per collasso righe
/// </summary>
[Parameter]
public EventCallback<Dictionary<int, bool>> EC_Collapsed { get; set; }
/// <summary>
/// Metodo per richiesta prossimo step
/// </summary>
@@ -42,6 +60,70 @@ namespace WebWindowComplex.Compo
return EC_NextStep.InvokeAsync(Args);
}
//private Dictionary<int, bool> RowCollapsedDict { get; set; } = new Dictionary<int, bool>();
//private Dictionary<int, int> Child { get; set; } = new Dictionary<int, int>();
//protected override void OnAfterRender(bool firstRender)
//{
// if (firstRender)
// {
// foreach (var key in RowCollapsedDict.Keys.ToList())
// {
// RowCollapsedDict[key] = false;
// Child[key] = -1;
// }
// //for (int i = 0; i < ItemTableList.Count; i++)
// //{
// // for (int j = 0; j < maxCol; j++)
// // {
// // if (j + 1 == ItemTableList[i].Col)
// // {
// // TableList.Add(new DataTable
// // {
// // item = ItemTableList[i],
// // row = i,
// // col = j,
// // hidden = false
// // });
// // }
// // else
// // {
// // FillTable(i, j);
// // }
// // }
// //}
// }
//}
//protected override void OnParametersSet()
//{
// RowCollapsedDict.Clear();
// Child.Clear();
// foreach (var item in ItemTableList)
// {
// if(item.NumChild > 4)
// {
// RowCollapsedDict.Add(item.Row, false);
// Child.Add(item.Row, item.NumChild);
// }
// }
//}
/// <summary>
/// Metodo per aprire/chiudere sottorighe
/// </summary>
/// <returns></returns>
private Task ChangeCollapsed(int row)
{
RowCollapsedDict[row] = RowCollapsedDict[row] ? false : true;
return EC_Collapsed.InvokeAsync(RowCollapsedDict);
}
private string hwIcon(int row)
{
return RowCollapsedDict[row] ? "fa-solid fa-chevron-down" : "fa-solid fa-chevron-up";
}
//private async Task Remove(CompileStep cs, int indexStep)
//{
// var Args = new DataNextStep
@@ -136,6 +218,157 @@ namespace WebWindowComplex.Compo
return " ";
}
}
private bool HideRow(int row, int col)
{
List<ItemTable> itemSameCol = new List<ItemTable>();
for (int k = 0; k < row; k++)
{
if (ItemTableList[k].Col == col + 1)
{
itemSameCol.Add(ItemTableList[k]);
}
continue;
}
if(itemSameCol.Count > 0)
return RowCollapsedDict.GetValueOrDefault(itemSameCol.First().Row - 1);
return false;
}
// private void FillTable(int row, int col)
// {
// List<ItemTable> itemSameCol = new List<ItemTable>();
// for (int k = 0; k < row; k++)
// {
// if (ItemTableList[k].Col == col + 1)
// {
// itemSameCol.Add(ItemTableList[k]);
// }
// continue;
// }
// int numItemNextCol = 0;
// for (int k = 0; k < row; k++)
// {
// if (ItemTableList[k].Row <= row && ItemTableList[k].Col == col + 2)
// {
// numItemNextCol++;
// }
// continue;
// }
// if (itemSameCol.Count > 1)
// {
// for (int i = 0; i <= itemSameCol.Count - 2; i++)
// {
// if (itemSameCol[i].NumChild > 0)
// numItemNextCol = numItemNextCol - itemSameCol[i].NumChild;
// }
// }
// if (itemSameCol.Count > 0)
// {
// // Sono alla riga successiva di un elemento e nella stessa colonna
// if (itemSameCol.Last().Row == row)
// {
// // se ha un solo figlio
// if (itemSameCol.Last().NumChild == 1)
// {
// TableList.Add(new DataTable
// {
// symbol = "└",
// row = row,
// col = col,
// hidden = false
// });
// }
// else if (itemSameCol.Last().NumChild == 0)
// {
// TableList.Add(new DataTable
// {
// symbol = " ",
// row = row,
// col = col,
// hidden = false
// });
// }
// else
// {
// TableList.Add(new DataTable
// {
// symbol = "├",
// row = row,
// col = col,
// hidden = false
// });
// }
// }
// // Non sono alla riga successiva
// else
// {
// // se ha un solo figlio
// if (itemSameCol.Last().NumChild == 1)
// {
// TableList.Add(new DataTable
// {
// symbol = " ",
// row = row,
// col = col,
// hidden = false
// });
// }
// else if (col + 2 <= maxCol && ItemTableList[row].Col == col + 2)
// {
// if (numItemNextCol < itemSameCol.Last().NumChild && numItemNextCol != (itemSameCol.Last().NumChild - 1))
// {
// TableList.Add(new DataTable
// {
// symbol = "├",
// row = row,
// col = col,
// hidden = false
// });
// }
// TableList.Add(new DataTable
// {
// symbol = "└",
// row = row,
// col = col,
// hidden = false
// });
// }
// else if (numItemNextCol < itemSameCol.Last().NumChild)
// {
// TableList.Add(new DataTable
// {
// symbol = "│",
// row = row,
// col = col,
// hidden = false
// });
// }
// else
// {
// TableList.Add(new DataTable
// {
// symbol = " ",
// row = row,
// col = col,
// hidden = false
// });
// }
// }
// }
// else
// {
// TableList.Add(new DataTable
// {
// symbol = " ",
// row = row,
// col = col,
// hidden = false
// });
// }
// }
//}
}
/// <summary>
@@ -146,4 +379,5 @@ namespace WebWindowComplex.Compo
public CompileStep currCompileStep { get; set; }
public int index { get; set; }
}
}
WebWindowComplex/DTO/LivePayload.cs
+1 -1
View File
@@ -61,7 +61,7 @@ namespace WebWindowComplex.DTO
return false;
if (!DictUtils.DictAreEqual(DictShape, item.DictShape))
return false;
if (ProfElementList.Count == item.ProfElementList.Count && !ProfElementList.OrderBy(x => x).SequenceEqual(item.ProfElementList.OrderBy(x => x)))
if (ProfElementList.Count != item.ProfElementList.Count || !ProfElementList.OrderBy(x => x.GroupId).SequenceEqual(item.ProfElementList.OrderBy(x => x.GroupId)))
return false;
return true;
}
WebWindowComplex/Models/Area.cs
+6 -2
View File
@@ -101,9 +101,13 @@ namespace WebWindowComplex.Models
public void AddFirstSash()
{
// Salvo il parent
if(this is Frame)
if(this is Frame || ParentArea.AreaList.Last().Equals(this))
{
Frame f = (Frame)this;
Frame f = null;
if (this is Frame)
f = (Frame)this;
else
f = (Frame)ParentWindow.AreaList.First();
f.BottomRailQty = 0;
f.BottomRailElemDimList.Clear();
}
WebWindowComplex/Models/Split.cs
+1 -17
View File
@@ -409,6 +409,7 @@ namespace WebWindowComplex.Models
m_SplitHorizList = value;
}
}
public List<SplitElementDimension> ElemDimHorizList
{
get
@@ -499,7 +500,6 @@ namespace WebWindowComplex.Models
Fill newFill = Fill.CreateFill(ParentArea, FillTypes.GLASS);
newFill.SetAreaType(AreaTypes.FILL);
ParentArea.AreaList.Add(newFill);
//m_ParentWindow.OnUpdatePreview(m_ParentWindow.sSerialized());
}
public List<SplitElementDimension> searchElemFromSubArea(int subArea)
@@ -607,12 +607,6 @@ namespace WebWindowComplex.Models
}
else
{
// Un Elemento per ogni dimensione principale e secondaria
//int subArea = 1;
//if (!bSplitStartVert)
// subArea = 0;
//for (int i = 0; i < QtyHoriz; i++)
// ElemDimHorizList.Add(new SplitElementDimension(this, i + 1, 78, subArea));
// Un Elemento per ogni dimensione principale e per ogni sotto dimensione
if (bSplitStartVert)
{
@@ -660,12 +654,6 @@ namespace WebWindowComplex.Models
}
else
{
// Un Elemento per ogni dimensione principale e secondaria
//int subArea = 0;
//if (!bSplitStartVert)
// subArea = 1;
//for (int i = 0; i < QtyVert; i++)
// ElemDimVertList.Add(new SplitElementDimension(this, i + 1, 78, subArea));
// Un Elemento per ogni dimensione principale e per ogni sotto dimensione
if (bSplitStartVert)
{
@@ -722,14 +710,12 @@ namespace WebWindowComplex.Models
#region Private Fields
//private bool m_bIsPercentage = true;
private bool m_bSplitStartVert = true;
private SplitShapes m_SelSplitShape;
private List<SplitDimension> m_SplitHorizList = new List<SplitDimension>();
private List<SplitElementDimension> m_ElemDimHorizList = new List<SplitElementDimension>();
private List<SplitElementDimension> m_ElemDimVertList = new List<SplitElementDimension>();
private List<SplitDimension> m_SplitPositionList = new List<SplitDimension>();
private List<IdNameStruct> m_SplitShapeList = new List<IdNameStruct>
{
@@ -741,8 +727,6 @@ namespace WebWindowComplex.Models
private List<SplitDimension> m_SplitVertList = new List<SplitDimension>();
//private double m_Width = 0;
#endregion Private Fields
}
}
WebWindowComplex/TableComp.razor
+5 -2
View File
@@ -77,8 +77,11 @@
@if (currStep == CompileStep.Tree)
{
<CardTree ItemTableList="m_ItemTableList"
maxCol="m_maxCol"
EC_NextStep="NextStepArgs">
maxCol="m_maxCol"
RowCollapsedDict="RowCollapsed"
ChildDict="Child"
EC_NextStep="NextStepArgs"
EC_Collapsed="CollapsedRowTree">
</CardTree>
}
else if (currStep == CompileStep.Frame)
WebWindowComplex/TableComp.razor.cs
+46 -1
View File
@@ -587,7 +587,8 @@ namespace WebWindowComplex
CurrJwd = LiveData.CurrJwd,
DictOptionsXml = LiveData.DictOptionsXml,
DictShape = LiveData.DictShape,
SvgPreview = LiveData.SvgPreview
SvgPreview = LiveData.SvgPreview,
ProfElementList = LiveData.ProfElementList
};
// Aggiornati parametri di ingresso selezionati
UpdateSelParameter();
@@ -843,6 +844,21 @@ namespace WebWindowComplex
m_ItemTableList = new List<ItemTable>();
CreateWindowsList((m_CurrWindow!).AreaList.First(), false);
CreateElementTable(m_CurrWindow.AreaList.First(), 1, 1, 1, 1);
foreach (var item in ItemTableList)
{
if (item.NumChild > 4)
{
if (!RowCollapsed.ContainsKey(item.Row))
{
RowCollapsed.Add(item.Row, false);
Child.Add(item.Row, item.NumChild);
}
}
else if(RowCollapsed.ContainsKey(item.Row))
{
RowCollapsed.Remove(item.Row);
}
}
}
/// <summary>
@@ -920,6 +936,9 @@ namespace WebWindowComplex
private List<Fill> m_FillList = new List<Fill>();
private List<Splitted> m_SplittedList = new List<Splitted>();
private Dictionary<int, bool> RowCollapsed { get; set; } = new Dictionary<int, bool>();
private Dictionary<int, int> Child { get; set; } = new Dictionary<int, int>();
private static Logger Log = LogManager.GetCurrentClassLogger();
#endregion Private Fields
@@ -1101,6 +1120,22 @@ namespace WebWindowComplex
NextStep(newStep, Index);
}
/// <summary>
/// Metodo per aggiornare il valore collassato degli elementi della gerarchia
/// </summary>
/// <param name="Args"></param>
private void CollapsedRowTree(Dictionary<int,bool> Args)
{
foreach(var item in Args)
{
RowCollapsed[item.Key] = Args[item.Key] ? true : false;
if (m_ItemTableList.FirstOrDefault(x => x.Row == item.Key) != null)
{
Child[item.Key] = m_ItemTableList.FirstOrDefault(x => x.Row == item.Key).NumChild;
}
}
}
/// <summary>
/// Richiesta reset dizionario Shape con action
/// </summary>
@@ -1228,6 +1263,11 @@ namespace WebWindowComplex
SpElemList.ElementAt(i).SetMaxDimension(Window.m_ParameterList.GetValueOrDefault(SpElemList.ElementAt(i).sName + "_DimMax"));
string overlapName = string.Join("_", SpElemList.ElementAt(i).sName.Split('_').Skip(1));
SpElemList.ElementAt(i).SetOverlapElement(Window.m_ParameterList.GetValueOrDefault(SpElemList.ElementAt(i).sName + "_Overlap"));
//// Se la lista in precedenza era vuota, metto i valori di default
//if (prevLiveData.ProfElementList == null || prevLiveData.ProfElementList.Count == 0)
//{
// SpElemList.ElementAt(i).SetDimension(Window.m_ParameterList.GetValueOrDefault(SpElemList.ElementAt(i).sName + "_DimStd"));
//}
}
break;
}
@@ -1238,6 +1278,11 @@ namespace WebWindowComplex
item.SetMaxDimension(Window.m_ParameterList.GetValueOrDefault(item.sName + "_DimMax"));
string overlapName = string.Join("_", item.sName.Split('_').Skip(1));
item.SetOverlapElement(Window.m_ParameterList.GetValueOrDefault(overlapName + "_Overlap"));
// Se la lista in precedenza era vuota, metto i valori di default
//if (prevLiveData.ProfElementList == null || prevLiveData.ProfElementList.Count == 0)
//{
// item.SetDimension(Window.m_ParameterList.GetValueOrDefault(item.sName + "_DimStd"));
//}
}
}
}
WebWindowComplex/WebWindowComplex.csproj
+6 -1
View File
@@ -6,7 +6,7 @@
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Version>3.1.2.617</Version>
<Version>3.1.2.1012</Version>
<Authors>Annamaria Sassi</Authors>
<Company>Egalware</Company>
<Description>Componente gestione Configurazioni avanzate Window per LUX</Description>
@@ -109,6 +109,11 @@
WebWindowConfigurator/WebWindowConfigurator.csproj
+5 -1
View File
@@ -6,7 +6,7 @@
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Version>3.1.2.617</Version>
<Version>3.1.2.1012</Version>
<Authors>Annamaria Sassi</Authors>
<Company>Egalware</Company>
<Description>Componente gestione JWD per LUX</Description>
@@ -97,6 +97,10 @@