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

Aggiornato loading hw option

Browse Source
This commit is contained in:
Annamaria Sassi
2025-11-11 16:45:05 +01:00
parent cf7eccb3ba
commit 39a8634627
3 changed files with 59 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WebWindowComplex/Compo/AreaHwOption.razor
+37 -23
View File
@@ -9,32 +9,46 @@
</div>
</div>
<div class="row mt-2">
@if (!hwOptCollapsed)
{
@if (IsLoadingHwOpt)
{
<EgwCoreLib.Razor.LoadingData DisplaySize="EgwCoreLib.Razor.LoadingData.CtrlSize.Small"></EgwCoreLib.Razor.LoadingData>
<div class="col justify-content-start">
<p class="placeholder-glow">
<span class="placeholder col-12 bg-secondary placeholder-lg my-2"></span>
<span class="placeholder col-4 bg-secondary placeholder-lg my-2"></span>
<span class="placeholder col-6 bg-secondary placeholder-lg my-2"></span>
<span class="placeholder col-7 bg-secondary placeholder-lg my-2"></span>
<span class="placeholder col-6 bg-secondary placeholder-lg my-2"></span>
<span class="placeholder col-4 bg-secondary placeholder-lg my-2"></span>
<span class="placeholder col-8 bg-secondary placeholder-lg my-2"></span>
<span class="placeholder col-12 bg-secondary placeholder-lg my-2"></span>
</p>
</div>
}
<div class="scrollspy" tabindex="0"
style="position: relative; height: 15rem; overflow-y: auto;">
@foreach (var currOpt in CurrSash.HwOptionList)
{
switch (currOpt.Type)
else
{
<div class="scrollspy my-2" tabindex="0"
style="position: relative; height: 15rem; overflow-y: auto;">
@foreach (var currOpt in CurrSash.HwOptionList)
{
case HwOptionTypes.COMBO:
{
AGBOptionCombo currOptCombo = (AGBOptionCombo)currOpt;
<EditOptionCombo CurrOpt="currOptCombo" EC_Update="RaiseOptCombo"></EditOptionCombo>
break;
}
case HwOptionTypes.TEXT:
{
AGBOptionText currOptText = (AGBOptionText)currOpt;
<EditOptionText CurrOpt="currOptText" EC_Update="RaiseOptText"></EditOptionText>
break;
}
switch (currOpt.Type)
{
case HwOptionTypes.COMBO:
{
AGBOptionCombo currOptCombo = (AGBOptionCombo)currOpt;
<EditOptionCombo CurrOpt="currOptCombo" EC_Update="RaiseOptCombo"></EditOptionCombo>
break;
}
case HwOptionTypes.TEXT:
{
AGBOptionText currOptText = (AGBOptionText)currOpt;
<EditOptionText CurrOpt="currOptText" EC_Update="RaiseOptText"></EditOptionText>
break;
}
}
}
}
</div>
@* @if (!hwOptCollapsed)
{
} *@
</div>
}
}
</div>
WebWindowComplex/Compo/AreaHwOption.razor.cs
+10 -11
View File
@@ -34,23 +34,22 @@ namespace WebWindowComplex.Compo
[CascadingParameter(Name = "IsLoading")]
public List<string> IsLoading { get; set; } = new List<string>();
private bool hwOptCollapsed { get; set; } = true;
private bool hwOptCollapsed { get; set; } = false;
//protected override void OnAfterRender(bool firstRender)
//{
// if(firstRender)
// {
// hwOptCollapsed = true;
// }
//}
protected override void OnAfterRender(bool firstRender)
{
if (firstRender)
{
hwOptCollapsed = true;
}
}
private async Task changeCollapsed()
{
//hwOptCollapsed = !hwOptCollapsed;
hwOptCollapsed = !hwOptCollapsed;
if (CurrSash.HwOptionList.Count == 0)
{
//IsLoadingHwOpt = true;
await EC_FirstHwOptionList.InvokeAsync(CurrSash.GroupId);
}
}
WebWindowComplex/Models/Sash.cs
+12 -12
View File
@@ -328,7 +328,11 @@ namespace WebWindowComplex.Models
set
{
m_SelHardware = value;
ReqRefreshHwOption();
if (HwOptionList.Count != 0)
{
RefreshHardwareOptionList();
ReqRefreshHwOption();
}
}
}
@@ -341,12 +345,12 @@ namespace WebWindowComplex.Models
set
{
m_SelHardware = m_HardwareList.FirstOrDefault(x => !string.IsNullOrEmpty(value) && x.Id.Equals(value)) ?? new Hardware(CustomHwId, "", "", Enums.OpeningTypes.Null, "", 0, 0);
HwOptionList.Clear();
if (SelHardware.Id == CustomHwId)
{
HwOptionList.Clear();
SelHwOptionList.Clear();
}
//ReqRefreshHwOption();
ReqRefreshHwOption();
//ParentWindow.OnUpdatePreview(ParentWindow.sSerialized());
}
}
@@ -451,14 +455,6 @@ namespace WebWindowComplex.Models
)
.ToList() ?? new List<Hardware>();
m_HardwareList = new List<Hardware>(rawList);
//if (rawList != null && rawList.Count > 0)
//{
// m_HardwareList = new List<Hardware>(rawList);
//}
//else
//{
// m_HardwareList = new List<Hardware>();
//}
}
}
@@ -505,6 +501,11 @@ namespace WebWindowComplex.Models
RefreshHardwareList();
}
SetFirstHardware();
if (HwOptionList.Count != 0)
{
RefreshHardwareOptionList();
ReqRefreshHwOption();
}
}
/// <summary>
@@ -686,7 +687,6 @@ namespace WebWindowComplex.Models
if (m_HardwareList.Count > 0)
{
m_SelHardware = m_HardwareList.First();
//ReqRefreshHwOption();
}
}