diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplModel.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplModel.txt index 67de9fc..b779e2a 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplModel.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplModel.txt @@ -38,12 +38,12 @@ $end $if(genTable.TplCategory == "subNav" && genTable.SubTable != null) [Navigate(NavigateType.Dynamic, null)] //自定义关系映射 - public ${genTable.SubTable.ClassName} Sub { get; set; } + public ${genTable.SubTable.ClassName} ${genTable.SubTable.ClassName} { get; set; } $end $if(genTable.TplCategory == "subNavMore" && genTable.SubTable != null) [Navigate(NavigateType.Dynamic, null)] //自定义关系映射 - public List<${genTable.SubTable.ClassName}> Sub { get; set; } + public List<${genTable.SubTable.ClassName}> ${genTable.SubTable.ClassName} { get; set; } $end } } \ No newline at end of file diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt index a098f0b..6b60ce3 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt @@ -54,7 +54,7 @@ $end var response = _${replaceDto.ModelTypeName}Repository .Queryable() $if(null != genTable.SubTableName && "" != genTable.SubTableName) - .Includes(it => it.Sub.MappingField(z => z.${genTable.SubTableFkName}, () => it.${replaceDto.PKName})) + .Includes(it => it.${genTable.SubTable.ClassName}.MappingField(z => z.${genTable.SubTableFkName}, () => it.${replaceDto.PKName})) $end $if(genTable.Options.SortField != "" && genTable.Options.SortField != null) .OrderBy("${genTable.Options.SortField} ${genTable.Options.SortType}") diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt index 8221726..26951c8 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt @@ -200,7 +200,7 @@ $if(column.HtmlType == "inputNumber" || column.HtmlType == "customInput") $elseif(column.HtmlType == "datetime") - + $elseif(column.HtmlType == "imageUpload")