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

Aggiornati controlli per chiamate

Browse Source
This commit is contained in:
Annamaria Sassi
2026-03-20 17:12:07 +01:00
parent f0e9ef706a
commit 83a1c62d26
6 changed files with 49 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WebWindowComplex/TableComp.razor.cs
+33 -18
View File
@@ -28,9 +28,14 @@ namespace WebWindowComplex
ReqHwOpt,
/// <summary>
/// Richiesta svg
/// Richiesta svg senza hw
/// </summary>
ReqSvg,
ReqSvgNoHw,
/// <summary>
/// Richiesta svg con hw
/// </summary>
ReqSvgWithHw,
/// <summary>
/// Richiesta shape sash group
@@ -121,11 +126,12 @@ namespace WebWindowComplex
protected override async Task OnAfterRenderAsync(bool firstRender)
{
if (forceSvgUpdate)
if (forceSvgUpdate && prevReq != (int)DataReq.ReqSvgNoHw && prevReq != (int)DataReq.ReqElement)
{
firstDisplay = false;
forceSvgUpdate = false;
// preview SVG senza HW
if(prevReq != (int)DataReq.ReqSvgWithHw)
await DoPreviewSvg(true, true);
if (LiveData.ProfElementList.Count == 0)
await UpdateElement(FrameWindow);
@@ -163,10 +169,12 @@ namespace WebWindowComplex
// controllo elenchi BasePayload siano validi...
if (ListPayload.IsValid())
{
bool calculateSvg = false;
// SOLO SE modificato live data...
if (prevLiveData == null || !prevLiveData.Equals(LiveData))
{
bool needDeser = prevLiveData == null || !prevLiveData.JwdEqual(LiveData);
calculateSvg = prevLiveData == null || !prevLiveData.DictShape.Equals(LiveData.DictShape);
updRequested = true;
prevLiveData = new LivePayload()
{
@@ -205,7 +213,7 @@ namespace WebWindowComplex
Log.Error($"Errore nel deserializzare jwd: {ex.Message}");
// costruisco una finestra base
WindowFromJson = BuildWindowDefault();
await DoPreviewSvg(true);
await DoPreviewSvg(false);
}
}
else
@@ -222,9 +230,10 @@ namespace WebWindowComplex
if (updRequested)
{
// se mancasse dizionario forme chiamo quello
if (LiveData.DictShape.Count == 0 && listErrLink.Count == 0)
if (LiveData.DictShape.Count == 0 && listErrLink.Count == 0 && !waitShape)
{
if (firstDisplay && isRendered)
waitShape = true;
if (firstDisplay && isRendered && prevReq!=(int)DataReq.ReqSvgNoHw)
{
firstDisplay = false;
// preview SVG senza HW
@@ -242,16 +251,14 @@ namespace WebWindowComplex
await DoReqShape(reqList);
}
}
else if (LiveData.DictShape.Count > 0 && calculateSvg)
{
await DoPreviewSvg();
}
else
{
// chiedo SVG
if (prevReq != (int)DataReq.ReqSvg || !prevLiveData.JwdEqual(LiveData.CurrJwd))
{
if (prevReq != (int)DataReq.ReqHwOpt)
await DoPreviewSvg(true);
else if (LiveData.DictOptionsXml.Count > 0)
await DoPreviewSvg(true);
}
if(prevReq != (int)DataReq.ReqSvgWithHw && SashGroupList.Count > 0)
await DoPreviewSvg();
}
}
}
@@ -274,6 +281,8 @@ namespace WebWindowComplex
#region Private Fields
private bool waitShape = false;
private static Logger Log = LogManager.GetCurrentClassLogger();
private int currAntaIndex = 0;
@@ -881,11 +890,12 @@ namespace WebWindowComplex
var CalcJwd = JsonConvert.SerializeObject(m_CurrWindow.Serialize(hideHw));
#endif
// verifico variazione JWD
if (!prevJwd.Equals(CurrJwd) || doForce || prevReq != (int)DataReq.ReqSvg)
if (!prevJwd.Equals(CurrJwd) || doForce || (prevReq != (int)DataReq.ReqSvgWithHw && prevReq != (int)DataReq.ReqSvgNoHw))
{
Log.Info("Richiesta svg");
string stringLog = "Richiesta svg " + (hideHw ? "senza" : "con") + " hw";
Log.Info(stringLog);
prevJwd = CurrJwd;
prevReq = (int)DataReq.ReqSvg;
prevReq = hideHw ? (int)DataReq.ReqSvgNoHw : (int)DataReq.ReqSvgWithHw;
Dictionary<string, string> Args = new Dictionary<string, string>();
Args.Add("Mode", $"{(int)Enums.QuestionModes.PREVIEW}");
Args.Add("SerializedData", CalcJwd);
@@ -1533,6 +1543,7 @@ namespace WebWindowComplex
// se ho i dizionari delle forme le aggiungo
if (LiveData.DictShape.Count > 0)
{
waitShape = false;
// Inserisco le forme ricevuto nei sash group
foreach (var item in LiveData.DictShape)
{
@@ -1772,6 +1783,10 @@ namespace WebWindowComplex
RowCollapsed.Remove(args.groupIdDelete);
if (newFrame != null)
{
// richiedo update shape
List<int> reqList = SashGroupList.Select(x => x.GroupId).ToList();
if (args.reqShape)
await DoReqShape(reqList);
// cerco il record
var currRec = m_CurrWindow?.AreaList.FirstOrDefault(x => x.GroupId == newFrame.GroupId);
// lo aggiorno
@@ -1869,7 +1884,7 @@ namespace WebWindowComplex
UpdateLists();
// richiedo update shape
List<int> reqList = SashGroupList.Select(x => x.GroupId).ToList();
await DoPreviewSvg();
//await DoPreviewSvg();
await UpdateElement(FrameWindow);
await DoReqShape(reqList);
}