From 1fa9d2aad545f9cb336cefeed4bdcb32557935be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com> Date: Fri, 10 Dec 2021 22:05:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E7=94=9F?= =?UTF-8?q?=E6=88=90Controller=20=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E6=8B=BC=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CodeGenTemplate/TplControllers.txt | 13 +++- .../wwwroot/CodeGenTemplate/TplDto.txt | 6 +- .../wwwroot/CodeGenTemplate/TplVue.txt | 10 +-- ZR.CodeGenerator/CodeGenerateTemplate.cs | 62 +++++++++---------- ZR.CodeGenerator/CodeGeneratorTool.cs | 5 +- ZR.Vue/src/utils/ruoyi.js | 3 +- 6 files changed, 56 insertions(+), 43 deletions(-) diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt index c4ed803..c3dd147 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt @@ -51,7 +51,18 @@ namespace ${options.ApiControllerNamespace}.Controllers var predicate = Expressionable.Create<${replaceDto.ModelTypeName}>(); //搜索条件查询语法参考Sqlsugar -${QueryCondition} +$foreach(column in genTable.Columns) +$if(column.IsQuery) +$if(column.CsharpType == "string") + predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.${column.CsharpField}), ${codeTool.QueryExp(column.CsharpField, column.QueryType)}; +$elseif(column.CsharpType == "DateTime") + predicate = predicate.AndIF(parm.Begin${column.CsharpField} != null, it => it.${column.CsharpField} >= parm.Begin${column.CsharpField}); + predicate = predicate.AndIF(parm.End${column.CsharpField} != null, it => it.${column.CsharpField} <= parm.End${column.CsharpField}); +$elseif(column.CsharpType == "int" || column.CsharpType == "long") + predicate = predicate.AndIF(parm.${column.CsharpField} != null, ${codeTool.QueryExp(column.CsharpField, column.QueryType)}; +$end +$end +$end $if(genTable.SortField != "" && genTable.SortField != null) var response = _${replaceDto.ModelTypeName}Service.GetPages(predicate.ToExpression(), parm, x => x.${genTable.SortField}, "${genTable.SortType}"); $else diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplDto.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplDto.txt index 68c509a..a424ac5 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplDto.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplDto.txt @@ -14,7 +14,7 @@ $foreach(item in genTable.Columns) $if((item.IsInsert || item.IsEdit || item.IsPk || item.IsIncrement)) public $item.CsharpType$item.RequiredStr $item.CsharpField { get; set; } $end -${end} +$end } /// @@ -27,8 +27,8 @@ $if(item.IsQuery && item.htmlType == "datetime") public DateTime? Begin$item.CsharpField { get; set; } public DateTime? End$item.CsharpField { get; set; } $elseif(item.IsQuery) - public $item.CsharpType $item.CsharpField { get; set; } + public $item.CsharpType$if(item.CsharpType != "string")?$end $item.CsharpField { get; set; } +$end $end -${end} } } diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt index dc3dc5f..6d5e63d 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt @@ -8,7 +8,6 @@ ${vueQueryFormHtml} 重置 - @@ -93,7 +92,12 @@ export default { // 查询参数 queryParams: { pageNum: 1, - pageSize: 20 + pageSize: 20, +$foreach(item in genTable.Columns) +$if(item.IsQuery == true) + ${item.columnName}: undefined, +$end +$end }, // 弹出层标题 title: "", @@ -101,8 +105,6 @@ export default { open: false, // 表单参数 form: {}, - // 时间范围数组 - timeRange: [], columns: [ $set(index = 0) $foreach(column in genTable.Columns) diff --git a/ZR.CodeGenerator/CodeGenerateTemplate.cs b/ZR.CodeGenerator/CodeGenerateTemplate.cs index efa4775..7ddcb6e 100644 --- a/ZR.CodeGenerator/CodeGenerateTemplate.cs +++ b/ZR.CodeGenerator/CodeGenerateTemplate.cs @@ -11,34 +11,34 @@ namespace ZR.CodeGenerator /// public class CodeGenerateTemplate { - /// - /// 查询Dto属性 - /// - /// - /// 替换字符对象 - /// - public static void GetQueryDtoProperty(GenTableColumn tbColumn, ReplaceDto replaceDto) - { - if (tbColumn.IsQuery) - { - //字符串类型表达式 - if (tbColumn.CsharpType == GenConstants.TYPE_STRING) - { - replaceDto.QueryCondition += $" predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.{tbColumn.CsharpField}), {QueryExp(tbColumn.CsharpField, tbColumn.QueryType)};\n"; - } - //int类型表达式 - if (CodeGeneratorTool.IsNumber(tbColumn.CsharpType)) - { - replaceDto.QueryCondition += $" predicate = predicate.AndIF(parm.{tbColumn.CsharpField} > 0, {QueryExp(tbColumn.CsharpField, tbColumn.QueryType)};\n"; - } - //时间类型 - if (tbColumn.CsharpType == GenConstants.TYPE_DATE) - { - replaceDto.QueryCondition += $" predicate = predicate.AndIF(parm.Begin{tbColumn.CsharpField} != null, it => it.{tbColumn.CsharpField} >= parm.Begin{tbColumn.CsharpField});\n"; - replaceDto.QueryCondition += $" predicate = predicate.AndIF(parm.End{tbColumn.CsharpField} != null, it => it.{tbColumn.CsharpField} <= parm.End{tbColumn.CsharpField});\n"; - } - } - } + ///// + ///// 查询Dto属性 + ///// + ///// + ///// 替换字符对象 + ///// + //public static void GetQueryDtoProperty(GenTableColumn tbColumn, ReplaceDto replaceDto) + //{ + // if (tbColumn.IsQuery) + // { + // //字符串类型表达式 + // if (tbColumn.CsharpType == GenConstants.TYPE_STRING) + // { + // replaceDto.QueryCondition += $" predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.{tbColumn.CsharpField}), {QueryExp(tbColumn.CsharpField, tbColumn.QueryType)};\n"; + // } + // //int类型表达式 + // if (CodeGeneratorTool.IsNumber(tbColumn.CsharpType)) + // { + // replaceDto.QueryCondition += $" predicate = predicate.AndIF(parm.{tbColumn.CsharpField} > 0, {QueryExp(tbColumn.CsharpField, tbColumn.QueryType)};\n"; + // } + // //时间类型 + // if (tbColumn.CsharpType == GenConstants.TYPE_DATE) + // { + // replaceDto.QueryCondition += $" predicate = predicate.AndIF(parm.Begin{tbColumn.CsharpField} != null, it => it.{tbColumn.CsharpField} >= parm.Begin{tbColumn.CsharpField});\n"; + // replaceDto.QueryCondition += $" predicate = predicate.AndIF(parm.End{tbColumn.CsharpField} != null, it => it.{tbColumn.CsharpField} <= parm.End{tbColumn.CsharpField});\n"; + // } + // } + //} #region vue 模板 @@ -187,7 +187,7 @@ namespace ZR.CodeGenerator else if ((dbFieldInfo.HtmlType == GenConstants.HTML_SELECT || dbFieldInfo.HtmlType == GenConstants.HTML_RADIO) && !string.IsNullOrEmpty(dbFieldInfo.DictType)) { //string value = CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType) ? "parseInt(item.dictValue)" : "item.dictValue"; - sb.AppendLine($" "); + sb.AppendLine($" "); sb.AppendLine($" "); sb.AppendLine($" "); sb.AppendLine(" "); @@ -196,7 +196,7 @@ namespace ZR.CodeGenerator else if (dbFieldInfo.HtmlType == GenConstants.HTML_SELECT) { //string value = CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType) ? "parseInt(item.dictValue)" : "item.dictValue"; - sb.AppendLine($" "); + sb.AppendLine($" "); sb.AppendLine($" "); sb.AppendLine($" "); sb.AppendLine(" "); @@ -205,7 +205,7 @@ namespace ZR.CodeGenerator else { string inputNumTxt = CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType) ? ".number" : ""; - sb.AppendLine($" "); + sb.AppendLine($" "); sb.AppendLine($" "); sb.AppendLine(" "); } diff --git a/ZR.CodeGenerator/CodeGeneratorTool.cs b/ZR.CodeGenerator/CodeGeneratorTool.cs index 5d811f4..45dc659 100644 --- a/ZR.CodeGenerator/CodeGeneratorTool.cs +++ b/ZR.CodeGenerator/CodeGeneratorTool.cs @@ -69,7 +69,7 @@ namespace ZR.CodeGenerator { replaceDto.UploadFile = 1; } - CodeGenerateTemplate.GetQueryDtoProperty(dbFieldInfo, replaceDto); + //CodeGenerateTemplate.GetQueryDtoProperty(dbFieldInfo, replaceDto); replaceDto.VueViewFormHtml += CodeGenerateTemplate.TplVueFormContent(dbFieldInfo); replaceDto.VueViewListHtml += CodeGenerateTemplate.TplTableColumn(dbFieldInfo, dto.GenTable); @@ -432,7 +432,8 @@ namespace ZR.CodeGenerator options.Data.Set("options", dto.GenOptions); options.Data.Set("genTable", dto.GenTable); options.Data.Set("btns", dto.CheckedBtn); - //options.Data.Set("codeTool", new CodeGeneratorTool()); + options.Data.Set("tool", new CodeGeneratorTool()); + options.Data.Set("codeTool", new CodeGenerateTemplate()); options.EnableCache = true; //...其它数据 }); diff --git a/ZR.Vue/src/utils/ruoyi.js b/ZR.Vue/src/utils/ruoyi.js index fd86973..03e3587 100644 --- a/ZR.Vue/src/utils/ruoyi.js +++ b/ZR.Vue/src/utils/ruoyi.js @@ -66,8 +66,7 @@ export function addDateRange(params, dateRange) { } export function addDateRange2(dateRange, index) { - console.log(dateRange); - var time = ""; + var time = undefined; if (null != dateRange && '' != dateRange) { if (dateRange.length <= 2) { time = dateRange[index];