Merge pull request #7 from Ali-YousefiTelori/develop

fix bug
EasyMicroservices · Dec 28, 2023 · c336ff4 · c336ff4
2 parents 245015b + 939420f
commit c336ff4
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/src/CSharp/Blazor/EasyMicroservices.UI.TemplateGenerator.Blazor.TestUI/Program.cs b/src/CSharp/Blazor/EasyMicroservices.UI.TemplateGenerator.Blazor.TestUI/Program.cs
@@ -16,10 +16,11 @@
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
 builder.RootComponents.Add<App>("#app");
 builder.RootComponents.Add<HeadOutlet>("head::after");
+string baseAddress = "http://localhost:1050";
 
 builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
-builder.Services.AddScoped(sp => new FormClient("http://localhost:1050", sp.GetService<HttpClient>()));
-builder.Services.AddScoped(sp => new NoParentFormItemClient("http://localhost:1050", sp.GetService<HttpClient>()));
+builder.Services.AddScoped(sp => new FormClient(baseAddress, sp.GetService<HttpClient>()));
+builder.Services.AddScoped(sp => new NoParentFormItemClient(baseAddress, sp.GetService<HttpClient>()));
 
 builder.Services.AddTransient<FilterFormsListViewModel>();
 builder.Services.AddTransient<AddOrUpdateFormViewModel>();

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.4</Version>
+    <Version>0.0.0.5</Version>
     <Description>TemplateGenerator UI compoents.</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>component,microcomponent,ui,core,templategenerator,generator,template,form,formgenerator</PackageTags>

diff --git a/...rp/Blazor/EasyMicroservices.UI.TemplateGenerator.Blazor/Pages/Forms/AddOrUpdateForm.razor b/...rp/Blazor/EasyMicroservices.UI.TemplateGenerator.Blazor/Pages/Forms/AddOrUpdateForm.razor
@@ -24,7 +24,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.4</Version>
+    <Version>0.0.0.5</Version>
     <Description>TemplateGenerator view model.</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>component,microcomponent,ui,core,templategenerator,generator,template,form,formgenerator</PackageTags>

diff --git a/...icroservices.UI.TemplateGenerator.ViewModels/ViewModels/Forms/AddOrUpdateFormViewModel.cs b/...icroservices.UI.TemplateGenerator.ViewModels/ViewModels/Forms/AddOrUpdateFormViewModel.cs
@@ -2,6 +2,7 @@
 using EasyMicroservices.UI.Cores;
 using EasyMicroservices.UI.Cores.Commands;
 using System.Collections.ObjectModel;
+using System.Text;
 using System.Windows.Input;
 using TemplateGenerators.GeneratedServices;
 
@@ -102,6 +103,13 @@ T GetCurrentProperty<T>(Func<FormContract, T> func)
             return UpdateFormContract == null ? default : func(UpdateFormContract);
         }
 
+        public string GetTitle(FormItemContract formItemContract)
+        {
+            if (formItemContract.Title.IsNullOrEmpty())
+                return formItemContract.PrimaryFormItem?.Title ?? GetLanguage("NoName!");
+            return formItemContract.Title;
+        }
+
         public async Task LoadConfig()
         {