From 6c532eebce4284bf10cd0a16f0a3fb91b895daa1 Mon Sep 17 00:00:00 2001 From: Annamaria Sassi Date: Wed, 12 Aug 2026 15:07:12 +0200 Subject: [PATCH] Aggiornata modifica elementi --- WebWindowComplex/Compo/AreaSash.razor | 10 +- WebWindowComplex/Compo/AreaSash.razor.cs | 7 ++ WebWindowComplex/Compo/CardFrame.razor | 12 +-- WebWindowComplex/Compo/CardFrame.razor.cs | 7 ++ WebWindowComplex/Compo/EditElement.razor.cs | 92 +++---------------- WebWindowComplex/WebWindowComplex.csproj | 6 +- .../WebWindowConfigurator.csproj | 28 +++++- 7 files changed, 71 insertions(+), 91 deletions(-) diff --git a/WebWindowComplex/Compo/AreaSash.razor b/WebWindowComplex/Compo/AreaSash.razor index 362b136..0e2a80d 100644 --- a/WebWindowComplex/Compo/AreaSash.razor +++ b/WebWindowComplex/Compo/AreaSash.razor @@ -281,15 +281,15 @@
@foreach (var element in CurrSashDim.ElementDimensionList) { - @if (CurrSashDim.ElementDimensionList.Count <= 4) + if ((CurrSashDim.ElementDimensionList.Count == 5 && element.nIndex == 4) || + (CurrSashDim.ElementDimensionList.Count == 6 && + (element.nIndex == 4 || element.nIndex == 5))) { -
- -
+ continue; } else { -
+
} diff --git a/WebWindowComplex/Compo/AreaSash.razor.cs b/WebWindowComplex/Compo/AreaSash.razor.cs index 47d3669..13cbced 100644 --- a/WebWindowComplex/Compo/AreaSash.razor.cs +++ b/WebWindowComplex/Compo/AreaSash.razor.cs @@ -322,6 +322,13 @@ namespace WebWindowComplex.Compo if (updRec != null) { currRec = updRec; + if (CurrSashDim.ElementDimensionList.Count > 4 && updRec.nIndex == 3) + { + for (int i = 3; i <= CurrSashDim.ElementDimensionList.Count - 2; i++) + { + CurrSashDim.ElementDimensionList.ElementAt(i).SetDimension(currRec.dDimension); + } + } await EC_UpdateSashDim.InvokeAsync(CurrSashDim); } } diff --git a/WebWindowComplex/Compo/CardFrame.razor b/WebWindowComplex/Compo/CardFrame.razor index 99a9b79..5877529 100644 --- a/WebWindowComplex/Compo/CardFrame.razor +++ b/WebWindowComplex/Compo/CardFrame.razor @@ -150,17 +150,17 @@
@foreach (var element in CurrFrameWindow.ElementDimensionList) { - @if (CurrFrameWindow.ElementDimensionList.Count <= 4) + if ((CurrFrameWindow.ElementDimensionList.Count == 5 && element.nIndex == 4) || + (CurrFrameWindow.ElementDimensionList.Count == 6 && + (element.nIndex == 4 || element.nIndex == 5))) { -
- -
+ continue; } else { -
+
-
+
} }
diff --git a/WebWindowComplex/Compo/CardFrame.razor.cs b/WebWindowComplex/Compo/CardFrame.razor.cs index bc00e2c..20dce9f 100644 --- a/WebWindowComplex/Compo/CardFrame.razor.cs +++ b/WebWindowComplex/Compo/CardFrame.razor.cs @@ -351,6 +351,13 @@ namespace WebWindowComplex.Compo if (updRec != null) { currRec = updRec; + if (CurrFrameWindow.ElementDimensionList.Count > 4 && updRec.nIndex == 3) + { + for (int i = 3; i <= CurrFrameWindow.ElementDimensionList.Count - 2; i++) + { + CurrFrameWindow.ElementDimensionList.ElementAt(i).SetDimension(currRec.dDimension); + } + } var args = new DataUpdateFrame() { currFrame = CurrFrameWindow, diff --git a/WebWindowComplex/Compo/EditElement.razor.cs b/WebWindowComplex/Compo/EditElement.razor.cs index 761fe6a..7a49e84 100644 --- a/WebWindowComplex/Compo/EditElement.razor.cs +++ b/WebWindowComplex/Compo/EditElement.razor.cs @@ -48,91 +48,27 @@ namespace WebWindowComplex.Compo nElement = frame.ElementDimensionList.Count; else if(CurrRec.ParentArea is Sash sash) nElement = sash.SashList.FirstOrDefault()!.ElementDimensionList.Count; - switch (nElement) + switch (CurrRec.nIndex) { + case 1: + { + return "Bottom"; + } + case 2: + { + return "Right"; + } + case 3: + { + return "Top"; + } case 4: - { - switch (CurrRec.nIndex) - { - case 1: - { - return "Bottom"; - } - case 2: - { - return "Right"; - } - case 3: - { - return "Top"; - } - case 4: - { - return "Left"; - } - } - break; - } case 5: - { - switch (CurrRec.nIndex) - { - case 1: - { - return "Bottom"; - } - case 2: - { - return "Right"; - } - case 3: - { - return "TR"; - } - case 4: - { - return "TL"; - } - case 5: - { - return "Left"; - } - } - break; - } case 6: - { - switch (CurrRec.nIndex) { - case 1: - { - return "Bottom"; - } - case 2: - { - return "Right"; - } - case 3: - { - return "TR"; - } - case 4: - { - return "TT"; - } - case 5: - { - return "TL"; - } - case 6: - { - return "Left"; - } + return "Left"; } - break; - } } - } return ""; } diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj index ec8e004..c5a3770 100644 --- a/WebWindowComplex/WebWindowComplex.csproj +++ b/WebWindowComplex/WebWindowComplex.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 3.1.8.1212 + 3.1.8.1215 Annamaria Sassi Egalware Componente gestione Configurazioni avanzate Window per LUX @@ -145,6 +145,10 @@ + + + + diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj index 629bb67..ae62427 100644 --- a/WebWindowConfigurator/WebWindowConfigurator.csproj +++ b/WebWindowConfigurator/WebWindowConfigurator.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 3.1.8.1212 + 3.1.8.1215 Annamaria Sassi Egalware Componente gestione JWD per LUX @@ -429,6 +429,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + +