Merge pull request #75 from Eficaz-Sistemas/master

Release v6.1.7
Eficaz-Sistemas · Sep 27, 2023 · b132938 · b132938
2 parents a541f00 + 3f1f4c3
commit b132938
Show file tree

Hide file tree

Showing 17 changed files with 90 additions and 40 deletions.
diff --git a/src/Core/EficazFramework.Collections/EficazFramework.Collections.csproj b/src/Core/EficazFramework.Collections/EficazFramework.Collections.csproj
@@ -2,9 +2,9 @@
 
   <PropertyGroup>
 	  <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
-	  <Version>6.1.6</Version>
-	  <AssemblyVersion>6.1.6.0</AssemblyVersion>
-	  <FileVersion>6.1.6.0</FileVersion>
+	  <Version>6.1.7</Version>
+	  <AssemblyVersion>6.1.7.0</AssemblyVersion>
+	  <FileVersion>6.1.7.0</FileVersion>
 	  <RootNamespace>EficazFramework</RootNamespace>
 	  <SignAssembly>true</SignAssembly>
 	  <AssemblyOriginatorKeyFile>EfCore.snk</AssemblyOriginatorKeyFile>

diff --git a/src/Core/EficazFramework.Data/EficazFramework.Data.csproj b/src/Core/EficazFramework.Data/EficazFramework.Data.csproj
@@ -2,9 +2,9 @@
   <!--in Memory of Laudo Ferreira da Silva and Francisco Luis de Sousa † 2020-->
   <PropertyGroup>
     <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
-	<Version>6.1.6</Version>
-	<AssemblyVersion>6.1.6.0</AssemblyVersion>
-	<FileVersion>6.1.6.0</FileVersion>
+	<Version>6.1.7</Version>
+	<AssemblyVersion>6.1.7.0</AssemblyVersion>
+	<FileVersion>6.1.7.0</FileVersion>
     <RootNamespace>EficazFramework</RootNamespace>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>EfCore.snk</AssemblyOriginatorKeyFile>

diff --git a/src/Core/EficazFramework.Expressions/EficazFramework.Expressions.csproj b/src/Core/EficazFramework.Expressions/EficazFramework.Expressions.csproj
@@ -2,9 +2,9 @@
 
   <PropertyGroup>
 	  <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
-	  <Version>6.1.6</Version>
-	  <AssemblyVersion>6.1.6.0</AssemblyVersion>
-	  <FileVersion>6.1.6.0</FileVersion>
+	  <Version>6.1.7</Version>
+	  <AssemblyVersion>6.1.7.0</AssemblyVersion>
+	  <FileVersion>6.1.7.0</FileVersion>
 	  <RootNamespace>EficazFramework</RootNamespace>
 	  <SignAssembly>true</SignAssembly>
 	  <AssemblyOriginatorKeyFile>EfCore.snk</AssemblyOriginatorKeyFile>

diff --git a/src/Core/EficazFramework.Utilities/Application/ApplicationManager.cs b/src/Core/EficazFramework.Utilities/Application/ApplicationManager.cs
@@ -215,15 +215,15 @@ private void AddTargetProperties(IDictionary<string, ApplicationTarget> 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
@@ -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
     /// </summary>
     public Dictionary<string, object> 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;
+    }
+
 }
diff --git a/src/Core/EficazFramework.Utilities/EficazFramework.Utilities.csproj b/src/Core/EficazFramework.Utilities/EficazFramework.Utilities.csproj
@@ -2,9 +2,9 @@
   <!--in Memory of Laudo Ferreira da Silva and Francisco Luis de Sousa † 2020-->
   <PropertyGroup>
 	<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
-	<Version>6.1.6</Version>
-	<AssemblyVersion>6.1.6.0</AssemblyVersion>
-	<FileVersion>6.1.6.0</FileVersion>
+	<Version>6.1.7</Version>
+	<AssemblyVersion>6.1.7.0</AssemblyVersion>
+	<FileVersion>6.1.7.0</FileVersion>
 	<Nullable>enable</Nullable>
 	<RootNamespace>EficazFramework</RootNamespace>
     <Authors>Eficaz Sistemas</Authors>

diff --git a/src/DataProviders/EficazFramework.Data.InMemory/EficazFramework.Data.InMemory.csproj b/src/DataProviders/EficazFramework.Data.InMemory/EficazFramework.Data.InMemory.csproj
@@ -2,9 +2,9 @@
 
   <PropertyGroup>
 	  <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
