Merge pull request #82 from neozhu/supportcomplextype

property complexType + "Dto"
neozhu · Aug 29, 2024 · ecb91a6 · ecb91a6
2 parents 01396f2 + d879b40
commit ecb91a6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/src/Templatemap.cs b/src/Templatemap.cs
@@ -196,7 +196,7 @@ private static string splitCamelCase(string str)
 		private static string createDtoFieldDefinition(IntellisenseObject classObject)
 		{
 			var output = new StringBuilder();
-			foreach (var property in classObject.Properties.Where(x => x.Type.IsKnownType == true))
+			foreach (var property in classObject.Properties.Where(x =>  x.Type.IsDictionary == false))
 			{
 				output.Append($"    [Description(\"{splitCamelCase(property.Name)}\")]\r\n");
 				if (property.Name == PRIMARYKEY)
@@ -231,9 +231,18 @@ private static string createDtoFieldDefinition(IntellisenseObject classObject)
 							output.Append($"    public {property.Type.CodeName} {property.Name} {{get;set;}} \r\n");
 							break;
 						default:
-							if (property.Type.CodeName.Any(x => x == '?'))
+							if (property.Type.TypeScriptName == "any")
 							{
-								output.Append($"    public {property.Type.CodeName} {property.Name} {{get;set;}} \r\n");
+								var complexType = property.Type.CodeName.Split('.').Last();
+								if (property.Type.Shape!=null && property.Type.Shape.Any())
+								{
+									complexType = complexType + "Dto";
+								}
+								else if (property.Type.IsArray)
+								{
+									complexType = $"List<{complexType}Dto>";
+								}
+								output.Append($"    public {complexType}{(complexType.Any(x=>x== '?') ? "":"?")} {property.Name} {{get;set;}} \r\n");
 							}
 							else
 							{
@@ -338,7 +347,7 @@ private static string createMudTdDefinition(IntellisenseObject classObject)
 				{
 					output.Append("                ");
 					output.Append($"        <MudText Typo=\"Typo.body2\" Class=\"mud-text-secondary\">@context.Description</MudText>\r\n");
-			  }
+				}
 				output.Append("                ");
 				output.Append($"    </div>\r\n");
 				output.Append("                ");

diff --git a/src/Templates/Pages/.razor.txt b/src/Templates/Pages/.razor.txt
@@ -144,7 +144,7 @@
             </ToolBarContent>
             <Columns>
                 <SelectColumn ShowInFooter="false"></SelectColumn>
-                <TemplateColumn CellStyle="width:60px" Title="@ConstantString.Actions" Sortable="false">
+                <TemplateColumn HeaderStyle="width:60px" Title="@ConstantString.Actions" Sortable="false">
                     <CellTemplate>
                         @if (_canEdit || _canDelete)
                         {