diff --git a/ruoyi-generator/src/main/resources/vm/html/list-tree.html.vm b/ruoyi-generator/src/main/resources/vm/html/list-tree.html.vm index dcb91e83c..3b7579310 100644 --- a/ruoyi-generator/src/main/resources/vm/html/list-tree.html.vm +++ b/ruoyi-generator/src/main/resources/vm/html/list-tree.html.vm @@ -17,14 +17,21 @@ #set($parentheseIndex=$column.columnComment.indexOf("(")) #if($parentheseIndex != -1) #set($comment=$column.columnComment.substring(0, $parentheseIndex)) -#else +#else #set($comment=$column.columnComment) -#end -#if($column.htmlType == "input") +#end +#if($column.htmlType == "input" && $column.queryType != "BETWEEN")
  • +#elseif($column.htmlType == "input" && $column.queryType == "BETWEEN") +
  • + + + - + +
  • #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
  • @@ -52,7 +59,7 @@ - -
  • + #end #end #end @@ -133,7 +140,7 @@ title: '${comment}', align: 'left' }, -#end +#end #end { title: '操作', @@ -152,4 +159,4 @@ }); - \ No newline at end of file + diff --git a/ruoyi-generator/src/main/resources/vm/html/list.html.vm b/ruoyi-generator/src/main/resources/vm/html/list.html.vm index a7021a371..749cb9685 100644 --- a/ruoyi-generator/src/main/resources/vm/html/list.html.vm +++ b/ruoyi-generator/src/main/resources/vm/html/list.html.vm @@ -17,14 +17,21 @@ #set($parentheseIndex=$column.columnComment.indexOf("(")) #if($parentheseIndex != -1) #set($comment=$column.columnComment.substring(0, $parentheseIndex)) -#else +#else #set($comment=$column.columnComment) -#end -#if($column.htmlType == "input") +#end +#if($column.htmlType == "input" && $column.queryType != "BETWEEN")
  • +#elseif($column.htmlType == "input" && $column.queryType == "BETWEEN") +
  • + + + - + +
  • #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
  • @@ -134,7 +141,7 @@ field: '${javaField}', title: '${comment}' }, -#end +#end #end { title: '操作', @@ -151,4 +158,4 @@ }); - \ No newline at end of file +