Skip to content

F
fgqyxxlr
Commit 1a5e3606 by RuoYi
Options

一波细节优化

parent 58f21c03
Showing with 256 additions and 564 deletions
src/main/java/com/ruoyi/project/system/config/controller/ConfigController.java
...@@ -10,7 +10,6 @@ import org.springframework.web.bind.annotation.PathVariable; ...@@ -10,7 +10,6 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log; import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType; import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
...@@ -134,12 +133,7 @@ public class ConfigController extends BaseController ...@@ -134,12 +133,7 @@ public class ConfigController extends BaseController
@ResponseBody @ResponseBody
public String checkConfigKeyUnique(Config config) public String checkConfigKeyUnique(Config config)
{ {
String uniqueFlag = "0"; return configService.checkConfigKeyUnique(config);
if (StringUtils.isNotNull(config))
{
uniqueFlag = configService.checkConfigKeyUnique(config);
}
return uniqueFlag;
} }
} }
src/main/java/com/ruoyi/project/system/dept/controller/DeptController.java
...@@ -11,7 +11,6 @@ import org.springframework.web.bind.annotation.PathVariable; ...@@ -11,7 +11,6 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.aspectj.lang.annotation.Log; import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType; import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController; import com.ruoyi.framework.web.controller.BaseController;
...@@ -120,12 +119,7 @@ public class DeptController extends BaseController ...@@ -120,12 +119,7 @@ public class DeptController extends BaseController
@ResponseBody @ResponseBody
public String checkDeptNameUnique(Dept dept) public String checkDeptNameUnique(Dept dept)
{ {
String uniqueFlag = "0"; return deptService.checkDeptNameUnique(dept);
if (StringUtils.isNotNull(dept))
{
uniqueFlag = deptService.checkDeptNameUnique(dept);
}
return uniqueFlag;
} }
/** /**
......
src/main/java/com/ruoyi/project/system/dict/controller/DictTypeController.java
...@@ -10,7 +10,6 @@ import org.springframework.web.bind.annotation.PathVariable; ...@@ -10,7 +10,6 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log; import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType; import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
...@@ -147,11 +146,6 @@ public class DictTypeController extends BaseController ...@@ -147,11 +146,6 @@ public class DictTypeController extends BaseController
@ResponseBody @ResponseBody
public String checkDictTypeUnique(DictType dictType) public String checkDictTypeUnique(DictType dictType)
{ {
String uniqueFlag = "0"; return dictTypeService.checkDictTypeUnique(dictType);
if (StringUtils.isNotNull(dictType))
{
uniqueFlag = dictTypeService.checkDictTypeUnique(dictType);
}
return uniqueFlag;
} }
} }
src/main/java/com/ruoyi/project/system/menu/controller/MenuController.java
...@@ -11,7 +11,6 @@ import org.springframework.web.bind.annotation.PathVariable; ...@@ -11,7 +11,6 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.aspectj.lang.annotation.Log; import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType; import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController; import com.ruoyi.framework.web.controller.BaseController;
...@@ -142,12 +141,7 @@ public class MenuController extends BaseController ...@@ -142,12 +141,7 @@ public class MenuController extends BaseController
@ResponseBody @ResponseBody
public String checkMenuNameUnique(Menu menu) public String checkMenuNameUnique(Menu menu)
{ {
String uniqueFlag = "0"; return menuService.checkMenuNameUnique(menu);
if (StringUtils.isNotNull(menu))
{
uniqueFlag = menuService.checkMenuNameUnique(menu);
}
return uniqueFlag;
} }
/** /**
......
src/main/java/com/ruoyi/project/system/post/controller/PostController.java
...@@ -10,7 +10,6 @@ import org.springframework.web.bind.annotation.PathVariable; ...@@ -10,7 +10,6 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log; import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType; import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
...@@ -135,12 +134,7 @@ public class PostController extends BaseController ...@@ -135,12 +134,7 @@ public class PostController extends BaseController
@ResponseBody @ResponseBody
public String checkPostNameUnique(Post post) public String checkPostNameUnique(Post post)
{ {
String uniqueFlag = "0"; return postService.checkPostNameUnique(post);
if (StringUtils.isNotNull(post))
{
uniqueFlag = postService.checkPostNameUnique(post);
}
return uniqueFlag;
} }
/** /**
...@@ -150,12 +144,7 @@ public class PostController extends BaseController ...@@ -150,12 +144,7 @@ public class PostController extends BaseController
@ResponseBody @ResponseBody
public String checkPostCodeUnique(Post post) public String checkPostCodeUnique(Post post)
{ {
String uniqueFlag = "0"; return postService.checkPostCodeUnique(post);
if (StringUtils.isNotNull(post))
{
uniqueFlag = postService.checkPostCodeUnique(post);
}
return uniqueFlag;
} }
} }
src/main/java/com/ruoyi/project/system/role/controller/RoleController.java
...@@ -11,7 +11,6 @@ import org.springframework.web.bind.annotation.PathVariable; ...@@ -11,7 +11,6 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log; import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType; import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
...@@ -140,12 +139,7 @@ public class RoleController extends BaseController ...@@ -140,12 +139,7 @@ public class RoleController extends BaseController
@ResponseBody @ResponseBody
public String checkRoleNameUnique(Role role) public String checkRoleNameUnique(Role role)
{ {
String uniqueFlag = "0"; return roleService.checkRoleNameUnique(role);
if (StringUtils.isNotNull(role))
{
uniqueFlag = roleService.checkRoleNameUnique(role);
}
return uniqueFlag;
} }
/** /**
...@@ -155,12 +149,7 @@ public class RoleController extends BaseController ...@@ -155,12 +149,7 @@ public class RoleController extends BaseController
@ResponseBody @ResponseBody
public String checkRoleKeyUnique(Role role) public String checkRoleKeyUnique(Role role)
{ {
String uniqueFlag = "0"; return roleService.checkRoleKeyUnique(role);
if (StringUtils.isNotNull(role))
{
uniqueFlag = roleService.checkRoleKeyUnique(role);
}
return uniqueFlag;
} }
/** /**
......
src/main/java/com/ruoyi/project/system/user/controller/UserController.java
...@@ -176,12 +176,7 @@ public class UserController extends BaseController ...@@ -176,12 +176,7 @@ public class UserController extends BaseController
@ResponseBody @ResponseBody
public String checkLoginNameUnique(User user) public String checkLoginNameUnique(User user)
{ {
String uniqueFlag = "0"; return userService.checkLoginNameUnique(user.getLoginName());
if (StringUtils.isNotNull(user))
{
uniqueFlag = userService.checkLoginNameUnique(user.getLoginName());
}
return uniqueFlag;
} }
/** /**
...@@ -191,12 +186,7 @@ public class UserController extends BaseController ...@@ -191,12 +186,7 @@ public class UserController extends BaseController
@ResponseBody @ResponseBody
public String checkPhoneUnique(User user) public String checkPhoneUnique(User user)
{ {
String uniqueFlag = "0"; return userService.checkPhoneUnique(user);
if (StringUtils.isNotNull(user))
{
uniqueFlag = userService.checkPhoneUnique(user);
}
return uniqueFlag;
} }
/** /**
...@@ -206,11 +196,6 @@ public class UserController extends BaseController ...@@ -206,11 +196,6 @@ public class UserController extends BaseController
@ResponseBody @ResponseBody
public String checkEmailUnique(User user) public String checkEmailUnique(User user)
{ {
String uniqueFlag = "0"; return userService.checkEmailUnique(user);
if (StringUtils.isNotNull(user))
{
uniqueFlag = userService.checkEmailUnique(user);
}
return uniqueFlag;
} }
} }
\ No newline at end of file
src/main/resources/static/css/checkbox.css deleted 100644 → 0
.checkbox {
padding-left: 20px;
}
.checkbox label {
display: inline-block;
vertical-align: middle;
position: relative;
padding-left: 5px;
}
.checkbox label::before {
content: "";
display: inline-block;
position: absolute;
width: 17px;
height: 17px;
left: 0;
margin-left: -20px;
border: 1px solid #cccccc;
border-radius: 3px;
background-color: #fff;
-webkit-transition: border 0.15s ease-in-out, color 0.15s ease-in-out;
-o-transition: border 0.15s ease-in-out, color 0.15s ease-in-out;
transition: border 0.15s ease-in-out, color 0.15s ease-in-out;
}
.checkbox label::after {
display: inline-block;
position: absolute;
width: 16px;
height: 16px;
left: 0;
top: 0;
margin-left: -20px;
padding-left: 3px;
padding-top: 1px;
font-size: 11px;
color: #555555;
}
.checkbox input[type="checkbox"],
.checkbox input[type="radio"] {
opacity: 0;
z-index: 1;
}
.checkbox input[type="checkbox"]:focus + label::before,
.checkbox input[type="radio"]:focus + label::before {
outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
}
.checkbox input[type="checkbox"]:checked + label::after,
.checkbox input[type="radio"]:checked + label::after {
font-family: "FontAwesome";
content: "\f00c";
}
.checkbox input[type="checkbox"]:disabled + label,
.checkbox input[type="radio"]:disabled + label {
opacity: 0.65;
}
.checkbox input[type="checkbox"]:disabled + label::before,
.checkbox input[type="radio"]:disabled + label::before {
background-color: #eeeeee;
cursor: not-allowed;
}
.checkbox.checkbox-circle label::before {
border-radius: 50%;
}
.checkbox.checkbox-inline {
margin-top: 0;
}
.checkbox-primary input[type="checkbox"]:checked + label::before,
.checkbox-primary input[type="radio"]:checked + label::before {
background-color: #337ab7;
border-color: #337ab7;
}
.checkbox-primary input[type="checkbox"]:checked + label::after,
.checkbox-primary input[type="radio"]:checked + label::after {
color: #fff;
}
.checkbox-danger input[type="checkbox"]:checked + label::before,
.checkbox-danger input[type="radio"]:checked + label::before {
background-color: #d9534f;
border-color: #d9534f;
}
.checkbox-danger input[type="checkbox"]:checked + label::after,
.checkbox-danger input[type="radio"]:checked + label::after {
color: #fff;
}
.checkbox-info input[type="checkbox"]:checked + label::before,
.checkbox-info input[type="radio"]:checked + label::before {
background-color: #5bc0de;
border-color: #5bc0de;
}
.checkbox-info input[type="checkbox"]:checked + label::after,
.checkbox-info input[type="radio"]:checked + label::after {
color: #fff;
}
.checkbox-warning input[type="checkbox"]:checked + label::before,
.checkbox-warning input[type="radio"]:checked + label::before {
background-color: #f0ad4e;
border-color: #f0ad4e;
}
.checkbox-warning input[type="checkbox"]:checked + label::after,
.checkbox-warning input[type="radio"]:checked + label::after {
color: #fff;
}
.checkbox-success input[type="checkbox"]:checked + label::before,
.checkbox-success input[type="radio"]:checked + label::before {
background-color: #5cb85c;
border-color: #5cb85c;
}
.checkbox-success input[type="checkbox"]:checked + label::after,
.checkbox-success input[type="radio"]:checked + label::after {
color: #fff;
}
.radio {
padding-left: 20px;
}
.radio label {
display: inline-block;
vertical-align: middle;
position: relative;
padding-left: 5px;
}
.radio label::before {
content: "";
display: inline-block;
position: absolute;
width: 17px;
height: 17px;
left: 0;
margin-left: -20px;
border: 1px solid #cccccc;
border-radius: 50%;
background-color: #fff;
-webkit-transition: border 0.15s ease-in-out;
-o-transition: border 0.15s ease-in-out;
transition: border 0.15s ease-in-out;
}
.radio label::after {
display: inline-block;
position: absolute;
content: " ";
width: 11px;
height: 11px;
left: 3px;
top: 3px;
margin-left: -20px;
border-radius: 50%;
background-color: #555555;
-webkit-transform: scale(0, 0);
-ms-transform: scale(0, 0);
-o-transform: scale(0, 0);
transform: scale(0, 0);
-webkit-transition: -webkit-transform 0.1s cubic-bezier(0.8, -0.33, 0.2, 1.33);
-moz-transition: -moz-transform 0.1s cubic-bezier(0.8, -0.33, 0.2, 1.33);
-o-transition: -o-transform 0.1s cubic-bezier(0.8, -0.33, 0.2, 1.33);
transition: transform 0.1s cubic-bezier(0.8, -0.33, 0.2, 1.33);
}
.radio input[type="radio"] {
opacity: 0;
z-index: 1;
}
.radio input[type="radio"]:focus + label::before {
outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
}
.radio input[type="radio"]:checked + label::after {
-webkit-transform: scale(1, 1);
-ms-transform: scale(1, 1);
-o-transform: scale(1, 1);
transform: scale(1, 1);
}
.radio input[type="radio"]:disabled + label {
opacity: 0.65;
}
.radio input[type="radio"]:disabled + label::before {
cursor: not-allowed;
}
.radio.radio-inline {
margin-top: 0;
}
.radio-primary input[type="radio"] + label::after {
background-color: #337ab7;
}
.radio-primary input[type="radio"]:checked + label::before {
border-color: #337ab7;
}
.radio-primary input[type="radio"]:checked + label::after {
background-color: #337ab7;
}
.radio-danger input[type="radio"] + label::after {
background-color: #d9534f;
}
.radio-danger input[type="radio"]:checked + label::before {
border-color: #d9534f;
}
.radio-danger input[type="radio"]:checked + label::after {
background-color: #d9534f;
}
.radio-info input[type="radio"] + label::after {
background-color: #5bc0de;
}
.radio-info input[type="radio"]:checked + label::before {
border-color: #5bc0de;
}
.radio-info input[type="radio"]:checked + label::after {
background-color: #5bc0de;
}
.radio-warning input[type="radio"] + label::after {
background-color: #f0ad4e;
}
.radio-warning input[type="radio"]:checked + label::before {
border-color: #f0ad4e;
}
.radio-warning input[type="radio"]:checked + label::after {
background-color: #f0ad4e;
}
.radio-success input[type="radio"] + label::after {
background-color: #5cb85c;
}
.radio-success input[type="radio"]:checked + label::before {
border-color: #5cb85c;
}
.radio-success input[type="radio"]:checked + label::after {
background-color: #5cb85c;
}
input[type="checkbox"].styled:checked + label:after,
input[type="radio"].styled:checked + label:after {
font-family: 'FontAwesome';
content: "\f00c";
}
input[type="checkbox"] .styled:checked + label::before,
input[type="radio"] .styled:checked + label::before {
color: #fff;
}
input[type="checkbox"] .styled:checked + label::after,
input[type="radio"] .styled:checked + label::after {
color: #fff;
}
src/main/resources/static/ruoyi/css/ry-ui.css
...@@ -144,6 +144,15 @@ label.error { ...@@ -144,6 +144,15 @@ label.error {
max-width: none; max-width: none;
} }
/** 内联复选框&单选框 */
.check-box,.radio-box {
display:inline-block;
box-sizing:border-box;
cursor:pointer;
position:relative;
padding-right:20px
}
/** 遮罩层 */ /** 遮罩层 */
.loaderbox { .loaderbox {
display: inline-block; display: inline-block;
...@@ -225,20 +234,20 @@ li { ...@@ -225,20 +234,20 @@ li {
padding-left: 10px; padding-left: 10px;
} }
label{ label {
font-weight: normal; font-weight: normal;
} }
.container-div{ .container-div {
padding:10px 35px; padding:10px 35px;
height:100%; height:100%;
} }
.container-div .row{ .container-div .row {
height: 100%; height: 100%;
} }
.select-info{ .select-info {
width:100%; width:100%;
background: #fff; background: #fff;
border-radius: 6px; border-radius: 6px;
...@@ -247,28 +256,25 @@ label{ ...@@ -247,28 +256,25 @@ label{
box-shadow: 1px 1px 3px rgba(0,0,0,.2); box-shadow: 1px 1px 3px rgba(0,0,0,.2);
} }
.select-info{ .select-table {
position: relative; width:100%;
} background: #fff;
border-radius: 6px;
.select-info .save-btn,.select-info .close-btn{ margin-top:10px;
width: 20px; padding-bottom: 13px;
position: absolute; box-shadow: 1px 1px 3px rgba(0,0,0,.2);
right: 20px;
top: 15px;
cursor: pointer;
} }
.select-info .save-btn{ .select-info {
right: 50px; position: relative;
} }
.select-info .col-sm-6 .control-label{ .select-info .col-sm-6 .control-label {
color:#333; color:#333;
} }
@media ( max-width : 768px) { @media ( max-width : 768px) {
.select-list { .select-info {
display: none; display: none;
} }
} }
...@@ -303,17 +309,17 @@ label{ ...@@ -303,17 +309,17 @@ label{
width:280px; width:280px;
} }
.select-list .time input{ .select-list .select-time input{
width:133px; width:133px;
} }
.time label,.time span,.time input{ .select-time label,.select-time span,.select-time input{
float:left; float:left;
} }
.time label{ .select-time label{
margin-top: 5px; margin-top: 5px;
} }
.time span{ .select-time span{
display: block; display: block;
margin: 5px 5px; margin: 5px 5px;
} }
......
src/main/resources/static/ruoyi/js/common.js
...@@ -18,7 +18,13 @@ $(function(){ ...@@ -18,7 +18,13 @@ $(function(){
radioClass: "iradio_square-green", radioClass: "iradio_square-green",
}) })
} }
if ($(".time").length > 0) { if ($(".radio-box").length > 0) {
$(".radio-box").iCheck({
checkboxClass: "icheckbox_square-green",
radioClass: "iradio_square-green",
})
}
if ($(".select-time").length > 0) {
layui.use('laydate', function() { layui.use('laydate', function() {
var laydate = layui.laydate; var laydate = layui.laydate;
laydate.render({ elem: '#startTime', theme: 'molv' }); laydate.render({ elem: '#startTime', theme: 'molv' });
......
src/main/resources/static/ruoyi/js/ry-ui.js
...@@ -374,7 +374,7 @@ ...@@ -374,7 +374,7 @@
}); });
}, },
// 批量删除信息 // 批量删除信息
batRemove: function() { removeAll: function() {
var rows = $.common.isEmpty($.table._option.id) ? $.table.selectFirstColumns() : $.table.selectColumns($.table._option.id); var rows = $.common.isEmpty($.table._option.id) ? $.table.selectFirstColumns() : $.table.selectColumns($.table._option.id);
if (rows.length == 0) { if (rows.length == 0) {
$.modal.alertWarning("请至少选择一条记录"); $.modal.alertWarning("请至少选择一条记录");
...@@ -440,6 +440,16 @@ ...@@ -440,6 +440,16 @@
$.modal.closeLoading(); $.modal.closeLoading();
} }
}, },
// 校验封装处理
validate: {
// 判断返回标识是否唯一 false 不存在 true 存在
unique: function (value) {
if (value == "0") {
return true;
}
return false;
}
},
// 通用方法封装处理 // 通用方法封装处理
common: { common: {
// 判断字符串是否为空 // 判断字符串是否为空
......
src/main/resources/templates/include.html
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
<link th:href="@{/ajax/libs/bootstrap-treetable/bootstrap-treetable.css}" rel="stylesheet"/> <link th:href="@{/ajax/libs/bootstrap-treetable/bootstrap-treetable.css}" rel="stylesheet"/>
<link th:href="@{/css/animate.css}" rel="stylesheet"/> <link th:href="@{/css/animate.css}" rel="stylesheet"/>
<link th:href="@{/css/style.css}" rel="stylesheet"/> <link th:href="@{/css/style.css}" rel="stylesheet"/>
<link th:href="@{/css/checkbox.css}" rel="stylesheet"/>
<link th:href="@{/ajax/libs/select/select2.css}" rel="stylesheet"/> <link th:href="@{/ajax/libs/select/select2.css}" rel="stylesheet"/>
<link th:href="@{/ajax/libs/iCheck/custom.css}" rel="stylesheet"/>
<link th:href="@{/ruoyi/css/ry-ui.min.css}" rel="stylesheet"/> <link th:href="@{/ruoyi/css/ry-ui.min.css}" rel="stylesheet"/>
</head> </head>
<div th:fragment="footer"> <div th:fragment="footer">
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
<script th:src="@{/ajax/libs/bootstrap-table/extensions/export/tableExport.js}"></script> <script th:src="@{/ajax/libs/bootstrap-table/extensions/export/tableExport.js}"></script>
<!-- 遮罩层 --> <!-- 遮罩层 -->
<script th:src="@{/ajax/libs/blockUI/jquery.blockUI.js}"></script> <script th:src="@{/ajax/libs/blockUI/jquery.blockUI.js}"></script>
<script th:src="@{/ajax/libs/iCheck/icheck.min.js}"></script>
<script th:src="@{/ajax/libs/layer/layer.min.js}"></script> <script th:src="@{/ajax/libs/layer/layer.min.js}"></script>
<script th:src="@{/ajax/libs/layui/layui.js}"></script> <script th:src="@{/ajax/libs/layui/layui.js}"></script>
<script th:src="@{/ruoyi/js/common.js?v=2.3.0}"></script> <script th:src="@{/ruoyi/js/common.js?v=2.3.0}"></script>
......
src/main/resources/templates/monitor/job/add.html
...@@ -46,10 +46,10 @@ ...@@ -46,10 +46,10 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">状态：</label> <label class="col-sm-3 control-label">状态：</label>
<div class="col-sm-8" th:with="type=${@dict.getType('sys_job_status')}"> <div class="col-sm-8">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}"> <div class="radio-box" th:each="dict : ${@dict.getType('sys_job_status')}">
<input type="radio" th:id="${dict['dictCode']}" name="status" th:value="${dict['dictValue']}" th:checked="${dict['isDefault'] == 'Y' ? true : false}"> <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> <label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div> </div>
</div> </div>
</div> </div>
......
src/main/resources/templates/monitor/job/edit.html
...@@ -47,10 +47,10 @@ ...@@ -47,10 +47,10 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">状态：</label> <label class="col-sm-3 control-label">状态：</label>
<div class="col-sm-8" th:with="type=${@dict.getType('sys_job_status')}"> <div class="col-sm-8">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}"> <div class="radio-box" th:each="dict : ${@dict.getType('sys_job_status')}">
<input type="radio" th:id="${dict['dictCode']}" name="status" th:value="${dict['dictValue']}" th:field="*{status}"> <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> <label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div> </div>
</div> </div>
</div> </div>
......
src/main/resources/templates/monitor/job/job.html
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<li> <li>
任务状态：<select name="status" th:with="type=${@dict.getType('sys_job_status')}"> 任务状态：<select name="status" th:with="type=${@dict.getType('sys_job_status')}">
<option value="">所有</option> <option value="">所有</option>
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select> </select>
</li> </li>
<li> <li>
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="monitor:job:add"> <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="monitor:job:add">
<i class="fa fa-plus"></i> 新增 <i class="fa fa-plus"></i> 新增
</a> </a>
<a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="monitor:job:remove"> <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.removeAll()" shiro:hasPermission="monitor:job:remove">
<i class="fa fa-trash-o"></i> 删除 <i class="fa fa-trash-o"></i> 删除
</a> </a>
<a class="btn btn-outline btn-info btn-rounded" onclick="javascript:jobLog()" shiro:hasPermission="monitor:job:list"> <a class="btn btn-outline btn-info btn-rounded" onclick="javascript:jobLog()" shiro:hasPermission="monitor:job:list">
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
</a> </a>
</div> </div>
<div class="col-sm-12 select-info table-striped"> <div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table" data-mobile-responsive="true"></table> <table id="bootstrap-table" data-mobile-responsive="true"></table>
</div> </div>
</div> </div>
......
src/main/resources/templates/monitor/job/jobLog.html
...@@ -20,10 +20,10 @@ ...@@ -20,10 +20,10 @@
<li> <li>
<label>执行状态：</label><select name="status" th:with="type=${@dict.getType('sys_common_status')}"> <label>执行状态：</label><select name="status" th:with="type=${@dict.getType('sys_common_status')}">
<option value="">所有</option> <option value="">所有</option>
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select> </select>
</li> </li>
<li class="time"> <li class="select-time">
<label>执行时间： </label> <label>执行时间： </label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/> <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
<span>-</span> <span>-</span>
...@@ -39,12 +39,12 @@ ...@@ -39,12 +39,12 @@
</div> </div>
<div class="btn-group hidden-xs" id="toolbar" role="group"> <div class="btn-group hidden-xs" id="toolbar" role="group">
<a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="monitor:job:remove"> <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.removeAll()" shiro:hasPermission="monitor:job:remove">
<i class="fa fa-trash-o"></i> 删除 <i class="fa fa-trash-o"></i> 删除
</a> </a>
</div> </div>
<div class="col-sm-12 select-info table-striped"> <div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table" data-mobile-responsive="true"></table> <table id="bootstrap-table" data-mobile-responsive="true"></table>
</div> </div>
</div> </div>
......
src/main/resources/templates/monitor/logininfor/logininfor.html
...@@ -20,10 +20,10 @@ ...@@ -20,10 +20,10 @@
<li> <li>
<label>登录状态：</label><select name="status" th:with="type=${@dict.getType('sys_common_status')}"> <label>登录状态：</label><select name="status" th:with="type=${@dict.getType('sys_common_status')}">
<option value="">所有</option> <option value="">所有</option>
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select> </select>
</li> </li>
<li class="time"> <li class="select-time">
<label>登录时间： </label> <label>登录时间： </label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/> <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
<span>-</span> <span>-</span>
...@@ -39,12 +39,12 @@ ...@@ -39,12 +39,12 @@
</div> </div>
<div class="btn-group hidden-xs" id="toolbar" role="group"> <div class="btn-group hidden-xs" id="toolbar" role="group">
<a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="monitor:logininfor:remove"> <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.removeAll()" shiro:hasPermission="monitor:logininfor:remove">
<i class="fa fa-trash-o"></i> 删除 <i class="fa fa-trash-o"></i> 删除
</a> </a>
</div> </div>
<div class="col-sm-12 select-info table-striped"> <div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table" data-mobile-responsive="true"></table> <table id="bootstrap-table" data-mobile-responsive="true"></table>
</div> </div>
</div> </div>
......
src/main/resources/templates/monitor/online/online.html
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
</a> </a>
</div> </div>
<div class="col-sm-12 select-info table-striped"> <div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table" data-mobile-responsive="true"></table> <table id="bootstrap-table" data-mobile-responsive="true"></table>
</div> </div>
</div> </div>
......
src/main/resources/templates/monitor/operlog/operlog.html
...@@ -20,10 +20,10 @@ ...@@ -20,10 +20,10 @@
<li> <li>
<label>操作类型： </label><select name="businessType" th:with="type=${@dict.getType('sys_oper_type')}"> <label>操作类型： </label><select name="businessType" th:with="type=${@dict.getType('sys_oper_type')}">
<option value="">所有</option> <option value="">所有</option>
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select> </select>
</li> </li>
<li class="time"> <li class="select-time">
<label>操作时间： </label> <label>操作时间： </label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/> <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
<span>-</span> <span>-</span>
...@@ -39,12 +39,12 @@ ...@@ -39,12 +39,12 @@
</div> </div>
<div class="btn-group hidden-xs" id="toolbar" role="group"> <div class="btn-group hidden-xs" id="toolbar" role="group">
<a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="monitor:logininfor:remove"> <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.removeAll()" shiro:hasPermission="monitor:logininfor:remove">
<i class="fa fa-trash-o"></i> 删除 <i class="fa fa-trash-o"></i> 删除
</a> </a>
</div> </div>
<div class="col-sm-12 select-info table-striped"> <div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table" data-mobile-responsive="true"></table> <table id="bootstrap-table" data-mobile-responsive="true"></table>
</div> </div>
</div> </div>
......
src/main/resources/templates/system/config/add.html
...@@ -25,10 +25,10 @@ ...@@ -25,10 +25,10 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">系统内置：</label> <label class="col-sm-3 control-label">系统内置：</label>
<div class="col-sm-8" th:with="type=${@dict.getType('sys_yes_no')}"> <div class="col-sm-8">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}"> <div class="radio-box" th:each="dict : ${@dict.getType('sys_yes_no')}">
<input type="radio" th:id="${dict['dictCode']}" name="configType" th:value="${dict['dictValue']}" th:checked="${dict['isDefault'] == 'Y' ? true : false}"> <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> <label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div> </div>
</div> </div>
</div> </div>
...@@ -60,12 +60,11 @@ ...@@ -60,12 +60,11 @@
dataType: "json", dataType: "json",
data: { data: {
"configKey": function() { "configKey": function() {
return $("input[name='configKey']").val(); return $.common.trim($("#configKey").val());
} }
}, },
dataFilter: function(data, type) { dataFilter: function(data, type) {
if (data == "0") return true; return $.validate.unique(data);
else return false;
} }
} }
}, },
......
src/main/resources/templates/system/config/config.html
...@@ -19,10 +19,10 @@ ...@@ -19,10 +19,10 @@
<li> <li>
系统内置：<select name="configType" th:with="type=${@dict.getType('sys_yes_no')}"> 系统内置：<select name="configType" th:with="type=${@dict.getType('sys_yes_no')}">
<option value="">所有</option> <option value="">所有</option>
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select> </select>
</li> </li>
<li class="time"> <li class="select-time">
<label>创建时间： </label> <label>创建时间： </label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/> <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
<span>-</span> <span>-</span>
...@@ -41,11 +41,11 @@ ...@@ -41,11 +41,11 @@
<a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="system:config:add"> <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="system:config:add">
<i class="fa fa-plus"></i> 新增 <i class="fa fa-plus"></i> 新增
</a> </a>
<a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="system:config:remove"> <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.removeAll()" shiro:hasPermission="system:config:remove">
<i class="fa fa-trash-o"></i> 删除 <i class="fa fa-trash-o"></i> 删除
</a> </a>
</div> </div>
<div class="col-sm-12 select-info table-striped"> <div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table" data-mobile-responsive="true"></table> <table id="bootstrap-table" data-mobile-responsive="true"></table>
</div> </div>
</div> </div>
......
src/main/resources/templates/system/config/edit.html
...@@ -26,10 +26,10 @@ ...@@ -26,10 +26,10 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">系统内置：</label> <label class="col-sm-3 control-label">系统内置：</label>
<div class="col-sm-8" th:with="type=${@dict.getType('sys_yes_no')}"> <div class="col-sm-8">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}"> <div class="radio-box" th:each="dict : ${@dict.getType('sys_yes_no')}">
<input type="radio" th:id="${dict['dictCode']}" name="configType" th:value="${dict['dictValue']}" th:field="*{configType}"> <input type="radio" th:id="${dict.dictCode}" name="configType" th:value="${dict.dictValue}" th:field="*{configType}">
<label th:for="${dict['dictCode']}" th:text="${dict['dictLabel']}"></label> <label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div> </div>
</div> </div>
</div> </div>
...@@ -61,15 +61,14 @@ ...@@ -61,15 +61,14 @@
dataType: "json", dataType: "json",
data: { data: {
"configId": function() { "configId": function() {
return $("input[name='configId']").val(); return $("#configId").val();
}, },
"configKey": function() { "configKey": function() {
return $("input[name='configKey']").val(); return $.common.trim($("#configKey").val());
} }
}, },
dataFilter: function(data, type) { dataFilter: function(data, type) {
if (data == "0") return true; return $.validate.unique(data);
else return false;
} }
} }
}, },
......
src/main/resources/templates/system/dept/add.html
...@@ -44,10 +44,10 @@ ...@@ -44,10 +44,10 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">部门状态：</label> <label class="col-sm-3 control-label">部门状态：</label>
<div class="col-sm-8" th:with="type=${@dict.getType('sys_normal_disable')}"> <div class="col-sm-8">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}"> <div class="radio-box" th:each="dict : ${@dict.getType('sys_normal_disable')}">
<input type="radio" th:id="${dict['dictCode']}" name="status" th:value="${dict['dictValue']}" th:checked="${dict['isDefault'] == 'Y' ? true : false}"> <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> <label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div> </div>
</div> </div>
</div> </div>
...@@ -74,12 +74,11 @@ ...@@ -74,12 +74,11 @@
dataType: "json", dataType: "json",
data: { data: {
"deptName" : function() { "deptName" : function() {
return $("input[name='deptName']").val(); return $.common.trim($("#deptName").val());
} }
}, },
dataFilter: function(data, type) { dataFilter: function(data, type) {
if (data == "0") return true; return $.validate.unique(data);
else return false;
} }
} }
}, },
......
src/main/resources/templates/system/dept/dept.html
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<li> <li>
部门状态：<select name="status" th:with="type=${@dict.getType('sys_normal_disable')}"> 部门状态：<select name="status" th:with="type=${@dict.getType('sys_normal_disable')}">
<option value="">所有</option> <option value="">所有</option>
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select> </select>
</li> </li>
<li> <li>
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<i class="fa fa-plus"></i> 新增 <i class="fa fa-plus"></i> 新增
</a> </a>
</div> </div>
<div class="col-sm-12 select-info table-striped"> <div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table" data-mobile-responsive="true"></table> <table id="bootstrap-table" data-mobile-responsive="true"></table>
</div> </div>
</div> </div>
......
src/main/resources/templates/system/dept/edit.html
...@@ -45,10 +45,10 @@ ...@@ -45,10 +45,10 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">部门状态：</label> <label class="col-sm-3 control-label">部门状态：</label>
<div class="col-sm-8" th:with="type=${@dict.getType('sys_normal_disable')}"> <div class="col-sm-8">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}"> <div class="radio-box" th:each="dict : ${@dict.getType('sys_normal_disable')}">
<input type="radio" th:id="${dict['dictCode']}" name="status" th:value="${dict['dictValue']}" th:field="*{status}"> <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> <label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div> </div>
</div> </div>
</div> </div>
...@@ -74,15 +74,14 @@ ...@@ -74,15 +74,14 @@
dataType: "json", dataType: "json",
data: { data: {
"deptId": function() { "deptId": function() {
return $("input[name='deptId']").val(); return $.common.trim($("#deptId").val());
}, },
"deptName": function() { "deptName": function() {
return $("input[name='deptName']").val(); return $.common.trim($("#deptName").val());
} }
}, },
dataFilter: function(data, type) { dataFilter: function(data, type) {
if (data == "0") return true; return $.validate.unique(data);
else return false;
} }
} }
}, },
......
src/main/resources/templates/system/dict/data/add.html
...@@ -30,6 +30,12 @@ ...@@ -30,6 +30,12 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">字典排序：</label>
<div class="col-sm-8">
<input class="form-control" type="text" name="dictSort">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">回显样式：</label> <label class="col-sm-3 control-label">回显样式：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select name="listClass" class="form-control m-b"> <select name="listClass" class="form-control m-b">
...@@ -41,29 +47,24 @@ ...@@ -41,29 +47,24 @@
<option value="warning">警告</option> <option value="warning">警告</option>
<option value="danger"> 危险</option> <option value="danger"> 危险</option>
</select> </select>
<span class="help-block m-b-none"><i class="fa fa-info-circle"></i> table表格字典列显示样式属性</span>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">系统默认：</label> <label class="col-sm-3 control-label">系统默认：</label>
<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>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">字典排序：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" type="text" name="dictSort"> <div class="radio-box" th:each="dict : ${@dict.getType('sys_yes_no')}">
<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>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">状态：</label> <label class="col-sm-3 control-label">状态：</label>
<div class="col-sm-8" th:with="type=${@dict.getType('sys_normal_disable')}"> <div class="col-sm-8">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}"> <div class="radio-box" th:each="dict : ${@dict.getType('sys_normal_disable')}">
<input type="radio" th:id="${dict['dictCode']}" name="status" th:value="${dict['dictValue']}" th:checked="${dict['isDefault'] == 'Y' ? true : false}"> <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> <label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div> </div>
</div> </div>
</div> </div>
......
src/main/resources/templates/system/dict/data/data.html
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<li> <li>
数据状态：<select name="status" th:with="type=${@dict.getType('sys_normal_disable')}"> 数据状态：<select name="status" th:with="type=${@dict.getType('sys_normal_disable')}">
<option value="">所有</option> <option value="">所有</option>
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select> </select>
</li> </li>
<li> <li>
...@@ -38,12 +38,12 @@ ...@@ -38,12 +38,12 @@
<a class="btn btn-outline btn-success btn-rounded" th:onclick="'javascript:$.operate.add(\''+${dict.dictType}+'\')'" shiro:hasPermission="system:dict:add"> <a class="btn btn-outline btn-success btn-rounded" th:onclick="'javascript:$.operate.add(\''+${dict.dictType}+'\')'" shiro:hasPermission="system:dict:add">
<i class="fa fa-plus"></i> 新增 <i class="fa fa-plus"></i> 新增
</a> </a>
<a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="system:dict:remove"> <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.removeAll()" shiro:hasPermission="system:dict:remove">
<i class="fa fa-trash-o"></i> 删除 <i class="fa fa-trash-o"></i> 删除
</a> </a>
</div> </div>
<div class="col-sm-12 select-info table-striped"> <div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table" data-mobile-responsive="true"></table> <table id="bootstrap-table" data-mobile-responsive="true"></table>
</div> </div>
</div> </div>
......
src/main/resources/templates/system/dict/data/edit.html
...@@ -31,6 +31,12 @@ ...@@ -31,6 +31,12 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">字典排序：</label>
<div class="col-sm-8">
<input class="form-control" type="text" name="dictSort" th:field="*{dictSort}">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">回显样式：</label> <label class="col-sm-3 control-label">回显样式：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select name="listClass" class="form-control m-b"> <select name="listClass" class="form-control m-b">
...@@ -42,29 +48,24 @@ ...@@ -42,29 +48,24 @@
<option value="warning" th:field="*{listClass}">警告</option> <option value="warning" th:field="*{listClass}">警告</option>
<option value="danger" th:field="*{listClass}">危险</option> <option value="danger" th:field="*{listClass}">危险</option>
</select> </select>
<span class="help-block m-b-none"><i class="fa fa-info-circle"></i> table表格字典列显示样式属性</span>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">系统默认：</label> <label class="col-sm-3 control-label">系统默认：</label>
<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>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">字典排序：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" type="text" name="dictSort" th:field="*{dictSort}"> <div class="radio-box" th:each="dict : ${@dict.getType('sys_yes_no')}">
<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>
</div>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">状态：</label> <label class="col-sm-3 control-label">状态：</label>
<div class="col-sm-8" th:with="type=${@dict.getType('sys_normal_disable')}"> <div class="col-sm-8">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}"> <div class="radio-box" th:each="dict : ${@dict.getType('sys_normal_disable')}">
<input type="radio" th:id="${dict['dictCode']}" name="status" th:value="${dict['dictValue']}" th:field="*{status}"> <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> <label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div> </div>
</div> </div>
</div> </div>
......
src/main/resources/templates/system/dict/type/add.html
...@@ -19,10 +19,10 @@ ...@@ -19,10 +19,10 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">状态：</label> <label class="col-sm-3 control-label">状态：</label>
<div class="col-sm-8" th:with="type=${@dict.getType('sys_normal_disable')}"> <div class="col-sm-8">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}"> <div class="radio-box" th:each="dict : ${@dict.getType('sys_normal_disable')}">
<input type="radio" th:id="${dict['dictCode']}" name="status" th:value="${dict['dictValue']}" th:checked="${dict['isDefault'] == 'Y' ? true : false}"> <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> <label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div> </div>
</div> </div>
</div> </div>
...@@ -59,12 +59,11 @@ ...@@ -59,12 +59,11 @@
dataType: "json", dataType: "json",
data: { data: {
name : function() { name : function() {
return $.trim($("#dictType").val()); return $.common.trim($("#dictType").val());
} }
}, },
dataFilter: function(data, type) { dataFilter: function(data, type) {
if (data == "0") return true; return $.validate.unique(data);
else return false;
} }
} }
}, },
......
src/main/resources/templates/system/dict/type/edit.html
...@@ -20,10 +20,10 @@ ...@@ -20,10 +20,10 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">状态：</label> <label class="col-sm-3 control-label">状态：</label>
<div class="col-sm-8" th:with="type=${@dict.getType('sys_normal_disable')}"> <div class="col-sm-8">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}"> <div class="radio-box" th:each="dict : ${@dict.getType('sys_normal_disable')}">
<input type="radio" th:id="${dict['dictCode']}" name="status" th:value="${dict['dictValue']}" th:field="*{status}"> <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> <label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div> </div>
</div> </div>
</div> </div>
...@@ -60,15 +60,14 @@ ...@@ -60,15 +60,14 @@
dataType: "json", dataType: "json",
data: { data: {
dictId : function() { dictId : function() {
return $.trim($("#dictId").val()); return $("#dictId").val();
}, },
dictType : function() { dictType : function() {
return $.trim($("#dictType").val()); return $.common.trim($("#dictType").val());
} }
}, },
dataFilter: function(data, type) { dataFilter: function(data, type) {
if (data == "0") return true; return $.validate.unique(data);
else return false;
} }
} }
}, },
......
src/main/resources/templates/system/dict/type/type.html
...@@ -20,10 +20,10 @@ ...@@ -20,10 +20,10 @@
<li> <li>
字典状态：<select name="status" th:with="type=${@dict.getType('sys_normal_disable')}"> 字典状态：<select name="status" th:with="type=${@dict.getType('sys_normal_disable')}">
<option value="">所有</option> <option value="">所有</option>
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select> </select>
</li> </li>
<li class="time"> <li class="select-time">
<label>创建时间： </label> <label>创建时间： </label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/> <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
<span>-</span> <span>-</span>
...@@ -42,12 +42,12 @@ ...@@ -42,12 +42,12 @@
<a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="system:dict:add"> <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="system:dict:add">
<i class="fa fa-plus"></i> 新增 <i class="fa fa-plus"></i> 新增
</a> </a>
<a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="system:dict:remove"> <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.removeAll()" shiro:hasPermission="system:dict:remove">
<i class="fa fa-trash-o"></i> 删除 <i class="fa fa-trash-o"></i> 删除
</a> </a>
</div> </div>
<div class="col-sm-12 select-info table-striped"> <div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table" data-mobile-responsive="true"></table> <table id="bootstrap-table" data-mobile-responsive="true"></table>
</div> </div>
</div> </div>
......
src/main/resources/templates/system/menu/add.html
...@@ -58,10 +58,10 @@ ...@@ -58,10 +58,10 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">菜单状态：</label> <label class="col-sm-3 control-label">菜单状态：</label>
<div class="col-sm-8" th:with="type=${@dict.getType('sys_show_hide')}"> <div class="col-sm-8">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}"> <div class="radio-box" th:each="dict : ${@dict.getType('sys_show_hide')}">
<input type="radio" th:id="${dict['dictCode']}" name="visible" th:value="${dict['dictValue']}" th:checked="${dict['isDefault'] == 'Y' ? true : false}"> <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> <label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div> </div>
</div> </div>
</div> </div>
...@@ -90,12 +90,11 @@ ...@@ -90,12 +90,11 @@
dataType: "json", dataType: "json",
data: { data: {
"menuName" : function() { "menuName" : function() {
return $.trim($("#menuName").val()); return $.common.trim($("#menuName").val());
} }
}, },
dataFilter: function(data, type) { dataFilter: function(data, type) {
if (data == "0") return true; return $.validate.unique(data);
else return false;
} }
} }
}, },
......
src/main/resources/templates/system/menu/edit.html
...@@ -59,10 +59,10 @@ ...@@ -59,10 +59,10 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">菜单状态：</label> <label class="col-sm-3 control-label">菜单状态：</label>
<div class="col-sm-8" th:with="type=${@dict.getType('sys_show_hide')}"> <div class="col-sm-8">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}"> <div class="radio-box" th:each="dict : ${@dict.getType('sys_show_hide')}">
<input type="radio" th:id="${dict['dictCode']}" name="visible" th:value="${dict['dictValue']}" th:field="*{visible}"> <input type="radio" th:id="${dict.dictCode}" name="visible" th:value="${dict.dictValue}" th:field="*{visible}">
<label th:for="${dict['dictCode']}" th:text="${dict['dictLabel']}"></label> <label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div> </div>
</div> </div>
</div> </div>
...@@ -97,15 +97,14 @@ ...@@ -97,15 +97,14 @@
dataType: "json", dataType: "json",
data: { data: {
"menuId": function() { "menuId": function() {
return $("input[name='menuId']").val(); return $("#menuId").val();
}, },
"menuName": function() { "menuName": function() {
return $("input[name='menuName']").val(); return $.common.trim($("#menuName").val());
} }
}, },
dataFilter: function(data, type) { dataFilter: function(data, type) {
if (data == "0") return true; return $.validate.unique(data);
else return false;
} }
} }
}, },
......
src/main/resources/templates/system/menu/menu.html
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<li> <li>
菜单状态：<select name="visible" th:with="type=${@dict.getType('sys_show_hide')}"> 菜单状态：<select name="visible" th:with="type=${@dict.getType('sys_show_hide')}">
<option value="">所有</option> <option value="">所有</option>
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select> </select>
</li> </li>
<li> <li>
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<i class="fa fa-plus"></i> 新增 <i class="fa fa-plus"></i> 新增
</a> </a>
</div> </div>
<div class="col-sm-12 select-info table-striped"> <div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table" data-mobile-responsive="true"></table> <table id="bootstrap-table" data-mobile-responsive="true"></table>
</div> </div>
</div> </div>
......
src/main/resources/templates/system/notice/add.html
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<label class="col-sm-3 control-label">公告类型：</label> <label class="col-sm-3 control-label">公告类型：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select name="noticeType" class="form-control m-b" th:with="type=${@dict.getType('sys_notice_type')}"> <select name="noticeType" class="form-control m-b" th:with="type=${@dict.getType('sys_notice_type')}">
<option th:each="dict : ${type}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select> </select>
</div> </div>
</div> </div>
...@@ -30,10 +30,10 @@ ...@@ -30,10 +30,10 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">公告状态：</label> <label class="col-sm-3 control-label">公告状态：</label>
<div class="col-sm-8" th:with="type=${@dict.getType('sys_notice_status')}"> <div class="col-sm-8">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}"> <div class="radio-box" th:each="dict : ${@dict.getType('sys_notice_status')}">
<input type="radio" th:id="${dict['dictCode']}" name="status" th:value="${dict['dictValue']}" th:checked="${dict['isDefault'] == 'Y' ? true : false}"> <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> <label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div> </div>
</div> </div>
</div> </div>
......
src/main/resources/templates/system/notice/edit.html
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<label class="col-sm-3 control-label">公告类型：</label> <label class="col-sm-3 control-label">公告类型：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select name="noticeType" class="form-control m-b" th:with="type=${@dict.getType('sys_notice_type')}"> <select name="noticeType" class="form-control m-b" th:with="type=${@dict.getType('sys_notice_type')}">
<option th:each="dict : ${type}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}" th:field="*{noticeType}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{noticeType}"></option>
</select> </select>
</div> </div>
</div> </div>
...@@ -31,10 +31,10 @@ ...@@ -31,10 +31,10 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">公告状态：</label> <label class="col-sm-3 control-label">公告状态：</label>
<div class="col-sm-8" th:with="type=${@dict.getType('sys_notice_status')}"> <div class="col-sm-8">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}"> <div class="radio-box" th:each="dict : ${@dict.getType('sys_notice_status')}">
<input type="radio" th:id="${dict['dictCode']}" name="status" th:value="${dict['dictValue']}" th:field="*{status}"> <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> <label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div> </div>
</div> </div>
</div> </div>
......
src/main/resources/templates/system/notice/notice.html
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<li> <li>
公告类型：<select name="noticeType" th:with="type=${@dict.getType('sys_notice_type')}"> 公告类型：<select name="noticeType" th:with="type=${@dict.getType('sys_notice_type')}">
<option value="">所有</option> <option value="">所有</option>
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select> </select>
</li> </li>
<li> <li>
...@@ -34,12 +34,12 @@ ...@@ -34,12 +34,12 @@
<a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.addFull()" shiro:hasPermission="system:notice:add"> <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.addFull()" shiro:hasPermission="system:notice:add">
<i class="fa fa-plus"></i> 新增 <i class="fa fa-plus"></i> 新增
</a> </a>
<a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="system:notice:remove"> <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.removeAll()" shiro:hasPermission="system:notice:remove">
<i class="fa fa-trash-o"></i> 删除 <i class="fa fa-trash-o"></i> 删除
</a> </a>
</div> </div>
<div class="col-sm-12 select-info table-striped"> <div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table" data-mobile-responsive="true"></table> <table id="bootstrap-table" data-mobile-responsive="true"></table>
</div> </div>
</div> </div>
......
src/main/resources/templates/system/post/add.html
...@@ -25,10 +25,10 @@ ...@@ -25,10 +25,10 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">岗位状态：</label> <label class="col-sm-3 control-label">岗位状态：</label>
<div class="col-sm-8" th:with="type=${@dict.getType('sys_normal_disable')}"> <div class="col-sm-8">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}"> <div class="radio-box" th:each="dict : ${@dict.getType('sys_normal_disable')}">
<input type="radio" th:id="${dict['dictCode']}" name="status" th:value="${dict['dictValue']}" th:checked="${dict['isDefault'] == 'Y' ? true : false}"> <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> <label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div> </div>
</div> </div>
</div> </div>
...@@ -60,12 +60,11 @@ ...@@ -60,12 +60,11 @@
dataType: "json", dataType: "json",
data: { data: {
"postName" : function() { "postName" : function() {
return $.trim($("#postName").val()); return $.common.trim($("#postName").val());
} }
}, },
dataFilter: function(data, type) { dataFilter: function(data, type) {
if (data == "0") return true; return $.validate.unique(data);
else return false;
} }
} }
}, },
...@@ -77,12 +76,11 @@ ...@@ -77,12 +76,11 @@
dataType: "json", dataType: "json",
data: { data: {
"postCode" : function() { "postCode" : function() {
return $.trim($("#postCode").val()); return $.common.trim($("#postCode").val());
} }
}, },
dataFilter: function(data, type) { dataFilter: function(data, type) {
if (data == "0") return true; return $.validate.unique(data);
else return false;
} }
} }
}, },
......
src/main/resources/templates/system/post/edit.html
...@@ -26,10 +26,10 @@ ...@@ -26,10 +26,10 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">岗位状态：</label> <label class="col-sm-3 control-label">岗位状态：</label>
<div class="col-sm-8" th:with="type=${@dict.getType('sys_normal_disable')}"> <div class="col-sm-8">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}"> <div class="radio-box" th:each="dict : ${@dict.getType('sys_normal_disable')}">
<input type="radio" th:id="${dict['dictCode']}" name="status" th:value="${dict['dictValue']}" th:field="*{status}"> <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> <label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div> </div>
</div> </div>
</div> </div>
...@@ -64,12 +64,11 @@ ...@@ -64,12 +64,11 @@
return $("input[name='postId']").val(); return $("input[name='postId']").val();
}, },
"postName" : function() { "postName" : function() {
return $.trim($("#postName").val()); return $.common.trim($("#postName").val());
} }
}, },
dataFilter: function(data, type) { dataFilter: function(data, type) {
if (data == "0") return true; return $.validate.unique(data);
else return false;
} }
} }
}, },
...@@ -84,12 +83,11 @@ ...@@ -84,12 +83,11 @@
return $("input[name='postId']").val(); return $("input[name='postId']").val();
}, },
"postCode" : function() { "postCode" : function() {
return $.trim($("#postCode").val()); return $.common.trim($("#postCode").val());
} }
}, },
dataFilter: function(data, type) { dataFilter: function(data, type) {
if (data == "0") return true; return $.validate.unique(data);
else return false;
} }
} }
}, },
......
src/main/resources/templates/system/post/post.html
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<li> <li>
岗位状态：<select name="status" th:with="type=${@dict.getType('sys_normal_disable')}"> 岗位状态：<select name="status" th:with="type=${@dict.getType('sys_normal_disable')}">
<option value="">所有</option> <option value="">所有</option>
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select> </select>
</li> </li>
<li> <li>
...@@ -36,12 +36,12 @@ ...@@ -36,12 +36,12 @@
<a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="system:post:add"> <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="system:post:add">
<i class="fa fa-plus"></i> 新增 <i class="fa fa-plus"></i> 新增
</a> </a>
<a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="system:post:remove"> <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.removeAll()" shiro:hasPermission="system:post:remove">
<i class="fa fa-trash-o"></i> 删除 <i class="fa fa-trash-o"></i> 删除
</a> </a>
</div> </div>
<div class="col-sm-12 select-info table-striped"> <div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table" data-mobile-responsive="true"></table> <table id="bootstrap-table" data-mobile-responsive="true"></table>
</div> </div>
</div> </div>
......
src/main/resources/templates/system/role/add.html
...@@ -87,12 +87,11 @@ ...@@ -87,12 +87,11 @@
dataType: "json", dataType: "json",
data: { data: {
"roleName" : function() { "roleName" : function() {
return $.trim($("#roleName").val()); return $.common.trim($("#roleName").val());
} }
}, },
dataFilter: function(data, type) { dataFilter: function(data, type) {
if (data == "0") return true; return $.validate.unique(data);
else return false;
} }
} }
}, },
...@@ -104,12 +103,11 @@ ...@@ -104,12 +103,11 @@
dataType: "json", dataType: "json",
data: { data: {
"roleName" : function() { "roleName" : function() {
return $.trim($("#roleName").val()); return $.common.trim($("#roleName").val());
} }
}, },
dataFilter: function(data, type) { dataFilter: function(data, type) {
if (data == "0") return true; return $.validate.unique(data);
else return false;
} }
} }
}, },
......
src/main/resources/templates/system/role/edit.html
...@@ -88,15 +88,14 @@ ...@@ -88,15 +88,14 @@
dataType: "json", dataType: "json",
data: { data: {
"roleId": function() { "roleId": function() {
return $("input[name='roleId']").val(); return $("#roleId").val();
}, },
"roleName": function() { "roleName": function() {
return $("input[name='roleName']").val(); return $.common.trim($("#roleName").val());
} }
}, },
dataFilter: function(data, type) { dataFilter: function(data, type) {
if (data == "0") return true; return $.validate.unique(data);
else return false;
} }
} }
}, },
...@@ -108,15 +107,14 @@ ...@@ -108,15 +107,14 @@
dataType: "json", dataType: "json",
data: { data: {
"roleId": function() { "roleId": function() {
return $("input[name='roleId']").val(); return $("#roleId").val();
}, },
"roleKey": function() { "roleKey": function() {
return $("input[name='roleKey']").val(); return $.common.trim($("#roleKey").val());
} }
}, },
dataFilter: function(data, type) { dataFilter: function(data, type) {
if (data == "0") return true; return $.validate.unique(data);
else return false;
} }
} }
}, },
......
src/main/resources/templates/system/role/role.html
...@@ -20,10 +20,10 @@ ...@@ -20,10 +20,10 @@
<li> <li>
角色状态：<select name="status" th:with="type=${@dict.getType('sys_normal_disable')}"> 角色状态：<select name="status" th:with="type=${@dict.getType('sys_normal_disable')}">
<option value="">所有</option> <option value="">所有</option>
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select> </select>
</li> </li>
<li class="time"> <li class="select-time">
<label>创建时间： </label> <label>创建时间： </label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/> <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
<span>-</span> <span>-</span>
...@@ -42,12 +42,12 @@ ...@@ -42,12 +42,12 @@
<a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="system:role:add"> <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="system:role:add">
<i class="fa fa-plus"></i> 新增 <i class="fa fa-plus"></i> 新增
</a> </a>
<a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="system:role:remove"> <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.removeAll()" shiro:hasPermission="system:role:remove">
<i class="fa fa-trash-o"></i> 删除 <i class="fa fa-trash-o"></i> 删除
</a> </a>
</div> </div>
<div class="col-sm-12 select-info table-striped"> <div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table" data-mobile-responsive="true"></table> <table id="bootstrap-table" data-mobile-responsive="true"></table>
</div> </div>
</div> </div>
......
src/main/resources/templates/system/user/add.html
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
<label class="col-sm-3 control-label">性别：</label> <label class="col-sm-3 control-label">性别：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select id="sex" class="form-control m-b" th:with="type=${@dict.getType('sys_user_sex')}"> <select id="sex" class="form-control m-b" th:with="type=${@dict.getType('sys_user_sex')}">
<option th:each="dict : ${type}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select> </select>
</div> </div>
</div> </div>
...@@ -105,12 +105,11 @@ ...@@ -105,12 +105,11 @@
dataType: "json", dataType: "json",
data: { data: {
name : function() { name : function() {
return $.trim($("#loginName").val()); return $.common.trim($("#loginName").val());
} }
}, },
dataFilter: function(data, type) { dataFilter: function(data, type) {
if (data == "0") return true; return $.validate.unique(data);
else return false;
} }
} }
}, },
...@@ -134,12 +133,11 @@ ...@@ -134,12 +133,11 @@
dataType: "json", dataType: "json",
data: { data: {
name: function () { name: function () {
return $.trim($("#email").val()); return $.common.trim($("#email").val());
} }
}, },
dataFilter: function (data, type) { dataFilter: function (data, type) {
if (data == "0") return true; return $.validate.unique(data);
else return false;
} }
} }
}, },
...@@ -152,12 +150,11 @@ ...@@ -152,12 +150,11 @@
dataType: "json", dataType: "json",
data: { data: {
name: function () { name: function () {
return $.trim($("#phonenumber").val()); return $.common.trim($("#phonenumber").val());
} }
}, },
dataFilter: function (data, type) { dataFilter: function (data, type) {
if (data == "0") return true; return $.validate.unique(data);
else return false;
} }
} }
}, },
......
src/main/resources/templates/system/user/edit.html
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<label class="col-sm-3 control-label">性别：</label> <label class="col-sm-3 control-label">性别：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select id="sex" class="form-control m-b" th:with="type=${@dict.getType('sys_user_sex')}"> <select id="sex" class="form-control m-b" th:with="type=${@dict.getType('sys_user_sex')}">
<option th:each="dict : ${type}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}" th:field="*{sex}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{sex}"></option>
</select> </select>
</div> </div>
</div> </div>
...@@ -105,15 +105,14 @@ ...@@ -105,15 +105,14 @@
dataType: "json", dataType: "json",
data: { data: {
"userId": function() { "userId": function() {
return $("input[name='userId']").val(); return $("#userId").val();
}, },
"email": function() { "email": function() {
return $("input[name='email']").val(); return $.common.trim($("#email").val());
} }
}, },
dataFilter: function (data, type) { dataFilter: function (data, type) {
if (data == "0") return true; return $.validate.unique(data);
else return false;
} }
} }
}, },
...@@ -126,15 +125,14 @@ ...@@ -126,15 +125,14 @@
dataType: "json", dataType: "json",
data: { data: {
"userId": function() { "userId": function() {
return $("input[name='userId']").val(); return $("#userId").val();
}, },
"phonenumber": function() { "phonenumber": function() {
return $("input[name='phonenumber']").val(); return $.common.trim($("#phonenumber").val());
} }
}, },
dataFilter: function (data, type) { dataFilter: function (data, type) {
if (data == "0") return true; return $.validate.unique(data);
else return false;
} }
} }
}, },
......
src/main/resources/templates/system/user/profile/edit.html
...@@ -74,15 +74,14 @@ ...@@ -74,15 +74,14 @@
dataType: "json", dataType: "json",
data: { data: {
"userId": function() { "userId": function() {
return $("input[name='userId']").val(); return $("#userId").val();
}, },
"email": function() { "email": function() {
return $("input[name='email']").val(); return $.common.trim($("#email").val());
} }
}, },
dataFilter: function (data, type) { dataFilter: function (data, type) {
if (data == "0") return true; return $.validate.unique(data);
else return false;
} }
} }
}, },
...@@ -95,15 +94,14 @@ ...@@ -95,15 +94,14 @@
dataType: "json", dataType: "json",
data: { data: {
"userId": function() { "userId": function() {
return $("input[name='userId']").val(); return $("#userId").val();
}, },
"phonenumber": function() { "phonenumber": function() {
return $("input[name='phonenumber']").val(); return $.common.trim($("#phonenumber").val());
} }
}, },
dataFilter: function (data, type) { dataFilter: function (data, type) {
if (data == "0") return true; return $.validate.unique(data);
else return false;
} }
} }
}, },
......
src/main/resources/templates/system/user/profile/resetPwd.html
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
<label class="col-sm-3 control-label">再次确认：</label> <label class="col-sm-3 control-label">再次确认：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" type="password" name="confirm" id="confirm"> <input class="form-control" type="password" name="confirm" id="confirm">
<span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 请再次输入您的密码</span>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
......
src/main/resources/templates/system/user/user.html
...@@ -45,10 +45,10 @@ ...@@ -45,10 +45,10 @@
<li> <li>
用户状态：<select name="status" th:with="type=${@dict.getType('sys_normal_disable')}"> 用户状态：<select name="status" th:with="type=${@dict.getType('sys_normal_disable')}">
<option value="">所有</option> <option value="">所有</option>
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select> </select>
</li> </li>
<li class="time"> <li class="select-time">
<label>创建时间： </label> <label>创建时间： </label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/> <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
<span>-</span> <span>-</span>
...@@ -67,12 +67,12 @@ ...@@ -67,12 +67,12 @@
<a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="system:user:add"> <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="system:user:add">
<i class="fa fa-plus"></i> 新增 <i class="fa fa-plus"></i> 新增
</a> </a>
<a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="system:user:remove"> <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.removeAll()" shiro:hasPermission="system:user:remove">
<i class="fa fa-trash-o"></i> 删除 <i class="fa fa-trash-o"></i> 删除
</a> </a>
</div> </div>
<div class="col-sm-12 select-info table-striped"> <div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table" data-mobile-responsive="true"></table> <table id="bootstrap-table" data-mobile-responsive="true"></table>
</div> </div>
</div> </div>
......
src/main/resources/templates/tool/gen/gen.html
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<li> <li>
表描述：<input type="text" name="tableComment"/> 表描述：<input type="text" name="tableComment"/>
</li> </li>
<li class="time"> <li class="select-time">
<label>表时间： </label> <label>表时间： </label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/> <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
<span>-</span> <span>-</span>
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
</a> </a>
</div> </div>
<div class="col-sm-12 select-info table-striped"> <div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table" data-mobile-responsive="true"></table> <table id="bootstrap-table" data-mobile-responsive="true"></table>
</div> </div>
</div> </div>
......
src/main/resources/templates/vm/html/list.html.vm
...@@ -8,12 +8,12 @@ ...@@ -8,12 +8,12 @@
<a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="${moduleName}:${classname}:add"> <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="${moduleName}:${classname}:add">
<i class="fa fa-plus"></i> 新增 <i class="fa fa-plus"></i> 新增
</a> </a>
<a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="${moduleName}:${classname}:remove"> <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.removeAll()" shiro:hasPermission="${moduleName}:${classname}:remove">
<i class="fa fa-trash-o"></i> 删除 <i class="fa fa-trash-o"></i> 删除
</a> </a>
</div> </div>
<div class="col-sm-12 select-info table-striped"> <div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table" data-mobile-responsive="true"></table> <table id="bootstrap-table" data-mobile-responsive="true"></table>
</div> </div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment