若依开源 1.1.5发布

This commit is contained in:
RuoYi
2018-05-26 14:27:56 +08:00
parent 548f3c2867
commit 595b0312f5
87 changed files with 466 additions and 1467 deletions

View File

@@ -31,8 +31,8 @@
</div>
<div class="form-group">
<label class="col-sm-3 control-label">系统默认:</label>
<div class="col-sm-8" th:with="datas=${@dictService.selectDictData('sys_yes_no')}">
<div th:each="dict : ${datas}" th:class="${dict['cssClass']}">
<div class="col-sm-8" th:with="type=${@dictService.selectDictData('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>
</div>
@@ -46,8 +46,8 @@
</div>
<div class="form-group">
<label class="col-sm-3 control-label">状态:</label>
<div class="col-sm-8" th:with="datas=${@dictService.selectDictData('sys_post_status')}">
<div th:each="dict : ${datas}" th:class="${dict['cssClass']}">
<div class="col-sm-8" th:with="type=${@dictService.selectDictData('sys_post_status')}">
<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>
</div>

View File

@@ -6,7 +6,7 @@
<body class="gray-bg">
<div class="wrapper wrapper-content">
<input name="dictType" id="dictType" type="hidden" th:value="${dict.dictType}" />
<div class="btn-group hidden-xs" id="tableToolbar" role="group">
<div class="btn-group hidden-xs" id="toolbar" role="group">
<button class="btn btn-outline btn-default" onclick="javascript:add()" shiro:hasPermission="system:dict:add">
<i class="fa fa-plus"></i> 新增
</button>

View File

@@ -32,8 +32,8 @@
</div>
<div class="form-group">
<label class="col-sm-3 control-label">系统默认:</label>
<div class="col-sm-8" th:with="datas=${@dictService.selectDictData('sys_yes_no')}">
<div th:each="dict : ${datas}" th:class="${dict['cssClass']}">
<div class="col-sm-8" th:with="type=${@dictService.selectDictData('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="*{dict.isDefault}">
<label th:for="${dict['dictCode']}" th:text="${dict['dictLabel']}"></label>
</div>
@@ -47,8 +47,8 @@
</div>
<div class="form-group">
<label class="col-sm-3 control-label">状态:</label>
<div class="col-sm-8" th:with="datas=${@dictService.selectDictData('sys_dict_status')}">
<div th:each="dict : ${datas}" th:class="${dict['cssClass']}">
<div class="col-sm-8" th:with="type=${@dictService.selectDictData('sys_dict_status')}">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}">
<input type="radio" th:id="${dict['dictCode']}" name="status" th:value="${dict['dictValue']}" th:field="*{dict.status}">
<label th:for="${dict['dictCode']}" th:text="${dict['dictLabel']}"></label>
</div>

View File

@@ -19,8 +19,8 @@
</div>
<div class="form-group">
<label class="col-sm-3 control-label">状态:</label>
<div class="col-sm-8" th:with="datas=${@dictService.selectDictData('sys_dict_status')}">
<div th:each="dict : ${datas}" th:class="${dict['cssClass']}">
<div class="col-sm-8" th:with="type=${@dictService.selectDictData('sys_dict_status')}">
<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>
</div>

View File

@@ -20,8 +20,8 @@
</div>
<div class="form-group">
<label class="col-sm-3 control-label">状态:</label>
<div class="col-sm-8" th:with="datas=${@dictService.selectDictData('sys_dict_status')}">
<div th:each="dict : ${datas}" th:class="${dict['cssClass']}">
<div class="col-sm-8" th:with="type=${@dictService.selectDictData('sys_dict_status')}">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}">
<input type="radio" th:id="${dict['dictCode']}" name="status" th:value="${dict['dictValue']}" th:field="*{dict.status}">
<label th:for="${dict['dictCode']}" th:text="${dict['dictLabel']}"></label>
</div>

View File

@@ -5,8 +5,8 @@
<head th:include="include :: header"></head>
<body class="gray-bg">
<div class="wrapper wrapper-content">
<div class="btn-group hidden-xs" id="tableToolbar" role="group">
<button class="btn btn-outline btn-default" nclick="javascript:add()" shiro:hasPermission="system:dict:add">
<div class="btn-group hidden-xs" id="toolbar" role="group">
<button class="btn btn-outline btn-default" onclick="javascript:add()" shiro:hasPermission="system:dict:add">
<i class="fa fa-plus"></i> 新增
</button>
<button class="btn btn-outline btn-default" onclick="javascript:batchRemove()" shiro:hasPermission="system:dict:batchRemove">