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

课程相关优化以及封装的table

This commit is contained in:
zhujj 2019-01-10 11:28:38 +08:00
parent 6195d3df56
commit b012e228f7
6 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
View File

@ -13,7 +13,23 @@
// 初始化表格参数
init: function(options) {
$.table._option = options;
$.table._params = $.common.isEmpty(options.queryParams) ? $.table.queryParams : options.queryParams;
//和search查询时条件保持一直
var currentId = $.common.isEmpty(options.formId) ? $('form').attr('id') : options.formId;
$.table._params = function(params) {
var search = {};
$.each($("#" + currentId).serializeArray(), function(i, field) {
search[field.name] = field.value;
});
search.pageSize = params.limit;
search.pageNum = params.offset / params.limit + 1;
search.searchValue = params.search;
search.orderByColumn = params.sort;
search.isAsc = params.order;
return search;
}
// $.table._params = $.common.isEmpty(options.queryParams) ? $.table.queryParams : options.queryParams;
_sortOrder = $.common.isEmpty(options.sortOrder) ? "asc" : options.sortOrder;
_sortName = $.common.isEmpty(options.sortName) ? "" : options.sortName;
_striped = $.common.isEmpty(options.striped) ? false : options.striped;

2
ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseServiceImpl.java
View File

@ -65,7 +65,7 @@ public abstract class AbstractBaseServiceImpl<M extends MyMapper<T>, T> implemen
@Override
public int insertSelective(T entity) {
EntityUtils.setUpdatedInfo(entity);
EntityUtils.setCreateAndUpdateInfo(entity);
return mapper.insertSelective(entity);
}

3
ruoyi-train/src/main/resources/templates/train/course/trainCourse/trainCourse.html
View File

@ -55,9 +55,6 @@
<a class="btn btn-danger btn-del btn-del disabled" onclick="$.operate.removeAll()" shiro:hasPermission="train:trainCourse:remove">
<i class="fa fa-remove"></i> 删除
</a>
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="train:trainCourse:export">
<i class="fa fa-download"></i> 导出
</a>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table" data-mobile-responsive="true"></table>

4
ruoyi-train/src/main/resources/templates/train/course/trainCourseSection/add.html
View File

@ -7,10 +7,10 @@
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-trainCourseSection-add">
<div class="form-group">
<label class="col-sm-3 control-label">课程ID：</label>
<label class="col-sm-3 control-label">课程名称：</label>
<div class="col-sm-8">
<input id="trainCourseId" name="trainCourseId" th:value="${trainCourse.id}" class="form-control" type="hidden">
<input th:value="${trainCourse.name}" class="form-control" type="text">
<input th:value="${trainCourse.name}" class="form-control" type="text" disabled="disabled">
</div>
</div>
<div class="form-group">

4
ruoyi-train/src/main/resources/templates/train/course/trainCourseSection/edit.html
View File

@ -10,9 +10,9 @@
<input id="trainCourseId" name="trainCourseId" th:value="${trainCourse.id}" class="form-control" type="hidden">
<div class="form-group">
<label class="col-sm-3 control-label">课程ID：</label>
<label class="col-sm-3 control-label">课程名称：</label>
<div class="col-sm-8">
<input th:value="${trainCourse.name}" class="form-control" type="text">
<input th:value="${trainCourse.name}" class="form-control" type="text" disabled="disabled">
</div>
</div>
<div class="form-group">

3
ruoyi-train/src/main/resources/templates/train/course/trainCourseSection/trainCourseSection.html
View File

@ -31,9 +31,6 @@
<a class="btn btn-danger btn-del btn-del disabled" onclick="$.operate.removeAll()" shiro:hasPermission="train:trainCourseSection:remove">
<i class="fa fa-remove"></i> 删除
</a>
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="train:trainCourseSection:export">
<i class="fa fa-download"></i> 导出
</a>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table" data-mobile-responsive="true"></table>