若依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

@@ -137,7 +137,7 @@
$.ajax({
cache : true,
type : "POST",
url : ctx + "system/role/save",
url : ctx + "system/role/add",
data : {
"roleName": roleName,
"roleKey": roleKey,

View File

@@ -142,7 +142,7 @@
$.ajax({
cache : true,
type : "POST",
url : ctx + "system/role/save",
url : ctx + "system/role/edit",
data : {
"roleId": roleId,
"roleName": roleName,

View File

@@ -18,7 +18,7 @@
权限字符:<input type="text" name="roleKey"/>
</li>
<li>
角色状态:<select name="status" th:with="type=${@dictService.selectDictData('sys_normal_disable')}">
角色状态:<select name="status" th:with="type=${@dict.getType('sys_normal_disable')}">
<option value="">所有</option>
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option>
</select>
@@ -54,9 +54,11 @@
</div>
<div th:include="include :: footer"></div>
<script th:inline="javascript">
var editFlag = [[${@permissionService.hasPermi('system:role:edit')}]];
var removeFlag = [[${@permissionService.hasPermi('system:role:remove')}]];
var editFlag = [[${@permission.hasPermi('system:role:edit')}]];
var removeFlag = [[${@permission.hasPermi('system:role:remove')}]];
var datas = [[${@dict.getType('sys_normal_disable')}]];
var prefix = ctx + "system/role"
$(function() {
var options = {
@@ -96,11 +98,7 @@
title: '状态',
align: 'center',
formatter: function(value, row, index) {
if (value == 0) {
return '<span class="badge badge-primary">正常</span>';
} else if (value == 1) {
return '<span class="badge badge-danger">停用</span>';
}
return $.table.selectDictLabel(datas, value);
}
},
{