diff --git a/WebWindowComplex/TableComp.razor b/WebWindowComplex/TableComp.razor index d48c54c..80016b7 100644 --- a/WebWindowComplex/TableComp.razor +++ b/WebWindowComplex/TableComp.razor @@ -10,55 +10,21 @@
  • @if (currStep == CompileStep.Template) { - Template + } else { - Template + }
    • } @if (FrameWindow != null) {
  • - Tree +
    • - @*
  • - Frame -
    • - @if (SplitList.Count > 0) - { - @for (int i = 0; i < SplitList.Count; i++) - { - int Index = i; -
  • - Split @(SplitList.Count == 1 ? "" : Index + 1) -
    • - } - } - @if (SashList.Count > 0) - { - @for (int i = 0; i < SashList.Count; i++) - { - int Index = i; -
  • - Window @(SashList.Count == 1 ? "" : Index + 1) -
    • - } - } - @if(FillList.Count > 0) - { - @for (int i = 0; i < FillList.Count; i++) - { - int Index = i; -
  • - Fill @(FillList.Count == 1 ? "" : Index + 1) -
    • - } - } - *@
  • - General +
    • } @@ -435,20 +401,6 @@ } } - @* @if (item.SplitHorizList.Count > 0) - { -
    - @foreach (var dim in item.SplitHorizList) - { -
    - Height - - % -
    - - } -
    - } *@ @if (item.SelSplitShape == Json.WindowConst.SplitShapes.GRID) { @@ -823,10 +775,6 @@ { } - @* @for (int i = 0; i < ListPayload.Material.Count; i++) - { - - } *@
    @@ -849,9 +797,9 @@
    @@ -873,9 +821,9 @@
    diff --git a/WebWindowComplex/TableComp.razor.cs b/WebWindowComplex/TableComp.razor.cs index 1512ce2..6d88081 100644 --- a/WebWindowComplex/TableComp.razor.cs +++ b/WebWindowComplex/TableComp.razor.cs @@ -643,19 +643,10 @@ namespace WebWindowComplex protected override async Task OnInitializedAsync() { - if (string.IsNullOrEmpty(LiveData.CurrJwd)) - { - currStep = CompileStep.Template; - } - else - { - currStep = CompileStep.Tree; - } - if (SashList.Count > 0) - currAnta = 0; await DoPreviewSvg(); } + /// /// Gestione update post ricezione parametri da controllo chiamante /// @@ -672,26 +663,8 @@ namespace WebWindowComplex // Aggiornati parametri di ingresso selezionati UpdateSelParameter(); JsonWindow WindowFromJson = JsonConvert.DeserializeObject(m_CurrJwd, new PolymorphicJsonConverter()) ?? new JsonWindow("", "", "", ""); - if (m_CurrWindow != null) - { - m_CurrWindow.OnPreview -= M_CurrWindow_OnPreview; - m_CurrWindow = null; - } - m_CurrWindow = WindowFromJson.Deserialize(); - m_CurrWindow.OnPreview += M_CurrWindow_OnPreview; - // Recupero dimensioni Frame e Joint del frame della finestra precedente - if (m_PreviousWindow != null) - { - for (int i = 0; i < 2; i++) - m_CurrWindow.AreaList[0].DimensionList[i] = m_PreviousWindow.AreaList[0].DimensionList[i]; - for (int i = 0; i < 4; i++) - m_CurrWindow.AreaList[0].JointList[i] = m_PreviousWindow.AreaList[0].JointList[i]; - } - if (m_CurrWindow != null) - { - // Aggiornate liste di sash, split, splitted, fill e itemTable - UpdateLists(); - } + setCurrWindow(WindowFromJson); + currStep = CompileStep.Tree; } else if (CurrSelection != null && CurrSelection.Template != null) { @@ -702,31 +675,41 @@ namespace WebWindowComplex // Aggiornamento parametri di ingresso selezionati UpdateSelParameter(); JsonWindow WindowFromJson = JsonConvert.DeserializeObject(m_SelTemplate.JWD, new PolymorphicJsonConverter()) ?? new JsonWindow("", "", "", ""); - if (m_CurrWindow != null) - { - m_CurrWindow.OnPreview -= M_CurrWindow_OnPreview; - m_CurrWindow = null; - } - m_CurrWindow = WindowFromJson.Deserialize(); - m_CurrWindow.OnPreview += M_CurrWindow_OnPreview; - // Recupero dimensioni Frame e Joint del frame della finestra precedente - if (m_PreviousWindow != null) - { - for (int i = 0; i < 2; i++) - m_CurrWindow.AreaList[0].DimensionList[i] = m_PreviousWindow.AreaList[0].DimensionList[i]; - for (int i = 0; i < 4; i++) - m_CurrWindow.AreaList[0].JointList[i] = m_PreviousWindow.AreaList[0].JointList[i]; - } - } - if (m_CurrWindow != null) - { - // Aggiornamento liste sash, split, splitted, fill e itemTable - UpdateLists(); + setCurrWindow(WindowFromJson); + currStep = CompileStep.Template; } } + if (SashList.Count > 0) + currAnta = 0; } } + protected void setCurrWindow(JsonWindow WindowFromJson) + { + if (m_CurrWindow != null) + { + m_CurrWindow.OnPreview -= M_CurrWindow_OnPreview; + m_CurrWindow = null; + } + m_CurrWindow = WindowFromJson.Deserialize(); + m_CurrWindow.OnPreview += M_CurrWindow_OnPreview; + // Recupero dimensioni Frame e Joint del frame della finestra precedente + if (m_PreviousWindow != null) + { + for (int i = 0; i < 2; i++) + m_CurrWindow.AreaList[0].DimensionList[i] = m_PreviousWindow.AreaList[0].DimensionList[i]; + for (int i = 0; i < 4; i++) + m_CurrWindow.AreaList[0].JointList[i] = m_PreviousWindow.AreaList[0].JointList[i]; + } + if (m_CurrWindow != null) + { + // Aggiornamento liste sash, split, splitted, fill e itemTable + UpdateLists(); + } + if (SashList.Count > 0) + currAnta = 0; + } + /// /// Metodo che resetta le liste (sash, split, splitted, fill e itemTable) e le crea nuovamente /// diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj index 2a70a11..cd0b747 100644 --- a/WebWindowComplex/WebWindowComplex.csproj +++ b/WebWindowComplex/WebWindowComplex.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 2.7.10.619 + 2.7.10.712 Annamaria Sassi Egalware Componente gestione Configurazioni avanzate Window per LUX @@ -49,6 +49,20 @@ + + + + + + + + + + + + + + diff --git a/WebWindowComplex/Window.cs b/WebWindowComplex/Window.cs index 00d6a92..279104f 100644 --- a/WebWindowComplex/Window.cs +++ b/WebWindowComplex/Window.cs @@ -754,22 +754,6 @@ namespace WebWindowComplex ContentArea[0].SetParentArea(this); AreaList.Clear(); AreaList.Add(ContentArea[0]); - - //while (AreaList.Count > 0) - //{ - // if (AreaList.Count == 1 & AreaList[0].AreaList.Count > 0) - // { - // foreach (Area selArea in AreaList[0].AreaList) - // { - // ContentArea.Add(selArea); - // } - // } - // AreaList.Remove(AreaList[AreaList.Count - 1]); - //} - //if (ContentArea.Count > 0) - //{ - // AreaList = ContentArea; - //} } else { diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj index 631d1ee..55bf014 100644 --- a/WebWindowConfigurator/WebWindowConfigurator.csproj +++ b/WebWindowConfigurator/WebWindowConfigurator.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 2.7.10.619 + 2.7.10.712 Annamaria Sassi Egalware Componente gestione JWD per LUX @@ -59,6 +59,21 @@ + + + + + + + + + + + + + + +