diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt index ebe6972..f0b3697 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt @@ -22,8 +22,6 @@ namespace ${options.ServicesNamespace}.${options.SubNamespace} [AppService(ServiceType = typeof(I${replaceDto.ModelTypeName}Service), ServiceLifetime = LifeTime.Transient)] public class ${replaceDto.ModelTypeName}Service : BaseService<${replaceDto.ModelTypeName}>, I${replaceDto.ModelTypeName}Service { - #region 业务逻辑代码 - /// /// 查询${genTable.FunctionName}列表 /// @@ -31,10 +29,8 @@ namespace ${options.ServicesNamespace}.${options.SubNamespace} /// public PagedInfo<${replaceDto.ModelTypeName}Dto> GetList(${replaceDto.ModelTypeName}QueryDto parm) { - //开始拼装查询条件 var predicate = Expressionable.Create<${replaceDto.ModelTypeName}>(); - //搜索条件查询语法参考Sqlsugar $foreach(column in genTable.Columns) $if(column.IsQuery) $if(column.HtmlType == "selectMulti") @@ -70,10 +66,8 @@ $if(genTable.TplCategory == "tree") /// public List<${replaceDto.ModelTypeName}> GetTreeList(${replaceDto.ModelTypeName}QueryDto parm) { - //开始拼装查询条件 var predicate = Expressionable.Create<${replaceDto.ModelTypeName}>(); - //搜索条件查询语法参考Sqlsugar $foreach(column in genTable.Columns) $if(column.IsQuery) $if(column.CsharpType == "string") @@ -130,6 +124,5 @@ $if(replaceDto.ShowBtnTruncate) Truncate(); } $end - #endregion } } \ No newline at end of file diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueApi.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueApi.txt index 1e1678f..e015218 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueApi.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueApi.txt @@ -36,7 +36,7 @@ export function treelist${genTable.BusinessName}(query) { }) } $end - +$if(replaceDto.ShowBtnAdd) /** * 新增${genTable.functionName} * @param data @@ -48,7 +48,8 @@ export function add${genTable.BusinessName}(data) { data: data, }) } - +$end +$if(replaceDto.ShowBtnEdit) /** * 修改${genTable.functionName} * @param data @@ -60,7 +61,7 @@ export function update${genTable.BusinessName}(data) { data: data, }) } - +$end /** * 获取${genTable.functionName}详情 * @param {Id} @@ -72,6 +73,7 @@ export function get${genTable.BusinessName}(id) { }) } +$if(replaceDto.ShowBtnDelete) /** * 删除${genTable.functionName} * @param {主键} pid @@ -82,7 +84,8 @@ export function del${genTable.BusinessName}(pid) { method: 'delete' }) } - +$end +$if(replaceDto.ShowBtnTruncate) // 清空${genTable.functionName} export function clear${genTable.BusinessName}() { return request({ @@ -90,14 +93,14 @@ export function clear${genTable.BusinessName}() { method: 'delete' }) } - +$end +$if(replaceDto.ShowBtnExport) // 导出${genTable.functionName} export async function export${genTable.BusinessName}(query) { await downFile('${genTable.ModuleName}/${genTable.BusinessName}/export', { ...query }) } - +$end $if(showCustomInput) -//排序 export function changeSort(data) { return request({ url: '${genTable.ModuleName}/${genTable.BusinessName}/ChangeSort', diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt index 7db664d..8bd3903 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt @@ -212,16 +212,18 @@ $end $foreach(column in genTable.Columns) $set(columnName = column.CsharpFieldFl) $set(value = "item.dictValue") +$set(number = "") $set(labelName = column.ColumnComment) $if(column.CsharpType == "int" || column.CsharpType == "long") $set(value = "parseInt(item.dictValue)") + $set(number = ".number") $end $if(column.IsPK || column.IsIncrement) $if(column.IsPK && column.IsIncrement == false) - + $else @@ -304,7 +306,7 @@ $elseif(column.HtmlType == "colorPicker") $else - + $end