From d8abd49103eebae0d2f244b60a191b2355d7cdbf 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, 20 May 2022 13:29:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96vue2=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=94=9F=E6=88=90=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZR.Admin.WebApi/wwwroot/CodeGenTemplate/CurdForm.txt | 1 - ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplModel.txt | 2 +- ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) 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