-	  <Version>6.1.6</Version>
-	  <AssemblyVersion>6.1.6.0</AssemblyVersion>
-	  <FileVersion>6.1.6.0</FileVersion>
+	  <Version>6.1.7</Version>
+	  <AssemblyVersion>6.1.7.0</AssemblyVersion>
+	  <FileVersion>6.1.7.0</FileVersion>
 	  <RootNamespace>EficazFramework</RootNamespace>
 	  <SignAssembly>true</SignAssembly>
 	  <AssemblyOriginatorKeyFile>EfCore.snk</AssemblyOriginatorKeyFile>

diff --git a/src/DataProviders/EficazFramework.Data.MsSqlServer/EficazFramework.Data.MsSqlServer.csproj b/src/DataProviders/EficazFramework.Data.MsSqlServer/EficazFramework.Data.MsSqlServer.csproj
@@ -2,9 +2,9 @@
 
   <PropertyGroup>
 	<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
-	<Version>6.1.6</Version>
-	<AssemblyVersion>6.1.6.0</AssemblyVersion>
-	<FileVersion>6.1.6.0</FileVersion>
+	<Version>6.1.7</Version>
+	<AssemblyVersion>6.1.7.0</AssemblyVersion>
+	<FileVersion>6.1.7.0</FileVersion>
 	<RootNamespace>EficazFramework</RootNamespace>
 	<SignAssembly>true</SignAssembly>
 	<AssemblyOriginatorKeyFile>EfCore.snk</AssemblyOriginatorKeyFile>

diff --git a/src/DataProviders/EficazFramework.Data.MySql/EficazFramework.Data.MySql.csproj b/src/DataProviders/EficazFramework.Data.MySql/EficazFramework.Data.MySql.csproj
@@ -2,9 +2,9 @@
 
   <PropertyGroup>
 	  <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
-	  <Version>6.1.6</Version>
-	  <AssemblyVersion>6.1.6.0</AssemblyVersion>
-	  <FileVersion>6.1.6.0</FileVersion>
+	  <Version>6.1.7</Version>
+	  <AssemblyVersion>6.1.7.0</AssemblyVersion>
+	  <FileVersion>6.1.7.0</FileVersion>
 	  <RootNamespace>EficazFramework</RootNamespace>
 	  <SignAssembly>true</SignAssembly>
 	  <AssemblyOriginatorKeyFile>EfCore.snk</AssemblyOriginatorKeyFile>

diff --git a/src/DataProviders/EficazFramework.Data.SqlLite/EficazFramework.Data.SqlLite.csproj b/src/DataProviders/EficazFramework.Data.SqlLite/EficazFramework.Data.SqlLite.csproj
@@ -2,9 +2,9 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
-		<Version>6.1.6</Version>
-		<AssemblyVersion>6.1.6.0</AssemblyVersion>
-		<FileVersion>6.1.6.0</FileVersion>
+		<Version>6.1.7</Version>
+		<AssemblyVersion>6.1.7.0</AssemblyVersion>
+		<FileVersion>6.1.7.0</FileVersion>
 		<RootNamespace>EficazFramework</RootNamespace>
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>EfCore.snk</AssemblyOriginatorKeyFile>

diff --git a/src/Desktop/EficazFramework.WPF/EficazFramework.WPF.csproj b/src/Desktop/EficazFramework.WPF/EficazFramework.WPF.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFrameworks>net6.0-windows;net7.0-windows</TargetFrameworks>
     <UseWPF>true</UseWPF>
-	<Version>6.1.6</Version>
-	<AssemblyVersion>6.1.6.0</AssemblyVersion>
-	<FileVersion>6.1.6.0</FileVersion>
+	<Version>6.1.7</Version>
+	<AssemblyVersion>6.1.7.0</AssemblyVersion>
+	<FileVersion>6.1.7.0</FileVersion>
     <RootNamespace>EficazFramework</RootNamespace>
     <Authors>Eficaz Sistemas</Authors>
     <Company>Eficaz Sistemas de Gestão e Inteligência Tributária</Company>

diff --git a/...b/EficazFramework.Tests.Blazor.Views/Pages/Components/Panels/MdiApps/AnotherCoolApp.razor b/...b/EficazFramework.Tests.Blazor.Views/Pages/Components/Panels/MdiApps/AnotherCoolApp.razor
@@ -38,7 +38,8 @@
     {
         return 
     @<div class="text-center flex-grow-1 mt-1 mud-typography mud-typography-caption"
-                     style="position: absolute; left:25%; right: 25%">Hello World!</div>;
+          style="position: absolute; left:25%; right: 25%;background-color:red"
+          @onpointerdown:stopPropagation>Header Override</div>;
     }
 
 }
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
@@ -118,4 +118,24 @@
             <h6 class="mud-typography mud-typography-subtitle2 mud-inherit-text mt-1" style="font-weight: 600">Rural (Alt)</h6>
         </MudPaper>
     </MudItem>
