github
/
RuoYi
mirror of https://gitee.com/y_project/RuoYi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

修正普通文本框字段如果查询方式为BETWEEN，list.html无法正确生成代码的问题

pull/548/head
K.X 2025-03-28 11:00:07 +08:00
parent 407f9f46d8
commit 4865e34bf2
2 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ruoyi-generator/src/main/resources/vm/html/list-tree.html.vm
View File

@ -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")
<li>
<label>${comment}：</label>
<input type="text" name="${column.javaField}"/>
</li>
#elseif($column.htmlType == "input" && $column.queryType == "BETWEEN")
<li class="select-time">
<label>${comment}：</label>
<input type="text" id="begin${AttrName}" placeholder="开始${comment}" name="params[begin${AttrName}]"/>
<span>-</span>
<input type="text" id="end${AttrName}" placeholder="结束${comment}" name="params[end${AttrName}]"/>
</li>
#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
<li>
<label>${comment}：</label>
@ -52,7 +59,7 @@
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[begin${AttrName}]"/>
<span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[end${AttrName}]"/>
</li>
</li>
#end
#end
#end
@ -133,7 +140,7 @@
title: '${comment}',
align: 'left'
},
#end
#end
#end
{
title: '操作',
@ -152,4 +159,4 @@
});
</script>
</body>
</html>
</html>

17
ruoyi-generator/src/main/resources/vm/html/list.html.vm
View File

@ -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")
<li>
<label>${comment}：</label>
<input type="text" name="${column.javaField}"/>
</li>
#elseif($column.htmlType == "input" && $column.queryType == "BETWEEN")
<li class="select-time">
<label>${comment}：</label>
<input type="text" id="begin${AttrName}" placeholder="开始${comment}" name="params[begin${AttrName}]"/>
<span>-</span>
<input type="text" id="end${AttrName}" placeholder="结束${comment}" name="params[end${AttrName}]"/>
</li>
#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
<li>
<label>${comment}：</label>
@ -134,7 +141,7 @@
field: '${javaField}',
title: '${comment}'
},
#end
#end
#end
{
title: '操作',
@ -151,4 +158,4 @@
});
</script>
</body>
</html>
</html>