Merge pull request #6 from Ali-YousefiTelori/develop

fix get title when its empty
EasyMicroservices · Dec 28, 2023 · 245015b · 245015b
2 parents 9ab8c7f + 21ec9a5
commit 245015b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/...services.UI.TemplateGenerator.Blazor/EasyMicroservices.UI.TemplateGenerator.Blazor.csproj b/...services.UI.TemplateGenerator.Blazor/EasyMicroservices.UI.TemplateGenerator.Blazor.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     <Authors>EasyMicroservices</Authors>
     <IsPackable>true</IsPackable>
-    <Version>0.0.0.3</Version>
+    <Version>0.0.0.4</Version>
     <Description>TemplateGenerator UI compoents.</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>component,microcomponent,ui,core,templategenerator,generator,template,form,formgenerator</PackageTags>

diff --git a/...r/EasyMicroservices.UI.TemplateGenerator.Blazor/Pages/FormItems/AddOrUpdateFormItem.razor b/...r/EasyMicroservices.UI.TemplateGenerator.Blazor/Pages/FormItems/AddOrUpdateFormItem.razor
@@ -38,7 +38,7 @@
             </ToolBarContent>
             <Columns>
                 <PropertyColumn Property="x => x.Index" Title="@viewModel.GetLanguage("Index")" />
-                <PropertyColumn Property="x => x.Title" Title="@viewModel.GetLanguage("Title")" />
+                <PropertyColumn Property="x => viewModel.GetTitle(x)" Title="@viewModel.GetLanguage("Title")" />
                 <PropertyColumn Property="x => x.Type" />
                 <TemplateColumn CellClass="d-flex justify-end">
                     <CellTemplate>

diff --git a/....UI.TemplateGenerator.ViewModels/EasyMicroservices.UI.TemplateGenerator.ViewModels.csproj b/....UI.TemplateGenerator.ViewModels/EasyMicroservices.UI.TemplateGenerator.ViewModels.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     <Authors>EasyMicroservices</Authors>
     <IsPackable>true</IsPackable>
-    <Version>0.0.0.3</Version>
+    <Version>0.0.0.4</Version>
     <Description>TemplateGenerator view model.</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>component,microcomponent,ui,core,templategenerator,generator,template,form,formgenerator</PackageTags>
@@ -21,6 +21,7 @@
   <ItemGroup>
     <PackageReference Include="EasyMicroservices.TemplateGeneratorMicroservice.Clients" Version="0.0.0.18" />
     <PackageReference Include="EasyMicroservices.UI.Cores.Mvvm" Version="0.0.0.13" />
+    <PackageReference Include="EasyMicroservices.Utilities" Version="0.0.0.13" />
   </ItemGroup>
 
 </Project>
diff --git a/...ices.UI.TemplateGenerator.ViewModels/ViewModels/FormItems/AddOrUpdateFormItemViewModel.cs b/...ices.UI.TemplateGenerator.ViewModels/ViewModels/FormItems/AddOrUpdateFormItemViewModel.cs
@@ -1,6 +1,7 @@
 using EasyMicroservices.UI.Cores;
 using EasyMicroservices.UI.Cores.Commands;
 using System.Collections.ObjectModel;
+using System.Text;
 using System.Text.Json;
 using System.Windows.Input;
 using TemplateGenerators.GeneratedServices;
@@ -112,6 +113,13 @@ public string DefaultValue
         }
     }
 
+    public string GetTitle(FormItemContract formItemContract)
+    {
+        if (formItemContract.Title.IsNullOrEmpty())
+            return formItemContract.PrimaryFormItem?.Title ?? GetLanguage("NoName!");
+        return formItemContract.Title;
+    }
+
     FormItemContract GetContract()
     {
         return new FormItemContract()