From aefc11cac78fef9d62bb5eb5232dd6fa0847807b Mon Sep 17 00:00:00 2001
From: Errors0 <ukatoilol@gmail.com>
Date: Fri, 4 Sep 2020 15:02:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=92=88=E5=AF=B9varchar=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=B7=BB=E5=8A=A0maxlength=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/vm/html/add.html.vm            | 11 +++++++++--
 .../src/main/resources/vm/html/edit.html.vm           | 11 +++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/ruoyi-generator/src/main/resources/vm/html/add.html.vm b/ruoyi-generator/src/main/resources/vm/html/add.html.vm
index 80b8ffffc..e8ed066bf 100644
--- a/ruoyi-generator/src/main/resources/vm/html/add.html.vm
+++ b/ruoyi-generator/src/main/resources/vm/html/add.html.vm
@@ -38,6 +38,13 @@
 #set($comment=$column.columnComment)
 #end
 #set($dictType=$column.dictType)
+#set($isVarchar=$column.columnType.indexOf("varchar")!=-1)
+#set($vcl='')
+#if($isVarchar)
+#set($vcS=$column.columnType.indexOf("(") + 1)
+#set($vcE=$column.columnType.indexOf(")"))
+#set($vcl=$column.columnType.substring($vcS, $vcE))
+#end
 #if("" != $treeParentCode && $column.javaField == $treeParentCode)
             <div class="form-group">    
                 <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
@@ -55,7 +62,7 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
                 <div class="col-sm-8">
-                    <input name="${field}" class="form-control" type="text"#if($column.required) required#end>
+                    <input name="${field}" class="form-control" type="text"#if($column.required) required#end #if($vcl!='') maxlength="$vcl"#end>
                 </div>
             </div>
 #elseif($column.htmlType == "upload")
@@ -149,7 +156,7 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
                 <div class="col-sm-8">
-                    <textarea name="${field}" class="form-control"#if($column.required) required#end></textarea>
+                    <textarea name="${field}" class="form-control"#if($column.required) required#end #if($vcl!='') maxlength="$vcl"#end></textarea>
                 </div>
             </div>
 #end
diff --git a/ruoyi-generator/src/main/resources/vm/html/edit.html.vm b/ruoyi-generator/src/main/resources/vm/html/edit.html.vm
index 539c72a65..288cb5145 100644
--- a/ruoyi-generator/src/main/resources/vm/html/edit.html.vm
+++ b/ruoyi-generator/src/main/resources/vm/html/edit.html.vm
@@ -39,6 +39,13 @@
 #end
 #set($field=$column.javaField)
 #set($dictType=$column.dictType)
+#set($isVarchar=$column.columnType.indexOf("varchar")!=-1)
+#set($vcl='')
+#if($isVarchar)
+#set($vcS=$column.columnType.indexOf("(") + 1)
+#set($vcE=$column.columnType.indexOf(")"))
+#set($vcl=$column.columnType.substring($vcS, $vcE))
+#end
 #if("" != $treeParentCode && $column.javaField == $treeParentCode)
             <div class="form-group">    
                 <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
@@ -55,7 +62,7 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
                 <div class="col-sm-8">
-                    <input name="${field}" th:field="*{${field}}" class="form-control" type="text"#if($column.required) required#end>
+                    <input name="${field}" th:field="*{${field}}" class="form-control" type="text"#if($column.required) required#end #if($vcl!='') maxlength="$vcl"#end>
                 </div>
             </div>
 #elseif($column.htmlType == "upload")
@@ -149,7 +156,7 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
                 <div class="col-sm-8">
-                    <textarea name="${field}" class="form-control"#if($column.required) required#end>[[*{${field}}]]</textarea>
+                    <textarea name="${field}" class="form-control"#if($column.required) required#end #if($vcl!='') maxlength="$vcl"#end>[[*{${field}}]]</textarea>
                 </div>
             </div>
 #end