hhyykk/RuoYi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

若依2.2版本发布

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/resources/templates/system/dict/data/add.html
View File

@@ -29,9 +29,15 @@
<input class="form-control" type="text" id="cssClass" name="cssClass">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">回显样式：</label>
<div class="col-sm-8">
<input class="form-control" type="text" id="listClass" name="listClass">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">系统默认：</label>
<div class="col-sm-8" th:with="type=${@dictService.selectDictData('sys_yes_no')}">
<div class="col-sm-8" th:with="type=${@dict.getType('sys_yes_no')}">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}">
<input type="radio" th:id="${dict['dictCode']}" name="isDefault" th:value="${dict['dictValue']}" th:checked="${dict['isDefault'] == 'Y' ? true : false}">
<label th:for="${dict['dictCode']}" th:text="${dict['dictLabel']}"></label>
@@ -46,7 +52,7 @@
</div>
<div class="form-group">
<label class="col-sm-3 control-label">状态：</label>
<div class="col-sm-8" th:with="type=${@dictService.selectDictData('sys_normal_disable')}">
<div class="col-sm-8" th:with="type=${@dict.getType('sys_normal_disable')}">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}">
<input type="radio" th:id="${dict['dictCode']}" name="status" th:value="${dict['dictValue']}" th:checked="${dict['isDefault'] == 'Y' ? true : false}">
<label th:for="${dict['dictCode']}" th:text="${dict['dictLabel']}"></label>
@@ -86,7 +92,7 @@
},
},
submitHandler:function(form){
$.operate.save(prefix + "/save", $('#form-dict-add').serialize());
$.operate.save(prefix + "/add", $('#form-dict-add').serialize());
}
});
</script>

13
src/main/resources/templates/system/dict/data/data.html
View File

@@ -20,7 +20,7 @@
字典标签：<input type="text" name="dictLabel"/>
</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>
@@ -51,8 +51,9 @@
<div th:include="include :: footer"></div>
<script th:src="@{/ajax/libs/select/select2.js}"></script>
<script th:inline="javascript">
var editFlag = [[${@permissionService.hasPermi('system:dict:edit')}]];
var removeFlag = [[${@permissionService.hasPermi('system:dict:remove')}]];
var editFlag = [[${@permission.hasPermi('system:dict:edit')}]];
var removeFlag = [[${@permission.hasPermi('system:dict:remove')}]];
var datas = [[${@dict.getType('sys_normal_disable')}]];
var prefix = ctx + "system/dict/data"
$(function() {
@@ -92,11 +93,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);
}
},
{

12
src/main/resources/templates/system/dict/data/edit.html
View File

@@ -30,9 +30,15 @@
<input class="form-control" type="text" id="cssClass" name="cssClass" th:field="*{cssClass}">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">回显样式：</label>
<div class="col-sm-8">
<input class="form-control" type="text" id="listClass" name="listClass" th:field="*{listClass}">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">系统默认：</label>
<div class="col-sm-8" th:with="type=${@dictService.selectDictData('sys_yes_no')}">
<div class="col-sm-8" th:with="type=${@dict.getType('sys_yes_no')}">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}">
<input type="radio" th:id="${dict['dictCode']}" name="isDefault" th:value="${dict['dictValue']}" th:field="*{isDefault}">
<label th:for="${dict['dictCode']}" th:text="${dict['dictLabel']}"></label>
@@ -47,7 +53,7 @@
</div>
<div class="form-group">
<label class="col-sm-3 control-label">状态：</label>
<div class="col-sm-8" th:with="type=${@dictService.selectDictData('sys_normal_disable')}">
<div class="col-sm-8" th:with="type=${@dict.getType('sys_normal_disable')}">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}">
<input type="radio" th:id="${dict['dictCode']}" name="status" th:value="${dict['dictValue']}" th:field="*{status}">
<label th:for="${dict['dictCode']}" th:text="${dict['dictLabel']}"></label>
@@ -87,7 +93,7 @@
},
},
submitHandler:function(form){
$.operate.save(prefix + "/save", $('#form-dict-edit').serialize());
$.operate.save(prefix + "/edit", $('#form-dict-edit').serialize());
}
});
</script>

4
src/main/resources/templates/system/dict/type/add.html
View File

@@ -19,7 +19,7 @@
</div>
<div class="form-group">
<label class="col-sm-3 control-label">状态：</label>
<div class="col-sm-8" th:with="type=${@dictService.selectDictData('sys_normal_disable')}">
<div class="col-sm-8" th:with="type=${@dict.getType('sys_normal_disable')}">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}">
<input type="radio" th:id="${dict['dictCode']}" name="status" th:value="${dict['dictValue']}" th:checked="${dict['isDefault'] == 'Y' ? true : false}">
<label th:for="${dict['dictCode']}" th:text="${dict['dictLabel']}"></label>
@@ -75,7 +75,7 @@
}
},
submitHandler:function(form){
$.operate.save(prefix + "/save", $('#form-dict-add').serialize());
$.operate.save(prefix + "/add", $('#form-dict-add').serialize());
}
});
</script>

4
src/main/resources/templates/system/dict/type/edit.html
View File

@@ -20,7 +20,7 @@
</div>
<div class="form-group">
<label class="col-sm-3 control-label">状态：</label>
<div class="col-sm-8" th:with="type=${@dictService.selectDictData('sys_normal_disable')}">
<div class="col-sm-8" th:with="type=${@dict.getType('sys_normal_disable')}">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}">
<input type="radio" th:id="${dict['dictCode']}" name="status" th:value="${dict['dictValue']}" th:field="*{status}">
<label th:for="${dict['dictCode']}" th:text="${dict['dictLabel']}"></label>
@@ -79,7 +79,7 @@
}
},
submitHandler:function(form){
$.operate.save(prefix + "/save", $('#form-dict-edit').serialize());
$.operate.save(prefix + "/edit", $('#form-dict-edit').serialize());
}
});
</script>

15
src/main/resources/templates/system/dict/type/type.html
View File

@@ -18,7 +18,7 @@
字典类型：<input type="text" name="dictType"/>
</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,10 @@
</div>
<div th:include="include :: footer"></div>
<script th:inline="javascript">
var editFlag = [[${@permissionService.hasPermi('system:dict:edit')}]];
var listFlag = [[${@permissionService.hasPermi('system:dict:list')}]];
var removeFlag = [[${@permissionService.hasPermi('system:dict:remove')}]];
var editFlag = [[${@permission.hasPermi('system:dict:edit')}]];
var listFlag = [[${@permission.hasPermi('system:dict:list')}]];
var removeFlag = [[${@permission.hasPermi('system:dict:remove')}]];
var datas = [[${@dict.getType('sys_normal_disable')}]];
var prefix = ctx + "system/dict"
$(function() {
@@ -96,11 +97,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);
}
},
{