Merge pull request #32 from Ali-YousefiTelori/develop

Support for FormItemEvent edit
EasyMicroservices · Jan 17, 2024 · 75d683d · 75d683d
2 parents 6ed8a52 + cb87ff4
commit 75d683d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 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;net8.0</TargetFrameworks>
     <Authors>EasyMicroservices</Authors>
     <IsPackable>true</IsPackable>
-    <Version>0.0.0.27</Version>
+    <Version>0.0.0.28</Version>
     <Description>TemplateGenerator UI compoents.</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>component,microcomponent,ui,core,templategenerator,generator,template,form,formgenerator</PackageTags>

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;net8.0</TargetFrameworks>
     <Authors>EasyMicroservices</Authors>
     <IsPackable>true</IsPackable>
-    <Version>0.0.0.27</Version>
+    <Version>0.0.0.28</Version>
     <Description>TemplateGenerator view model.</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>component,microcomponent,ui,core,templategenerator,generator,template,form,formgenerator</PackageTags>

diff --git a/...ices.UI.TemplateGenerator.ViewModels/ViewModels/FormItems/AddOrUpdateFormItemViewModel.cs b/...ices.UI.TemplateGenerator.ViewModels/ViewModels/FormItems/AddOrUpdateFormItemViewModel.cs
@@ -46,13 +46,22 @@ public FormItemContract UpdateFormItemContract
                 Title = value.Title;
                 Type = value.Type;
                 DefaultValue = value.DefaultValue;
+                FormItems.Clear();
                 if (value.Items != null)
                 {
                     foreach (var item in value.Items)
                     {
                         FormItems.Add(item);
                     }
                 }
+                FormItemEvents.Clear();
+                if (value.Events != null)
+                {
+                    foreach (var item in value.Events)
+                    {
+                        FormItemEvents.Add(item);
+                    }
+                }
                 if (value.PrimaryFormItemId.HasValue)
                     SelectedNoParentFormItem = NoParentFormItems.FirstOrDefault(x => x.Id == value.PrimaryFormItemId);
             }
@@ -252,6 +261,7 @@ public void Clear()
         Title = "";
         DefaultValue = "";
         FormItems.Clear();
+        FormItemEvents.Clear();
         UpdateFormItemContract = default;
     }