diff --git a/WebWindowComplex/Compo/CardTree.razor b/WebWindowComplex/Compo/CardTree.razor index d1a7a68..702c019 100644 --- a/WebWindowComplex/Compo/CardTree.razor +++ b/WebWindowComplex/Compo/CardTree.razor @@ -1,138 +1,140 @@ @using static WebWindowComplex.LayoutConst -
|
- @* *@
- *@
-
-
- @*
-
- @if (ItemTableList[row].NumChild > 4)
- {
-
- }
- @if (ItemTableList[i].Type is Json.WindowConst.AreaTypes.SASH ||
- ItemTableList[i].Type is Json.WindowConst.AreaTypes.SPLIT)
- {
-
- }
- @if (ItemTableList[i].Type is Json.WindowConst.AreaTypes.FRAME &&
- ((SashList.Count == 0 && SplitList.Count == 0) || !(FrameWindow.AreaList.First() is Split)))
- {
-
-
-
-
-
- }
- @if (ItemTableList[i].Type is Json.WindowConst.AreaTypes.FILL && SplittedList != null && SplittedList.Count > 0)
- {
- int currIndexFill = ItemTableList[i].IndexItem;
- Splitted? currSplitted = SplittedList.Where(x => x.AreaList.First().Equals(FillList[currIndexFill])).FirstOrDefault();
- @if (currSplitted != null)
- {
- @if (currSplitted.ParentArea != null && currSplitted.ParentWindow != null)
- {
-
-
-
-
- }
- }
- }
-
-
- *@
- @* |
+ var index = RowCollapsedDict.Keys.Order().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
{
- @* @FillTable(i, j) | *@ -+ 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) : ""); + } + |
+ @* *@
+ *@
+
+
+ @*
+
+ @if (ItemTableList[row].NumChild > 4)
+ {
+
+ }
+ @if (ItemTableList[i].Type is Json.WindowConst.AreaTypes.SASH ||
+ ItemTableList[i].Type is Json.WindowConst.AreaTypes.SPLIT)
+ {
+
+ }
+ @if (ItemTableList[i].Type is Json.WindowConst.AreaTypes.FRAME &&
+ ((SashList.Count == 0 && SplitList.Count == 0) || !(FrameWindow.AreaList.First() is Split)))
+ {
+
+
+
+
+
+ }
+ @if (ItemTableList[i].Type is Json.WindowConst.AreaTypes.FILL && SplittedList != null && SplittedList.Count > 0)
+ {
+ int currIndexFill = ItemTableList[i].IndexItem;
+ Splitted? currSplitted = SplittedList.Where(x => x.AreaList.First().Equals(FillList[currIndexFill])).FirstOrDefault();
+ @if (currSplitted != null)
+ {
+ @if (currSplitted.ParentArea != null && currSplitted.ParentWindow != null)
+ {
+
+
+
+
+ }
+ }
+ }
+
+
+ *@
+ @* |
+ }
+ else
+ {
+ @* @FillTable(i, j) | *@ ++ } } } - } - | ||