diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css b/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css index 880b9b70..8896a3ab 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css +++ b/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css @@ -644,7 +644,7 @@ label { margin: 5px 15px 5px 0px; } -.select-list li p{ +.select-list li p, .select-list li label{ float: left; width: 65px; margin: 5px 5px 5px 0px; 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 2e05fe61..764b868f 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 @@ -22,12 +22,12 @@ #end #if($column.htmlType == "input") <li> - <p>${comment}:</p> + <label>${comment}:</label> <input type="text" name="${column.javaField}"/> </li> #elseif($column.htmlType == "select" || $column.htmlType == "radio" && "" != $dictType) <li> - <p>${comment}:</p> + <label>${comment}:</label> <select name="${column.javaField}" th:with="type=${@dict.getType('${dictType}')}"> <option value="">所有</option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> @@ -35,14 +35,14 @@ </li> #elseif($column.htmlType == "select" || $column.htmlType == "radio" && $dictType) <li> - <p>${comment}:</p> + <label>${comment}:</label> <select name="${column.javaField}"> <option value="">所有</option> </select> </li> #elseif($column.htmlType == "datetime") <li class="select-time"> - <p>${comment}:</p> + <label>${comment}:</label> <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}]"/> 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 10085b75..2d251424 100644 --- a/ruoyi-generator/src/main/resources/vm/html/list.html.vm +++ b/ruoyi-generator/src/main/resources/vm/html/list.html.vm @@ -22,12 +22,12 @@ #end #if($column.htmlType == "input") <li> - <p>${comment}:</p> + <label>${comment}:</label> <input type="text" name="${column.javaField}"/> </li> #elseif($column.htmlType == "select" || $column.htmlType == "radio" && "" != $dictType) <li> - <p>${comment}:</p> + <label>${comment}:</label> <select name="${column.javaField}" th:with="type=${@dict.getType('${dictType}')}"> <option value="">所有</option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> @@ -35,14 +35,14 @@ </li> #elseif($column.htmlType == "select" || $column.htmlType == "radio" && $dictType) <li> - <p>${comment}:</p> + <label>${comment}:</label> <select name="${column.javaField}"> <option value="">所有</option> </select> </li> #elseif($column.htmlType == "datetime") <li class="select-time"> - <p>${comment}:</p> + <label>${comment}:</label> <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}]"/>