若依2.2版本发布

This commit is contained in:
RuoYi
2018-07-22 23:05:50 +08:00
parent 9e8d80a699
commit cc9c67cdfb
115 changed files with 1579 additions and 1216 deletions

View File

@ -14,7 +14,7 @@
菜单名称:<input type="text" name="menuName"/>
</li>
<li>
菜单状态:<select name="visible" th:with="type=${@dictService.selectDictData('sys_show_hide')}">
菜单状态:<select name="visible" th:with="type=${@dict.getType('sys_show_hide')}">
<option value="">所有</option>
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option>
</select>
@ -40,9 +40,10 @@
<div th:include="include :: footer"></div>
<script th:inline="javascript">
var addFlag = [[${@permissionService.hasPermi('system:menu:add')}]];
var editFlag = [[${@permissionService.hasPermi('system:menu:edit')}]];
var removeFlag = [[${@permissionService.hasPermi('system:menu:remove')}]];
var addFlag = [[${@permission.hasPermi('system:menu:add')}]];
var editFlag = [[${@permission.hasPermi('system:menu:edit')}]];
var removeFlag = [[${@permission.hasPermi('system:menu:remove')}]];
var datas = [[${@dict.getType('sys_show_hide')}]];
var prefix = ctx + "system/menu"
window.onload = function() {
@ -106,11 +107,7 @@
width: '10%',
align: "center",
formatter: function(row, index) {
if (row.visible == 0) {
return '<span class="badge badge-primary">显示</span>';
} else if (row.visible == 1) {
return '<span class="badge badge-danger">隐藏</span>';
}
return $.table.selectDictLabel(datas, row.visible);
}
},
{