Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

代码生成模板优化

Browse Source
This commit is contained in:
izory
2021-09-23 22:26:45 +08:00
parent 907f96d8bd
commit 35e7ce9c13
9 changed files with 18 additions and 397 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ZR.CodeGenerator/CodeGenerateTemplate.cs
View File

@@ -220,7 +220,7 @@ namespace ZR.CodeGenerator
string columnName = dbFieldInfo.ColumnName;
string label = CodeGeneratorTool.GetLabelName(dbFieldInfo.ColumnComment, columnName);
string vueViewListContent = "";
string showToolTip = dbFieldInfo.ColumnType.Contains("varchar") ? ":show-overflow-tooltip=\"true\"" : "";
string showToolTip = dbFieldInfo.CsharpType == "string" ? ":show-overflow-tooltip=\"true\"" : "";
string formatter = !string.IsNullOrEmpty(dbFieldInfo.DictType) ? $" :formatter=\"{columnName}Format\"" : "";
if (dbFieldInfo.IsList && dbFieldInfo.HtmlType.Equals(GenConstants.HTML_IMAGE_UPLOAD))

17
ZR.CodeGenerator/CodeGeneratorTool.cs
View File

@@ -163,11 +163,8 @@ namespace ZR.CodeGenerator
WriteAndSave(tuple.Item1, tuple.Item2);
}
return genPathList;
//GenerateIRepository(modelTypeName, modelTypeDesc, keyTypeName, ifExsitedCovered);
//GenerateOutputDto(modelTypeName, modelTypeDesc, outputDtocontent, ifExsitedCovered);
}
#region 生成Model
/// <summary>
@@ -312,7 +309,7 @@ namespace ZR.CodeGenerator
/// </summary>
private static Tuple<string, string> GenerateControllers(ReplaceDto replaceDto, GenerateDto generateDto)
{
var servicesPath = Path.Combine(generateDto.GenCodePath, _option.ApiControllerNamespace, "Controllers", "business");
var servicesPath = Path.Combine(generateDto.GenCodePath, _option.ApiControllerNamespace, "Controllers", generateDto.GenTable.ModuleName);
CreateDirectory(servicesPath);
var fullPath = Path.Combine(servicesPath, $"{replaceDto.ModelTypeName}Controller.cs");
@@ -329,6 +326,7 @@ namespace ZR.CodeGenerator
.Replace("{PrimaryKey}", replaceDto.PKName)
.Replace("{UpdateColumn}", replaceDto.UpdateColumn)
.Replace("{InsertColumn}", replaceDto.InsertColumn)
.Replace("{ModuleName}", generateDto.GenTable.ModuleName)
.Replace("{PKCsharpType}", replaceDto.PKType);
return Tuple.Create(fullPath, content);
@@ -341,10 +339,10 @@ namespace ZR.CodeGenerator
private static Tuple<string, string> GenerateVueViews(ReplaceDto replaceDto, GenerateDto generateDto)
{
var parentPath = Path.Combine(generateDto.GenCodePath, "ZR.Vue", "src");
var servicesPath = Path.Combine(parentPath, "views", replaceDto.ViewsFileName);
var servicesPath = Path.Combine(parentPath, "views", generateDto.GenTable.ModuleName, replaceDto.ViewsFileName);
CreateDirectory(servicesPath);
var fullPath = Path.Combine(servicesPath, $"{replaceDto.ViewsFileName}.vue");
var fullPath = Path.Combine(servicesPath, "index.vue");
if (File.Exists(fullPath) && !generateDto.coverd)
return Tuple.Create(fullPath, "");
@@ -376,10 +374,11 @@ namespace ZR.CodeGenerator
if (File.Exists(fullPath) && !generateDto.coverd)
return Tuple.Create(fullPath, "");
var content = ReadTemplate("VueJsTemplate.txt")
.Replace("{ModelTypeName}", replaceDto.ModelTypeName)
.Replace("{ModelTypeDesc}", replaceDto.TableDesc);
.Replace("{ModelTypeDesc}", replaceDto.TableDesc)
.Replace("{ModuleName}", generateDto.GenTable.ModuleName);
return Tuple.Create(fullPath, content);
}
@@ -618,7 +617,7 @@ namespace ZR.CodeGenerator
try
{
//生成压缩包
string zipReturnFileName = "ZR." + DateTime.Now.ToString("yyyyMMddHHmmss") + ".zip";
string zipReturnFileName = dto.GenTable.BaseNameSpace + DateTime.Now.ToString("yyyyMMddHHmmss") + ".zip";
CreateDirectory(dto.GenCodePath);
string zipFileName = Path.Combine(dto.ZipPath, zipReturnFileName);