From a931a1bc17f7d0e561038dc3d13787efe33fd1da Mon Sep 17 00:00:00 2001 From: Henrique Clausing Date: Wed, 27 Sep 2023 08:59:32 -0300 Subject: [PATCH 1/4] UTILITIES: Added Clone() method for ApplicationTargets when creating a new ApplicationInstance, fixing Mdi Properties conflicts for same ApplicationDefinition instantiated on different Sections. --- .../Application/ApplicationManager.cs | 10 ++++----- .../Application/ApplicationTarget.cs | 21 ++++++++++++++++++- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/src/Core/EficazFramework.Utilities/Application/ApplicationManager.cs b/src/Core/EficazFramework.Utilities/Application/ApplicationManager.cs index a2d62e9d..952c3384 100644 --- a/src/Core/EficazFramework.Utilities/Application/ApplicationManager.cs +++ b/src/Core/EficazFramework.Utilities/Application/ApplicationManager.cs @@ -215,15 +215,15 @@ private void AddTargetProperties(IDictionary sourceTa { foreach (var sourceTarget in sourceTargets) { - Targets.Add(sourceTarget); + Targets.Add(sourceTarget.Key, sourceTarget.Value.Clone()); ; } } public void Close() - { - AppClosed?.Invoke(this, EventArgs.Empty); - Dispose(); - } + { + AppClosed?.Invoke(this, EventArgs.Empty); + Dispose(); + } public void Dispose() { diff --git a/src/Core/EficazFramework.Utilities/Application/ApplicationTarget.cs b/src/Core/EficazFramework.Utilities/Application/ApplicationTarget.cs index 7c3515ec..6b354f20 100644 --- a/src/Core/EficazFramework.Utilities/Application/ApplicationTarget.cs +++ b/src/Core/EficazFramework.Utilities/Application/ApplicationTarget.cs @@ -1,4 +1,5 @@ -using System; +using EficazFramework.Extensions; +using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Drawing; @@ -40,4 +41,22 @@ public abstract class ApplicationTarget /// public Dictionary Properties { get; } = new(); + + public ApplicationTarget Clone() + { + var target = Activator.CreateInstance(GetType()) as ApplicationTarget; + + target!.Icon = Icon; + target!.SplashScreen = SplashScreen; + target!.InitialSize = InitialSize; + target!.StartupUriOrType = StartupUriOrType; + + foreach (var item in Properties) + { + target.Properties.Add(item.Key, item.Value); + } + + return target; + } + } From 46847ba97dd35366c16d4111e02690c5b73a32b0 Mon Sep 17 00:00:00 2001 From: Henrique Clausing Date: Wed, 27 Sep 2023 09:00:42 -0300 Subject: [PATCH 2/4] BLAZOR: Better support for MdiWindow header override and move|resize behaviors. --- .../EficazFramework.Blazor/Components/Panels/MdiWindow.razor | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Web/EficazFramework.Blazor/Components/Panels/MdiWindow.razor b/src/Web/EficazFramework.Blazor/Components/Panels/MdiWindow.razor index 77d8747d..b13dc472 100644 --- a/src/Web/EficazFramework.Blazor/Components/Panels/MdiWindow.razor +++ b/src/Web/EficazFramework.Blazor/Components/Panels/MdiWindow.razor @@ -25,8 +25,7 @@ @onpointermove:preventDefault> @(ApplicationInstance != null ? ApplicationInstance.Title : Title) -
+
@HeaderContent
@@ -41,7 +40,7 @@ @onpointermove:preventDefault/> -
Date: Wed, 27 Sep 2023 09:07:54 -0300 Subject: [PATCH 3/4] =?UTF-8?q?BLAZOR:=20=C3=8Dcone=20SVG=20para=20Eficaz?= =?UTF-8?q?=20Social.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Panels/MdiApps/AnotherCoolApp.razor | 3 ++- .../Pages/Icons/Assets.razor | 20 +++++++++++++++++++ .../Resources/Mocks/Applications.cs | 1 + .../EficazFramework.Blazor/Icons/Products.cs | 10 ++++++++++ 4 files changed, 33 insertions(+), 1 deletion(-) diff --git a/src/Tests/Web/EficazFramework.Tests.Blazor.Views/Pages/Components/Panels/MdiApps/AnotherCoolApp.razor b/src/Tests/Web/EficazFramework.Tests.Blazor.Views/Pages/Components/Panels/MdiApps/AnotherCoolApp.razor index c82bdd9f..169e9e24 100644 --- a/src/Tests/Web/EficazFramework.Tests.Blazor.Views/Pages/Components/Panels/MdiApps/AnotherCoolApp.razor +++ b/src/Tests/Web/EficazFramework.Tests.Blazor.Views/Pages/Components/Panels/MdiApps/AnotherCoolApp.razor @@ -38,7 +38,8 @@ { return @
Hello World!
; + style="position: absolute; left:25%; right: 25%;background-color:red" + @onpointerdown:stopPropagation>Header Override
; } } \ No newline at end of file diff --git a/src/Tests/Web/EficazFramework.Tests.Blazor.Views/Pages/Icons/Assets.razor b/src/Tests/Web/EficazFramework.Tests.Blazor.Views/Pages/Icons/Assets.razor index 57005156..ce0b5c65 100644 --- a/src/Tests/Web/EficazFramework.Tests.Blazor.Views/Pages/Icons/Assets.razor +++ b/src/Tests/Web/EficazFramework.Tests.Blazor.Views/Pages/Icons/Assets.razor @@ -118,4 +118,24 @@
Rural (Alt)
+ + + + + + + +
Social (Filled)
+ + + + + + + + +
Social (Alt)
+ + + \ No newline at end of file diff --git a/src/Tests/Web/EficazFramework.Tests.Blazor.Views/Resources/Mocks/Applications.cs b/src/Tests/Web/EficazFramework.Tests.Blazor.Views/Resources/Mocks/Applications.cs index 85d9f01b..ff9d1ce4 100644 --- a/src/Tests/Web/EficazFramework.Tests.Blazor.Views/Resources/Mocks/Applications.cs +++ b/src/Tests/Web/EficazFramework.Tests.Blazor.Views/Resources/Mocks/Applications.cs @@ -143,6 +143,7 @@ public static void GenerateApps(EficazFramework.Application.IApplicationManager? applicationManager.AllApplications.Add(appHello); applicationManager.AllApplications.Add(appAnother); applicationManager.AllApplications.Add(appPerSection); + applicationManager.AllApplications.Add(appPerSection2); applicationManager.AllApplications.Add(appHello2); applicationManager.AllApplications.Add(appAnother2); applicationManager.AllApplications.Add(appEmptyIcon); diff --git a/src/Web/EficazFramework.Blazor/Icons/Products.cs b/src/Web/EficazFramework.Blazor/Icons/Products.cs index cdea3f68..4df43489 100644 --- a/src/Web/EficazFramework.Blazor/Icons/Products.cs +++ b/src/Web/EficazFramework.Blazor/Icons/Products.cs @@ -45,4 +45,14 @@ public class Products /// public static string EficazRuralAlt => ""; + /// + /// ViewBox Sugerido: 0 0 24 24 (padrão) + /// + public static string EficazSocial => "\r\n"; + + /// + /// ViewBox Sugerido: 0 0 24 24 (padrão) + /// + public static string EficazSocialAlt => "\r\n"; + } From 3f1f4c31ca352785125da8101645d2daff429d90 Mon Sep 17 00:00:00 2001 From: Henrique Clausing Date: Wed, 27 Sep 2023 09:08:00 -0300 Subject: [PATCH 4/4] RELEASE 6.1.7 --- .../EficazFramework.Collections.csproj | 6 +++--- src/Core/EficazFramework.Data/EficazFramework.Data.csproj | 6 +++--- .../EficazFramework.Expressions.csproj | 6 +++--- .../EficazFramework.Utilities.csproj | 6 +++--- .../EficazFramework.Data.InMemory.csproj | 6 +++--- .../EficazFramework.Data.MsSqlServer.csproj | 6 +++--- .../EficazFramework.Data.MySql.csproj | 6 +++--- .../EficazFramework.Data.SqlLite.csproj | 6 +++--- src/Desktop/EficazFramework.WPF/EficazFramework.WPF.csproj | 6 +++--- .../EficazFramework.Blazor/EficazFramework.Blazor.csproj | 6 +++--- 10 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/Core/EficazFramework.Collections/EficazFramework.Collections.csproj b/src/Core/EficazFramework.Collections/EficazFramework.Collections.csproj index b6caf2f7..0a082f14 100644 --- a/src/Core/EficazFramework.Collections/EficazFramework.Collections.csproj +++ b/src/Core/EficazFramework.Collections/EficazFramework.Collections.csproj @@ -2,9 +2,9 @@ net6.0;net7.0 - 6.1.6 - 6.1.6.0 - 6.1.6.0 + 6.1.7 + 6.1.7.0 + 6.1.7.0 EficazFramework true EfCore.snk diff --git a/src/Core/EficazFramework.Data/EficazFramework.Data.csproj b/src/Core/EficazFramework.Data/EficazFramework.Data.csproj index 0533f51c..1881ee7c 100644 --- a/src/Core/EficazFramework.Data/EficazFramework.Data.csproj +++ b/src/Core/EficazFramework.Data/EficazFramework.Data.csproj @@ -2,9 +2,9 @@ net6.0;net7.0 - 6.1.6 - 6.1.6.0 - 6.1.6.0 + 6.1.7 + 6.1.7.0 + 6.1.7.0 EficazFramework true EfCore.snk diff --git a/src/Core/EficazFramework.Expressions/EficazFramework.Expressions.csproj b/src/Core/EficazFramework.Expressions/EficazFramework.Expressions.csproj index 5839831b..1d61fbcf 100644 --- a/src/Core/EficazFramework.Expressions/EficazFramework.Expressions.csproj +++ b/src/Core/EficazFramework.Expressions/EficazFramework.Expressions.csproj @@ -2,9 +2,9 @@ net6.0;net7.0 - 6.1.6 - 6.1.6.0 - 6.1.6.0 + 6.1.7 + 6.1.7.0 + 6.1.7.0 EficazFramework true EfCore.snk diff --git a/src/Core/EficazFramework.Utilities/EficazFramework.Utilities.csproj b/src/Core/EficazFramework.Utilities/EficazFramework.Utilities.csproj index 53aba512..5e2af2bd 100644 --- a/src/Core/EficazFramework.Utilities/EficazFramework.Utilities.csproj +++ b/src/Core/EficazFramework.Utilities/EficazFramework.Utilities.csproj @@ -2,9 +2,9 @@ net6.0;net7.0 - 6.1.6 - 6.1.6.0 - 6.1.6.0 + 6.1.7 + 6.1.7.0 + 6.1.7.0 enable EficazFramework Eficaz Sistemas diff --git a/src/DataProviders/EficazFramework.Data.InMemory/EficazFramework.Data.InMemory.csproj b/src/DataProviders/EficazFramework.Data.InMemory/EficazFramework.Data.InMemory.csproj index c7af4514..944f3bf9 100644 --- a/src/DataProviders/EficazFramework.Data.InMemory/EficazFramework.Data.InMemory.csproj +++ b/src/DataProviders/EficazFramework.Data.InMemory/EficazFramework.Data.InMemory.csproj @@ -2,9 +2,9 @@ net6.0;net7.0 - 6.1.6 - 6.1.6.0 - 6.1.6.0 + 6.1.7 + 6.1.7.0 + 6.1.7.0 EficazFramework true EfCore.snk diff --git a/src/DataProviders/EficazFramework.Data.MsSqlServer/EficazFramework.Data.MsSqlServer.csproj b/src/DataProviders/EficazFramework.Data.MsSqlServer/EficazFramework.Data.MsSqlServer.csproj index 1229cb1a..d9911c1e 100644 --- a/src/DataProviders/EficazFramework.Data.MsSqlServer/EficazFramework.Data.MsSqlServer.csproj +++ b/src/DataProviders/EficazFramework.Data.MsSqlServer/EficazFramework.Data.MsSqlServer.csproj @@ -2,9 +2,9 @@ net6.0;net7.0 - 6.1.6 - 6.1.6.0 - 6.1.6.0 + 6.1.7 + 6.1.7.0 + 6.1.7.0 EficazFramework true EfCore.snk diff --git a/src/DataProviders/EficazFramework.Data.MySql/EficazFramework.Data.MySql.csproj b/src/DataProviders/EficazFramework.Data.MySql/EficazFramework.Data.MySql.csproj index 8e24ce27..18107d8b 100644 --- a/src/DataProviders/EficazFramework.Data.MySql/EficazFramework.Data.MySql.csproj +++ b/src/DataProviders/EficazFramework.Data.MySql/EficazFramework.Data.MySql.csproj @@ -2,9 +2,9 @@ net6.0;net7.0 - 6.1.6 - 6.1.6.0 - 6.1.6.0 + 6.1.7 + 6.1.7.0 + 6.1.7.0 EficazFramework true EfCore.snk diff --git a/src/DataProviders/EficazFramework.Data.SqlLite/EficazFramework.Data.SqlLite.csproj b/src/DataProviders/EficazFramework.Data.SqlLite/EficazFramework.Data.SqlLite.csproj index ff587bc9..4138bfc9 100644 --- a/src/DataProviders/EficazFramework.Data.SqlLite/EficazFramework.Data.SqlLite.csproj +++ b/src/DataProviders/EficazFramework.Data.SqlLite/EficazFramework.Data.SqlLite.csproj @@ -2,9 +2,9 @@ net6.0;net7.0 - 6.1.6 - 6.1.6.0 - 6.1.6.0 + 6.1.7 + 6.1.7.0 + 6.1.7.0 EficazFramework true EfCore.snk diff --git a/src/Desktop/EficazFramework.WPF/EficazFramework.WPF.csproj b/src/Desktop/EficazFramework.WPF/EficazFramework.WPF.csproj index 7cb9d350..9f5cad60 100644 --- a/src/Desktop/EficazFramework.WPF/EficazFramework.WPF.csproj +++ b/src/Desktop/EficazFramework.WPF/EficazFramework.WPF.csproj @@ -3,9 +3,9 @@ net6.0-windows;net7.0-windows true - 6.1.6 - 6.1.6.0 - 6.1.6.0 + 6.1.7 + 6.1.7.0 + 6.1.7.0 EficazFramework Eficaz Sistemas Eficaz Sistemas de Gestão e Inteligência Tributária diff --git a/src/Web/EficazFramework.Blazor/EficazFramework.Blazor.csproj b/src/Web/EficazFramework.Blazor/EficazFramework.Blazor.csproj index 9d87307b..90e811fc 100644 --- a/src/Web/EficazFramework.Blazor/EficazFramework.Blazor.csproj +++ b/src/Web/EficazFramework.Blazor/EficazFramework.Blazor.csproj @@ -5,9 +5,9 @@ enable enable true - 6.1.6 - 6.1.6.2 - 6.1.6.2 + 6.1.7 + 6.1.7.2 + 6.1.7.2 EficazFramework Eficaz Sistemas Eficaz Sistemas de Gestão e Inteligência Tributária