From 4e21a36fefb4a6c163bf1053bcd0446cafc20f0f Mon Sep 17 00:00:00 2001 From: Annamaria Sassi Date: Fri, 7 Nov 2025 10:36:56 +0100 Subject: [PATCH] Aggiornato AGBOptionText per testi non editabili --- WebWindowComplex/Compo/CardFrame.razor.cs | 2 +- WebWindowComplex/Compo/EditOptionText.razor | 21 +++++++++++++++------ WebWindowComplex/Models/AGBOptionText.cs | 13 ++++++++++--- 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/WebWindowComplex/Compo/CardFrame.razor.cs b/WebWindowComplex/Compo/CardFrame.razor.cs index 061ba36..be02a74 100644 --- a/WebWindowComplex/Compo/CardFrame.razor.cs +++ b/WebWindowComplex/Compo/CardFrame.razor.cs @@ -78,9 +78,9 @@ namespace WebWindowComplex.Compo { if (FrameWindow.SelShapeIndex != value) { + FrameWindow.SelShapeIndex = value; // richiesta reset dict shape _ = EC_ReqResetDictShape.InvokeAsync(true); - FrameWindow.SelShapeIndex = value; foreach(var s in SashList) { s.SelHardwareFromId = "000000"; diff --git a/WebWindowComplex/Compo/EditOptionText.razor b/WebWindowComplex/Compo/EditOptionText.razor index a26b8f6..1822cd9 100644 --- a/WebWindowComplex/Compo/EditOptionText.razor +++ b/WebWindowComplex/Compo/EditOptionText.razor @@ -1,9 +1,18 @@ 
- + @if (CurrOpt.ValueList.Count > 0) + { + + } + else + { + + }
\ No newline at end of file diff --git a/WebWindowComplex/Models/AGBOptionText.cs b/WebWindowComplex/Models/AGBOptionText.cs index d325dbb..fb6cbc5 100644 --- a/WebWindowComplex/Models/AGBOptionText.cs +++ b/WebWindowComplex/Models/AGBOptionText.cs @@ -50,9 +50,16 @@ namespace WebWindowComplex.Models public AGBOptionText(ParametriOpzioniParametri HdwOptionParam) : base(HdwOptionParam) { m_Type = HwOptionTypes.TEXT; - foreach (var Value in HdwOptionParam.Opzioni) - m_ValueList.Add(Value.Valore); - m_sValue = m_ValueList.FirstOrDefault(x => x == HdwOptionParam.ValoreCorrente) ?? ""; + if(HdwOptionParam.Opzioni != null) + { + foreach (var Value in HdwOptionParam.Opzioni) + m_ValueList.Add(Value.Valore); + m_sValue = m_ValueList.FirstOrDefault(x => x == HdwOptionParam.ValoreCorrente) ?? ""; + } + else + { + m_sValue = HdwOptionParam.ValoreCorrente; + } } #endregion Public Constructors