Skip to content

F
fgqyxxlr
Commit 51f98aa0 by RuoYi
Options

代码生成细节优化

parent 07042ac9
Showing with 9 additions and 9 deletions
ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css
...@@ -644,7 +644,7 @@ label { ...@@ -644,7 +644,7 @@ label {
margin: 5px 15px 5px 0px; margin: 5px 15px 5px 0px;
} }
.select-list li p{ .select-list li p, .select-list li label{
float: left; float: left;
width: 65px; width: 65px;
margin: 5px 5px 5px 0px; margin: 5px 5px 5px 0px;
......
ruoyi-generator/src/main/resources/vm/html/list-tree.html.vm
...@@ -22,12 +22,12 @@ ...@@ -22,12 +22,12 @@
#end #end
#if($column.htmlType == "input") #if($column.htmlType == "input")
<li> <li>
<p>${comment}：</p> <label>${comment}：</label>
<input type="text" name="${column.javaField}"/> <input type="text" name="${column.javaField}"/>
</li> </li>
#elseif($column.htmlType == "select" || $column.htmlType == "radio" && "" != $dictType) #elseif($column.htmlType == "select" || $column.htmlType == "radio" && "" != $dictType)
<li> <li>
<p>${comment}：</p> <label>${comment}：</label>
<select name="${column.javaField}" th:with="type=${@dict.getType('${dictType}')}"> <select name="${column.javaField}" th:with="type=${@dict.getType('${dictType}')}">
<option value="">所有</option> <option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
...@@ -35,14 +35,14 @@ ...@@ -35,14 +35,14 @@
</li> </li>
#elseif($column.htmlType == "select" || $column.htmlType == "radio" && $dictType) #elseif($column.htmlType == "select" || $column.htmlType == "radio" && $dictType)
<li> <li>
<p>${comment}：</p> <label>${comment}：</label>
<select name="${column.javaField}"> <select name="${column.javaField}">
<option value="">所有</option> <option value="">所有</option>
</select> </select>
</li> </li>
#elseif($column.htmlType == "datetime") #elseif($column.htmlType == "datetime")
<li class="select-time"> <li class="select-time">
<p>${comment}：</p> <label>${comment}：</label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[begin${AttrName}]"/> <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[begin${AttrName}]"/>
<span>-</span> <span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[end${AttrName}]"/> <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[end${AttrName}]"/>
......
ruoyi-generator/src/main/resources/vm/html/list.html.vm
...@@ -22,12 +22,12 @@ ...@@ -22,12 +22,12 @@
#end #end
#if($column.htmlType == "input") #if($column.htmlType == "input")
<li> <li>
<p>${comment}：</p> <label>${comment}：</label>
<input type="text" name="${column.javaField}"/> <input type="text" name="${column.javaField}"/>
</li> </li>
#elseif($column.htmlType == "select" || $column.htmlType == "radio" && "" != $dictType) #elseif($column.htmlType == "select" || $column.htmlType == "radio" && "" != $dictType)
<li> <li>
<p>${comment}：</p> <label>${comment}：</label>
<select name="${column.javaField}" th:with="type=${@dict.getType('${dictType}')}"> <select name="${column.javaField}" th:with="type=${@dict.getType('${dictType}')}">
<option value="">所有</option> <option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
...@@ -35,14 +35,14 @@ ...@@ -35,14 +35,14 @@
</li> </li>
#elseif($column.htmlType == "select" || $column.htmlType == "radio" && $dictType) #elseif($column.htmlType == "select" || $column.htmlType == "radio" && $dictType)
<li> <li>
<p>${comment}：</p> <label>${comment}：</label>
<select name="${column.javaField}"> <select name="${column.javaField}">
<option value="">所有</option> <option value="">所有</option>
</select> </select>
</li> </li>
#elseif($column.htmlType == "datetime") #elseif($column.htmlType == "datetime")
<li class="select-time"> <li class="select-time">
<p>${comment}：</p> <label>${comment}：</label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[begin${AttrName}]"/> <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[begin${AttrName}]"/>
<span>-</span> <span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[end${AttrName}]"/> <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[end${AttrName}]"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment