diff --git a/Directory.Packages.props b/Directory.Packages.props index 8dc4cd3..04cf0e7 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -9,8 +9,8 @@ all - - + + diff --git a/Test.UI/Components/Pages/EditJWD.razor.cs b/Test.UI/Components/Pages/EditJWD.razor.cs index 8e4ae25..feb8574 100644 --- a/Test.UI/Components/Pages/EditJWD.razor.cs +++ b/Test.UI/Components/Pages/EditJWD.razor.cs @@ -1,7 +1,16 @@ using Egw.Window.Data; using EgwCoreLib.Lux.Core; using EgwCoreLib.Lux.Core.RestPayload; +using EgwCoreLib.Lux.Data.DbModel.Catalog; +using EgwCoreLib.Lux.Data.DbModel.Config; +using EgwCoreLib.Lux.Data.DbModel.Sales; +using EgwCoreLib.Lux.Data.DbModel.Utils; +using EgwCoreLib.Lux.Data.Domains; using EgwCoreLib.Lux.Data.Services; +using EgwCoreLib.Lux.Data.Services.Config; +using EgwCoreLib.Lux.Data.Services.Items; +using EgwCoreLib.Lux.Data.Services.Sales; +using EgwCoreLib.Lux.Data.Services.Utils; using Microsoft.AspNetCore.Components; using Newtonsoft.Json; using WebWindowComplex; @@ -26,23 +35,6 @@ namespace Test.UI.Components.Pages #region Protected Fields - /// - /// Predisposizione valori live SVG/JWD - /// - protected LivePayload CurrData = new LivePayload(); - - protected List currElement = new List(); - - protected Dictionary currGroupShape = new Dictionary(); - - protected Dictionary currHwOption = new Dictionary(); - - protected string currJwd = "..."; - - protected Dictionary m_CurrArgs = new Dictionary(); - - protected string prevJwd = ""; - /// /// Configurazione selezionati /// @@ -64,60 +56,11 @@ namespace Test.UI.Components.Pages #region Protected Properties - protected List AvailColorMaterialList { get; set; } = new List() - { - new string("White"), - new string("Black"), - new string("Blu"), - new string("Wood") - }; - - protected List AvailFamilyHardwareList { get; set; } = new List() - { - new string("ArTech"), - new string("ArTechPlana") - }; - - protected List AvailGlassList { get; set; } = new List() - { - new string("Vetro BE 2S 4/12/4"), - new string("Vetro BE 2S 4/16/4"), - new string("Vetro BE 3S 4/12/4/12/4"), - new string("Vetro BE 3S 4/16/4/16/4"), - new string("Vetro BE 2S 4T/12/4T"), - new string("Vetro BE 2S 4T/16/4T") - }; - - protected List AvailHardwareList { get; set; } = new List(); - - protected List AvailMaterialList { get; set; } = new List() - { - new string("Pino"), - new string("Abete") - }; - - [Inject] - protected IConfiguration Config { get; set; } = null!; - - [Inject] - protected DataLayerServices DLService { get; set; } = null!; - - [Inject] - protected ImageCacheService ICService { get; set; } = null!; - protected MarkupString JsonSer { get => (MarkupString)currJwd.Replace(Environment.NewLine, "
").Replace(" ", " "); } - protected string SelColorMaterial { get; set; } = ""; - - protected string SelFamilyHardware { get; set; } = ""; - - protected string SelGlass { get; set; } = ""; - - protected string SelMaterial { get; set; } = ""; - #endregion Protected Properties #region Protected Methods @@ -134,6 +77,7 @@ namespace Test.UI.Components.Pages protected override async Task OnInitializedAsync() { ConfInit(); + await ReloadBaseList(); User = false; Random random = new Random(); CalcUid = Convert.ToString(random.Next(1000, 10000)); @@ -142,21 +86,14 @@ namespace Test.UI.Components.Pages //initialJwd = File.ReadAllText("Data\\AntaDoppia.jwd"); currJwd = initialJwd; // rileggo altri dati - await ReloadData(); - // costruisco lista profili - ProfilePayload pp1 = new ProfilePayload() + //await ReloadData(); + // converto i profili nel nuovo formato x payload... + var profList = AvailProfileList.Select(x => new ProfilePayload() { - ProfileName = "Profilo78", - ThresholdList = ThresholdProfilo78, - ParameterDict = ParamProfilo78 - }; - ProfilePayload pp2 = new ProfilePayload() - { - ProfileName = "ProfiloSaomad", - ThresholdList = ThresholdProfiloSaomad, - ParameterDict = ParamProfiloSaomad - }; - AvailProfileList = new List { pp1, pp2 }; + ProfileName = x.Code, + ThresholdList = x.ThresholdList, + ParameterDict = x.ProfileDataDict + }).ToList(); // preparo conf oggetti x controllo SetupList = new BaseListPayload() { @@ -165,7 +102,7 @@ namespace Test.UI.Components.Pages Glass = AvailGlassList, Hardware = AvailHardwareList, Material = AvailMaterialList, - ProfileList = AvailProfileList + ProfileList = profList }; CurrData = new LivePayload() { @@ -182,14 +119,80 @@ namespace Test.UI.Components.Pages #endregion Protected Methods + #region Private Properties + + [Inject] + private ConfigDataService CDService { get; set; } = default!; + + [Inject] + private IConfGlassService CGService { get; set; } = null!; + + [Inject] + private IConfProfileService CPService { get; set; } = null!; + + [Inject] + private IConfWoodService CWService { get; set; } = null!; + + [Inject] + private IGenValService GVService { get; set; } = default!; + + [Inject] + private IConfiguration Config { get; set; } = null!; + + [Inject] + private DataLayerServices DLService { get; set; } = null!; + + [Inject] + private ImageCacheService ICService { get; set; } = null!; + + private string SelColorMaterial { get; set; } = ""; + + private string SelFamilyHardware { get; set; } = ""; + + private string SelGlass { get; set; } = ""; + + private string SelMaterial { get; set; } = ""; + + #endregion Private Properties + #region Private Fields + private List AllConfGlass = new(); + private List AllColors = new(); + private List AllConfHardware = new(); + private List AllConfWood = new(); + private List AvailColorMaterialList = new List(); + private List AvailFamilyHardwareList = new List(); + private List AvailGlassList = new List(); + private List AvailHardwareList = new(); + private List AvailMaterialList = new List(); + private List AvailProfileList = new(); + + private EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS cEnvir = EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS.WINDOW; + + /// + /// Predisposizione valori live SVG/JWD + /// + private LivePayload CurrData = new LivePayload(); + + private List currElement = new List(); + + private Dictionary currGroupShape = new Dictionary(); + + private Dictionary currHwOption = new Dictionary(); + + private string currJwd = "..."; + + private Dictionary m_CurrArgs = new Dictionary(); + + private string prevJwd = ""; + private string apiUrl = ""; - /// - /// Lista profili da DB - /// - private List AvailProfileList = new List(); + ///// + ///// Lista profili da DB + ///// + //private List AvailProfileList = new List(); private string calcTag = ""; @@ -226,204 +229,13 @@ namespace Test.UI.Components.Pages //private Hardware hardwareMassUpdate; //private string materialMassUpdate; //private string profileMassUpdate; + private string outClose = ""; private string outSave = ""; - private Dictionary ParamProfilo78 = new Dictionary() - { - {"Frame_Fill_Rail_DimMax", 85}, - {"Frame_Fill_Rail_DimMin", 70}, - {"Frame_Fill_Rail_DimStd", 72}, - {"Frame_Fixed_Bottom_DimMax", 80}, - {"Frame_Fixed_Bottom_DimMin", 70}, - {"Frame_Fixed_Bottom_DimStd", 78}, - {"Frame_Fixed_Top_DimMax", 80}, - {"Frame_Fixed_Top_DimMin", 70}, - {"Frame_Fixed_Top_DimStd", 78}, - {"Frame_Frame_Split_DimMax", 85}, - {"Frame_Frame_Split_DimMin", 55}, - {"Frame_Frame_Split_DimStd", 60}, - {"Frame_Mixed_Bottom_DimMax", 80}, - {"Frame_Mixed_Bottom_DimMin", 70}, - {"Frame_Mixed_Bottom_DimStd", 78}, - {"Frame_Mixed_Split_DimMax", 110}, - {"Frame_Mixed_Split_DimMin", 70}, - {"Frame_Mixed_Split_DimStd", 90}, - {"Frame_Mixed_Top_DimMax", 80}, - {"Frame_Mixed_Top_DimMin", 70}, - {"Frame_Mixed_Top_DimStd", 78}, - {"Frame_Rail_Bottom_DimMax", 80}, - {"Frame_Rail_Bottom_DimMin", 70}, - {"Frame_Rail_Bottom_DimStd", 78}, - {"Frame_Rail_DimMax", 78}, - {"Frame_Rail_DimMin", 68}, - {"Frame_Rail_DimStd", 72}, - {"Frame_Sash_Bottom_DimMax", 80}, - {"Frame_Sash_Bottom_DimMin", 70}, - {"Frame_Sash_Bottom_DimStd", 78}, - {"Frame_Sash_Horizontal_DimMax", 110}, - {"Frame_Sash_Horizontal_DimMin", 75}, - {"Frame_Sash_Horizontal_DimStd", 95}, - {"Frame_Sash_Threshold_DimMax", 26}, - {"Frame_Sash_Threshold_DimMin", 24}, - {"Frame_Sash_Threshold_DimStd", 25}, - {"Frame_Sash_Top_DimMax", 80}, - {"Frame_Sash_Top_DimMin", 70}, - {"Frame_Sash_Top_DimStd", 78}, - {"Frame_Sash_Vertical_DimMax", 110}, - {"Frame_Sash_Vertical_DimMin", 85}, - {"Frame_Sash_Vertical_DimStd", 95}, - {"Frame_Slide_Bottom_DimMax", 60}, - {"Frame_Slide_Bottom_DimMin", 50}, - {"Frame_Slide_Bottom_DimStd", 55}, - {"Frame_Slide_Fixed_DimMax", 60}, - {"Frame_Slide_Fixed_DimMin", 50}, - {"Frame_Slide_Fixed_DimStd", 55}, - {"Frame_Slide_MovableBack_Bottom_DimMax", 60}, - {"Frame_Slide_MovableBack_Bottom_DimMin", 50}, - {"Frame_Slide_MovableBack_Bottom_DimStd", 55}, - {"Frame_Slide_MovableBack_Threshold_DimMax", 10}, - {"Frame_Slide_MovableBack_Threshold_DimMin", 3}, - {"Frame_Slide_MovableBack_Threshold_DimStd", 4}, - {"Frame_Slide_Movable_DimMax", 60}, - {"Frame_Slide_Movable_DimMin", 50}, - {"Frame_Slide_Movable_DimStd", 55}, - {"Frame_Slide_Threshold_DimMax", 10}, - {"Frame_Slide_Threshold_DimMin", 3}, - {"Frame_Slide_Threshold_DimStd", 4}, - {"Frame_Slide_Top_DimMax", 60}, - {"Frame_Slide_Top_DimMin", 50}, - {"Frame_Slide_Top_DimStd", 55}, - {"Sash_Fill_Rail_DimMax", 80}, - {"Sash_Fill_Rail_DimMin", 70}, - {"Sash_Fill_Rail_DimStd", 78}, - {"Sash_Frame_Bottom_DimMax", 80}, - {"Sash_Frame_Bottom_DimMin", 70}, - {"Sash_Frame_Bottom_DimStd", 78}, - {"Sash_Frame_Top_DimMax", 80}, - {"Sash_Frame_Top_DimMin", 70}, - {"Sash_Frame_Top_DimStd", 78}, - {"Sash_French_In_DimMax", 80}, - {"Sash_French_In_DimMin", 70}, - {"Sash_French_In_DimStd", 78}, - {"Sash_French_Out_DimMax", 80}, - {"Sash_French_Out_DimMin", 70}, - {"Sash_French_Out_DimStd", 78}, - {"Sash_Rail_Bottom_DimMax", 80}, - {"Sash_Rail_Bottom_DimMin", 70}, - {"Sash_Rail_Bottom_DimStd", 78}, - {"Sash_Rail_DimMax", 80}, - {"Sash_Rail_DimMin", 70}, - {"Sash_Rail_DimStd", 78}, - {"Sash_Sash_Active_DimMax", 80}, - {"Sash_Sash_Active_DimMin", 70}, - {"Sash_Sash_Active_DimStd", 78}, - {"Sash_Sash_Inactive_DimMax", 80}, - {"Sash_Sash_Inactive_DimMin", 70}, - {"Sash_Sash_Inactive_DimStd", 78}, - {"Sash_Sash_Split_DimMax", 70}, - {"Sash_Sash_Split_DimMin", 50}, - {"Sash_Sash_Split_DimStd", 60}, - {"Sash_Slide_Active_DimMax", 90}, - {"Sash_Slide_Active_DimMin", 70}, - {"Sash_Slide_Active_DimStd", 80}, - {"Sash_Slide_Active_In_DimMax", 90}, - {"Sash_Slide_Active_In_DimMin", 70}, - {"Sash_Slide_Active_In_DimStd", 80}, - {"Sash_Slide_Fixed_Bottom_DimMax", 150}, - {"Sash_Slide_Fixed_Bottom_DimMin", 120}, - {"Sash_Slide_Fixed_Bottom_DimStd", 135}, - {"Sash_Slide_Fixed_Side_DimMax", 90}, - {"Sash_Slide_Fixed_Side_DimMin", 70}, - {"Sash_Slide_Fixed_Side_DimStd", 80}, - {"Sash_Slide_Fixed_Top_DimMax", 90}, - {"Sash_Slide_Fixed_Top_DimMin", 70}, - {"Sash_Slide_Fixed_Top_DimStd", 80}, - {"Sash_Slide_Inactive_DimMax", 90}, - {"Sash_Slide_Inactive_DimMin", 70}, - {"Sash_Slide_Inactive_DimStd", 80}, - {"Sash_Slide_MovableBack_Bottom_DimMax", 150}, - {"Sash_Slide_MovableBack_Bottom_DimMin", 120}, - {"Sash_Slide_MovableBack_Bottom_DimStd", 135}, - {"Sash_Slide_MovableBack_Side_DimMax", 90}, - {"Sash_Slide_MovableBack_Side_DimMin", 70}, - {"Sash_Slide_MovableBack_Side_DimStd", 80}, - {"Sash_Slide_MovableBack_Top_DimMax", 90}, - {"Sash_Slide_MovableBack_Top_DimMin", 70}, - {"Sash_Slide_MovableBack_Top_DimStd", 80}, - {"Sash_Slide_Movable_Bottom_DimMax", 150}, - {"Sash_Slide_Movable_Bottom_DimMin", 120}, - {"Sash_Slide_Movable_Bottom_DimStd", 135}, - {"Sash_Slide_Movable_Side_DimMax", 90}, - {"Sash_Slide_Movable_Side_DimMin", 70}, - {"Sash_Slide_Movable_Side_DimStd", 80}, - {"Sash_Slide_Movable_Top_DimMax", 90}, - {"Sash_Slide_Movable_Top_DimMin", 70}, - {"Sash_Slide_Movable_Top_DimStd", 80}, - {"Frame_BottomRail_Overlap", 33.2}, - {"French_In_Overlap", 26}, - {"French_Out_Overlap", 26}, - {"Mixed_Bottom_Overlap", 26}, - {"Mixed_Split_Bottom_Overlap", 41}, - {"Mixed_Split_Top_Overlap", 41}, - {"Mixed_Top_Overlap", 41}, - {"NO_Mixed_Bottom_Overlap", 26}, - {"NO_Mixed_Split_Bottom_Overlap", 41}, - {"NO_Mixed_Split_Top_Overlap", 41}, - {"NO_Slide_MovableBack_Threshold_Overlap", 0}, - {"NO_Slide_Threshold_Overlap", 0}, - {"Sash_Active_Overlap", 26}, - {"Sash_Inactive_Overlap", 26}, - {"Sash_BottomRail_Overlap", 24.5}, - {"Sash_Bottom_Overlap", 26}, - {"Sash_Horizontal_Bottom_Overlap", 26}, - {"Sash_Horizontal_Top_Overlap", 41}, - {"Sash_Threshold_Overlap", 18}, - {"Sash_Top_Overlap", 41}, - {"Sash_Vertical_Overlap", 41}, - {"Slide_Active_Overlap", 80}, - {"Slide_Bottom_Overlap", 0}, - {"Slide_Fixed_Overlap", -5}, - {"Slide_MovableBack_Bottom_Overlap", 0}, - {"Slide_MovableBack_Threshold_Overlap", 0}, - {"Slide_Movable_Overlap", -5}, - {"Slide_Threshold_Overlap", 0}, - {"Slide_Top_Overlap", -12} - }; - - private Dictionary ParamProfiloSaomad = new Dictionary() - { - {"Frame_Frame_Split_DimMax", 85}, - {"Frame_Frame_Split_DimMin", 55}, - {"Frame_Frame_Split_DimStd", 60}, - {"Frame_Mixed_Bottom_DimMax", 80}, - {"Frame_Mixed_Bottom_DimMin", 70}, - {"Frame_Mixed_Bottom_DimStd", 78}, - {"Frame_Mixed_Split_DimMax", 110}, - {"Frame_Mixed_Split_DimMin", 70}, - {"Frame_Mixed_Split_DimStd", 90}, - {"Frame_Mixed_Top_DimMax", 80}, - {"Frame_Mixed_Top_DimMin", 70}, - {"Frame_Mixed_Top_DimStd", 78}, - {"Frame_Rail_Bottom_DimMax", 80} - }; - private bool startEmpty = true; - private List ThresholdProfilo78 = new List() - { - { new Threshold(3, "Bottom") }, - { new Threshold(1, "Threshold") } - }; - - private List ThresholdProfiloSaomad = new List() - { - { new Threshold(3, "Bottom") }, - { new Threshold(2, "BottomWaterdrip") }, - { new Threshold(1, "Threshold") } - }; - private string windowUid = "CurrWindow"; #endregion Private Fields @@ -450,6 +262,51 @@ namespace Test.UI.Components.Pages #region Private Methods + /// + /// Init classi configurazione + /// + /// + private async Task ReloadBaseList() + { + // lettura config setup varie da DB/Cache Redis + AllConfGlass = await CGService.GetAllAsync(); + AvailProfileList = await CPService.GetAllAsync(); + + // FixMe Todo: eliminare da REDIS e usare elenco DB solamente... + var rawProfiles = CDService.ProfileList(cEnvir, "Default"); + // se fosse vuoto chiamo update... + if (rawProfiles == null || rawProfiles.Count == 0) + { + rawProfiles = CDService.ProfileList(cEnvir, "Default"); + } + var rawHw = CDService.HwModelList(cEnvir, "HW.AGB"); + // hw filtro solo validi... + AllConfHardware = rawHw + .Where(x => !x.FamilyName.Equals(x.Description, StringComparison.OrdinalIgnoreCase)) + .ToList(); + AllConfWood = await CWService.GetAllAsync(); + AllColors = await GVService.GetFiltAsync("WoodCol"); + // conversione tipi + AvailGlassList = AllConfGlass + .Select(x => x.Description) + .ToList(); + AvailFamilyHardwareList = AllConfHardware + .DistinctBy(x => x.FamilyName) + .OrderBy(x => x.FamilyName) + .Select(x => x.FamilyName) + .ToList(); + AvailHardwareList = AllConfHardware + .Select(x => new Egw.Window.Data.Hardware(x.Id, x.FamilyName, x.Description, x.OpeningType, x.Shape, x.SashQty, x.SashPosition)) + .ToList(); + AvailMaterialList = AllConfWood + .Select(x => x.Description) + .ToList(); + AvailColorMaterialList = AllColors + .OrderBy(x => x.Index) + .Select(x => x.ValString) + .ToList(); + } + /// /// Effettua chiusura oggetto con eventuale save /// @@ -614,25 +471,6 @@ namespace Test.UI.Components.Pages await Task.Delay(1); } - /// - /// Rilettura dati - /// - /// - private Task ReloadData() - { - AvailHardwareList = new List(); - if (File.Exists(cFileHardware)) - { - string rawValHW = File.ReadAllText(cFileHardware); - var rawListHW = JsonConvert.DeserializeObject>(rawValHW) ?? new List(); - foreach (var item in rawListHW) - { - AvailHardwareList.Add(item); - } - } - return Task.Delay(100); - } - private void SetEdit(Microsoft.AspNetCore.Components.Web.MouseEventArgs args) { doEdit = true; diff --git a/Test.UI/Program.cs b/Test.UI/Program.cs index f7388cb..50b6016 100644 --- a/Test.UI/Program.cs +++ b/Test.UI/Program.cs @@ -1,4 +1,6 @@ +using EgwCoreLib.Lux.Data; using EgwCoreLib.Lux.Data.Services; +using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using NLog; using NLog.Web; @@ -26,6 +28,20 @@ builder.Services.AddRazorComponents() // costruzione connectionMultiplexer redis... string connStr = configuration.GetConnectionString("Redis") ?? "localhost"; ConnectionMultiplexer redisConn = ConnectionMultiplexer.Connect(connStr); +// registrazione in blocco servizi con metodo extension custom +var connectionString = builder.Configuration.GetConnectionString("Lux.All") ?? throw new InvalidOperationException("Connection string 'DefaultConnection' not found."); +builder.Services.AddDbContextFactory(options => +{ + var conn = builder.Configuration.GetConnectionString("Lux.All"); + options.UseMySql(conn, ServerVersion.AutoDetect(conn), mySqlOptions => + { + mySqlOptions.EnableStringComparisonTranslations(); + }) + .EnableSensitiveDataLogging(false) + .EnableDetailedErrors(false) + .LogTo(_ => { }); // disabilita EF logging; +}); +builder.Services.AddLuxData(connectionString); // registro connMultiplexer REDIS builder.Services.AddSingleton(redisConn); // registro wrapper servizi REDIS @@ -34,7 +50,7 @@ builder.Services.AddSingleton(); // Aggiunta servizi specifici builder.Services.AddSingleton(); builder.Services.AddSingleton(); - +builder.Services.AddSingleton(); var app = builder.Build(); diff --git a/WebWindowComplex/Compo/CardSplit.razor.cs b/WebWindowComplex/Compo/CardSplit.razor.cs index 9b0b1cc..7df3a77 100644 --- a/WebWindowComplex/Compo/CardSplit.razor.cs +++ b/WebWindowComplex/Compo/CardSplit.razor.cs @@ -123,11 +123,14 @@ namespace WebWindowComplex.Compo currSplit = CurrSplit }; _ = EC_ReqResetDict.InvokeAsync(new DataUpdateRes { req = LayoutConst.DataAction.ResetDimElem }); - // Se la shape selezionata è grid o custom, richiede reset shape - if (value > 2) - _ = EC_ReqResetDict.InvokeAsync(new DataUpdateRes { req = DataAction.ResetDictShape }); - if (SearchSash(CurrSplit)) - _ = EC_ReqResetDict.InvokeAsync(new DataUpdateRes { req = DataAction.ResetHwOpt }); + if(!(CurrSplit.ParentArea.ParentArea is Sash)) + { + // Se la shape selezionata è grid o custom, richiede reset shape + if (value == (int)SplitShapes.GRID || value == (int)SplitShapes.CUSTOM) + _ = EC_ReqResetDict.InvokeAsync(new DataUpdateRes { req = DataAction.ResetDictShape }); + if (SearchSash(CurrSplit)) + _ = EC_ReqResetDict.InvokeAsync(new DataUpdateRes { req = DataAction.ResetHwOpt }); + } _ = EC_ReqElement.InvokeAsync(CurrSplit); _ = EC_UpdateSplit.InvokeAsync(args); } diff --git a/WebWindowComplex/Compo/CardTree.razor.cs b/WebWindowComplex/Compo/CardTree.razor.cs index e6bd09c..2ef9437 100644 --- a/WebWindowComplex/Compo/CardTree.razor.cs +++ b/WebWindowComplex/Compo/CardTree.razor.cs @@ -169,6 +169,7 @@ namespace WebWindowComplex.Compo { FrameWindow.AddFirstSash(); await EC_ReqResetDict.InvokeAsync(new DataUpdateRes { req = LayoutConst.DataAction.ResetDimElem }); + await EC_ReqResetDict.InvokeAsync(new DataUpdateRes { req = LayoutConst.DataAction.ResetDictShape }); var args = new DataUpdateFrame() { currFrame = FrameWindow, diff --git a/WebWindowComplex/TableComp.razor.cs b/WebWindowComplex/TableComp.razor.cs index bb67bc9..404919a 100644 --- a/WebWindowComplex/TableComp.razor.cs +++ b/WebWindowComplex/TableComp.razor.cs @@ -1468,21 +1468,6 @@ namespace WebWindowComplex for (int elem = 2; elem <= elemList.Count - 2; elem++) elemList.ElementAt(elem).SetOverlapElement(Window.m_ParameterList.GetValueOrDefault(overlapNameTop + "_Overlap")); elemList.Last().SetOverlapElement(Window.m_ParameterList.GetValueOrDefault(overlapNameSx + "_Overlap")); - //bool recalcDim = false; - //for(int i = 0; i < elemList.Count; i++) - //{ - // if (!elemList.ElementAt(i).Equals(elemOld.ElementAt(i))) - // recalcDim = true; - //} - //if (recalcDim) - //{ - // Frame frame = sash.ParentWindow.AreaList.First(); - // if (frame != null) - // { - // frame.SearchAreaList(frame, frame.AvailWidthArea(), "Width"); - // frame.SearchAreaList(frame, frame.AvailHeightArea(), "Height"); - // } - //} } /// diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj index 0a17b20..1207e28 100644 --- a/WebWindowComplex/WebWindowComplex.csproj +++ b/WebWindowComplex/WebWindowComplex.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 3.1.3.2016 + 3.1.3.2411 Annamaria Sassi Egalware Componente gestione Configurazioni avanzate Window per LUX @@ -54,6 +54,24 @@ + + + + + + + + + + + + + + + + + + diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj index 7d810dc..162ac28 100644 --- a/WebWindowConfigurator/WebWindowConfigurator.csproj +++ b/WebWindowConfigurator/WebWindowConfigurator.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 3.1.3.2016 + 3.1.3.2411 Annamaria Sassi Egalware Componente gestione JWD per LUX @@ -56,6 +56,28 @@ + + + + + + + + + + + + + + + + + + + + + +