+
+
+     <MudItem>
+         <MudPaper Outlined Class="pa-2 d-flex flex-column">
+             <MudPaper Elevation="0" Class="justify-center align-center relative" Style="background-color: var(--mud-palette-background-grey)">
+                 <MudIcon Icon="@EficazFramework.Icons.Products.EficazSocial" Class="ma-4" Style="width: auto; height: 96px" />
+             </MudPaper>
+             <h6 class="mud-typography mud-typography-subtitle2 mud-inherit-text mt-1" style="font-weight: 600">Social (Filled)</h6>
+         </MudPaper>
+     </MudItem>
+
+     <MudItem>
+         <MudPaper Outlined Class="pa-2 d-flex flex-column">
+             <MudPaper Elevation="0" Class="justify-center align-center relative" Style="background-color: var(--mud-palette-background-grey)">
+                 <MudIcon Icon="@EficazFramework.Icons.Products.EficazSocialAlt" Class="ma-4" Style="width: auto; height: 96px" />
+             </MudPaper>
+             <h6 class="mud-typography mud-typography-subtitle2 mud-inherit-text mt-1" style="font-weight: 600">Social (Alt)</h6>
+         </MudPaper>
+     </MudItem>
+
 </MudGrid>
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
@@ -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/Components/Panels/MdiWindow.razor b/src/Web/EficazFramework.Blazor/Components/Panels/MdiWindow.razor
@@ -25,8 +25,7 @@
                                    @onpointermove:preventDefault>
                     @(ApplicationInstance != null ? ApplicationInstance.Title : Title)
                 </MudBlazor.MudText>
-                <div class="d-flex flex-row flex-grow-1"
-                     @onpointermove:preventDefault>
+                <div class="d-flex flex-row flex-grow-1">
                     @HeaderContent
                 </div>
             </div>
@@ -41,7 +40,7 @@
                                      @onpointermove:preventDefault/>
         </div>
         <!--CONTENT-->
-         <div class="ef-mdi-window-host d-flex flex-grow-1 "
+         <div class="ef-mdi-window-host d-flex flex-grow-1"
               style="cursor:default"
               @onpointerdown:stopPropagation>
             <FocusTrapEx Class="@HostClassname" 

diff --git a/src/Web/EficazFramework.Blazor/EficazFramework.Blazor.csproj b/src/Web/EficazFramework.Blazor/EficazFramework.Blazor.csproj
@@ -5,9 +5,9 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
-	<Version>6.1.6</Version>
-	<AssemblyVersion>6.1.6.2</AssemblyVersion>
-	<FileVersion>6.1.6.2</FileVersion>
+	<Version>6.1.7</Version>
+	<AssemblyVersion>6.1.7.2</AssemblyVersion>
+	<FileVersion>6.1.7.2</FileVersion>
 	<RootNamespace>EficazFramework</RootNamespace>
 	<Authors>Eficaz Sistemas</Authors>
 	<Company>Eficaz Sistemas de Gestão e Inteligência Tributária</Company>

diff --git a/src/Web/EficazFramework.Blazor/Icons/Products.cs b/src/Web/EficazFramework.Blazor/Icons/Products.cs
@@ -45,4 +45,14 @@ public class Products
     /// </summary>
     public static string EficazRuralAlt => "<path d=\"M24 3.398h-13.72l-10.28 17.161h6.839l6.796-11.269h10.366z\"></path>";
 
+    /// <summary>
+    /// ViewBox Sugerido: 0 0 24 24 (padrão)
+    /// </summary>
+    public static string EficazSocial => "<path d=\"M18.327 0h-12.655c-3.142 0-5.673 2.531-5.673 5.673v12.655c0 3.142 2.531 5.673 5.673 5.673h12.655c3.142 0 5.673-2.553 5.673-5.673v-12.655c0-3.142-2.553-5.673-5.673-5.673zM16.364 16.364l-5.804 3.469v-3.469l2.902-1.746-5.826-3.491v-3.491l5.804-3.469v3.469l-2.902 1.746 5.825 3.491v3.491z\"></path>\r\n</symbol>";
+
+    /// <summary>
+    /// ViewBox Sugerido: 0 0 24 24 (padrão)
+    /// </summary>
+    public static string EficazSocialAlt => "<path d=\"M14.206 5.315v-5.315l-8.891 5.315v5.348l8.925 5.348-4.446 2.674v5.315l8.891-5.315v-5.348l-8.925-5.348z\"></path>\r\n</symbol>";
+
 }