diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/api.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/api.txt index d1f318e..30f869c 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/api.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/api.txt @@ -56,7 +56,7 @@ $if(replaceDto.ShowBtnDelete || replaceDto.ShowBtnMultiDel) */ export function del${genTable.BusinessName}(pid) { return request({ - url: '/${genTable.ModuleName}/${genTable.BusinessName}/' + pid, + url: '/${genTable.ModuleName}/${genTable.BusinessName}/delete/' + pid, method: 'delete' }) } @@ -73,6 +73,6 @@ $end $if(replaceDto.ShowBtnExport) // 导出${genTable.functionName} export async function export${genTable.BusinessName}(query) { - await downFile('$/{genTable.ModuleName}/${genTable.BusinessName}/export', { ...query }) + await downFile('/${genTable.ModuleName}/${genTable.BusinessName}/export', { ...query }) } $end \ No newline at end of file diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/form.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/form.txt index 4d6dd90..429ae15 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/form.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/form.txt @@ -12,7 +12,7 @@ $if(column.CsharpType == "int" || column.CsharpType == "long") $end $if(column.IsPK || column.IsIncrement) -$if(column.IsPK && column.IsIncrement == false) +$if(column.IsPK && column.IsIncrement == false && replaceDto.useSnowflakeId == false) @@ -83,7 +83,6 @@ $end - \ No newline at end of file diff --git a/ZR.CodeGenerator/CodeGenerateTemplate.cs b/ZR.CodeGenerator/CodeGenerateTemplate.cs index a0cc978..9601729 100644 --- a/ZR.CodeGenerator/CodeGenerateTemplate.cs +++ b/ZR.CodeGenerator/CodeGenerateTemplate.cs @@ -1,9 +1,4 @@ -using System; -using System.Linq; -using System.Text; -using ZR.Model.System.Generate; - -namespace ZR.CodeGenerator +namespace ZR.CodeGenerator { /// /// 代码生成模板 diff --git a/ZR.CodeGenerator/CodeGenerateOption.cs b/ZR.CodeGenerator/Model/CodeGenerateOption.cs similarity index 89% rename from ZR.CodeGenerator/CodeGenerateOption.cs rename to ZR.CodeGenerator/Model/CodeGenerateOption.cs index ca906e2..66398aa 100644 --- a/ZR.CodeGenerator/CodeGenerateOption.cs +++ b/ZR.CodeGenerator/Model/CodeGenerateOption.cs @@ -1,4 +1,4 @@ -namespace ZR.CodeGenerator +namespace ZR.CodeGenerator.Model { public class CodeGenerateOption { @@ -39,11 +39,6 @@ /// Api控制器命名空间 /// public string ApiControllerNamespace { get; set; } - - /// - /// 去掉的表头字符 - /// - public string ReplaceTableNameStr { get; set; } /// /// 要生数据的表,用“,”分割 ///