diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/CurdForm.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/CurdForm.txt index da572de..bfc1360 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/CurdForm.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/CurdForm.txt @@ -3,7 +3,6 @@ $set(labelName = "") $set(labelDisabled = "") $set(columnName = column.CsharpFieldFl) $set(value = "item.dictValue") - $if(column.ColumnComment != "") $set(labelName = column.ColumnComment) $else diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplModel.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplModel.txt index 9c9236a..affee9d 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplModel.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplModel.txt @@ -16,7 +16,7 @@ namespace ${options.ModelsNamespace}.Models { $foreach(item in genTable.Columns) /// - /// 描述 : ${item.ColumnComment} + /// 描述 :${item.ColumnComment} /// 空值 :$if(item.IsRequired == "True") false $else true $end /// $if(replaceDto.ShowBtnExport) diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt index f744b87..f4f5d5a 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt @@ -156,8 +156,7 @@ $end $foreach(column in genTable.Columns) $if(column.IsRequired && column.IsIncrement == false) ${column.CsharpFieldFl}: [ - { required: true, message: "${column.ColumnComment}不能为空", trigger: $if(column.htmlType == "select")"change"$else"blur"$end -$if(column.CsharpType == "int" || column.CsharpType == "long"), type: "number"$end } + { required: true, message: "${column.ColumnComment}不能为空", trigger: $if(column.htmlType == "select")"change"$else"blur"$end } ], $end $end