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

@@ -25,8 +25,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="configType" th:value="${dict['dictValue']}" th:checked="${dict['isDefault'] == 'Y' ? true : false}">
<label th:for="${dict['dictCode']}" th:text="${dict['dictLabel']}"></label>
</div>

View File

@@ -4,7 +4,7 @@
<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">
<div class="btn-group hidden-xs" id="toolbar" role="group">
<button class="btn btn-outline btn-default" onclick="javascript:add()" shiro:hasPermission="system:config:add">
<i class="fa fa-plus"></i> 新增
</button>

View File

@@ -26,8 +26,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="configType" th:value="${dict['dictValue']}" th:field="*{config.configType}">
<label th:for="${dict['dictCode']}" th:text="${dict['dictLabel']}"></label>
</div>

View File

@@ -44,8 +44,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

@@ -4,7 +4,7 @@
<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">
<div class="btn-group hidden-xs" id="toolbar" role="group">
<div class="form-group">
<button type="button" class="btn btn-outline btn-default" onclick="javascript:add(100)" shiro:hasPermission="system:dept:add">
<i class="fa fa-plus"></i> 新增

View File

@@ -45,8 +45,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:field="*{dept.status}">
<label th:for="${dict['dictCode']}" th:text="${dict['dictLabel']}"></label>
</div>

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">

View File

@@ -58,8 +58,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_menu_visible')}">
<div th:each="dict : ${datas}" th:class="${dict['cssClass']}">
<div class="col-sm-8" th:with="type=${@dictService.selectDictData('sys_menu_visible')}">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}">
<input type="radio" th:id="${dict['dictCode']}" name="visible" th:value="${dict['dictValue']}" th:checked="${dict['isDefault'] == 'Y' ? true : false}">
<label th:for="${dict['dictCode']}" th:text="${dict['dictLabel']}"></label>
</div>

View File

@@ -59,8 +59,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_menu_visible')}">
<div th:each="dict : ${datas}" th:class="${dict['cssClass']}">
<div class="col-sm-8" th:with="type=${@dictService.selectDictData('sys_menu_visible')}">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}">
<input type="radio" th:id="${dict['dictCode']}" name="visible" th:value="${dict['dictValue']}" th:field="*{menu.visible}">
<label th:for="${dict['dictCode']}" th:text="${dict['dictLabel']}"></label>
</div>

View File

@@ -4,7 +4,7 @@
<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">
<div class="btn-group hidden-xs" id="toolbar" role="group">
<div class="form-group">
<button type="button" class="btn btn-outline btn-default" onclick="javascript:add(0)" shiro:hasPermission="system:menu:add">
<i class="fa fa-plus"></i> 新增

View File

@@ -25,8 +25,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

@@ -26,8 +26,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:field="*{post.status}">
<label th:for="${dict['dictCode']}" th:text="${dict['dictLabel']}"></label>
</div>

View File

@@ -5,7 +5,7 @@
<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">
<div class="btn-group hidden-xs" id="toolbar" role="group">
<button class="btn btn-outline btn-default" onclick="javascript:add()" shiro:hasPermission="system:post:add">
<i class="fa fa-plus"></i> 新增
</button>

View File

@@ -5,7 +5,7 @@
<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">
<div class="btn-group hidden-xs" id="toolbar" role="group">
<button class="btn btn-outline btn-default" onclick="javascript:add()" shiro:hasPermission="system:role:add">
<i class="fa fa-plus"></i> 新增
</button>

View File

@@ -47,11 +47,10 @@
</div>
<div class="form-group">
<label class="col-sm-3 control-label">性别:</label>
<div class="col-sm-8" th:with="datas=${@dictService.selectDictData('sys_user_sex')}">
<div th:each="dict : ${datas}" th:class="${dict['cssClass']}">
<input type="radio" th:id="${dict['dictCode']}" name="sex" th:value="${dict['dictValue']}" th:checked="${dict['isDefault'] == 'Y' ? true : false}">
<label th:for="${dict['dictCode']}" th:text="${dict['dictLabel']}"></label>
</div>
<div class="col-sm-8">
<select id="sex" class="form-control m-b" th:with="type=${@dictService.selectDictData('sys_user_sex')}">
<option th:each="dict : ${type}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>
</select>
</div>
</div>
<div class="form-group">

View File

@@ -42,11 +42,10 @@
</div>
<div class="form-group">
<label class="col-sm-3 control-label">性别:</label>
<div class="col-sm-8" th:with="datas=${@dictService.selectDictData('sys_user_sex')}">
<div th:each="dict : ${datas}" th:class="${dict['cssClass']}">
<input type="radio" th:id="${dict['dictCode']}" name="sex" th:value="${dict['dictValue']}" th:field="*{user.sex}">
<label th:for="${dict['dictCode']}" th:text="${dict['dictLabel']}"></label>
</div>
<div class="col-sm-8">
<select id="sex" class="form-control m-b" th:with="type=${@dictService.selectDictData('sys_user_sex')}">
<option th:each="dict : ${type}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}" th:field="*{user.sex}"></option>
</select>
</div>
</div>
<div class="form-group">

View File

@@ -46,7 +46,7 @@
<p><i class="fa fa-group"></i> [[${user.dept.deptName}]] / [[${#strings.defaultString(postGroup,'无岗位')}]]</p>
<p><i class="fa fa-transgender"></i> [[${user.sex}]]</p>
<p><i class="fa fa-envelope-o"></i> [[${user.email}]]</p>
<p><i class="fa fa-calendar"></i> [[${#dates.format(user.loginDate, 'yyyy-MM-dd HH:mm:ss')}]]</p>
<p><i class="fa fa-calendar"></i> [[${user.createTimeStr}]]</p>
</div>
<div class="clearfix"></div>
</a>

View File

@@ -29,7 +29,7 @@
</div>
<div class="wrapper wrapper-content ui-layout-center">
<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:user:add">
<i class="fa fa-plus"></i> 新增
</button>