Skip to content

Commit

Permalink
用户管理增加Table排序功能。
Browse files Browse the repository at this point in the history
  • Loading branch information
@think-gem
think-gem committed Mar 7, 2013
1 parent 7c21094 commit 24bc90c
Show file tree
Hide file tree
Showing 10 changed files with 94 additions and 77 deletions.
118 changes: 52 additions & 66 deletions bin/refresh-db/init-data.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@
<sys_menu id="36" parent_id="32" parent_ids="0,1,31,32" name="站点设置" href="/cms/site/" target="" icon="certificate" sort="40" is_show="1" permission="" />
<sys_menu id="37" parent_id="36" parent_ids="0,1,31,32,36," name="查看" href="" target="" icon="" sort="30" is_show="0" permission="cms:site:view" />
<sys_menu id="38" parent_id="36" parent_ids="0,1,31,32,36," name="修改" href="" target="" icon="" sort="30" is_show="0" permission="cms:site:edit" />
<sys_menu id="39" parent_id="32" parent_ids="0,1,31,32" name="切换站点" href="/cms/site/select" target="" icon="retweet" sort="50" is_show="1" permission="" />
<sys_menu id="39" parent_id="32" parent_ids="0,1,31,32" name="切换站点" href="/cms/site/select" target="" icon="retweet" sort="50" is_show="1" permission="cms:site:select" />
<sys_menu id="40" parent_id="31" parent_ids="0,1,31," name="内容管理" href="" target="" icon="" sort="500" is_show="1" permission="cms:view" />
<sys_menu id="41" parent_id="40" parent_ids="0,1,31,40," name="内容发布" href="/cms/" target="" icon="briefcase" sort="30" is_show="1" permission="" />
<sys_menu id="42" parent_id="41" parent_ids="0,1,31,40,41," name="文章模型" href="/cms/article/" target="" icon="file" sort="40" is_show="0" permission="" />
Expand Down Expand Up @@ -313,8 +313,28 @@
<sys_role_menu role_id="1" menu_id="37" />
<sys_role_menu role_id="1" menu_id="38" />
<sys_role_menu role_id="1" menu_id="39" />
<sys_role_menu role_id="1" menu_id="40" />
<sys_role_menu role_id="1" menu_id="41" />
<sys_role_menu role_id="1" menu_id="42" />
<sys_role_menu role_id="1" menu_id="43" />
<sys_role_menu role_id="1" menu_id="44" />
<sys_role_menu role_id="1" menu_id="45" />
<sys_role_menu role_id="1" menu_id="46" />
<sys_role_menu role_id="1" menu_id="47" />
<sys_role_menu role_id="1" menu_id="48" />
<sys_role_menu role_id="1" menu_id="49" />
<sys_role_menu role_id="1" menu_id="50" />
<sys_role_menu role_id="1" menu_id="51" />
<sys_role_menu role_id="1" menu_id="52" />
<sys_role_menu role_id="1" menu_id="53" />
<sys_role_menu role_id="1" menu_id="54" />
<sys_role_menu role_id="1" menu_id="55" />
<sys_role_menu role_id="1" menu_id="56" />
<sys_role_menu role_id="1" menu_id="57" />
<sys_role_menu role_id="1" menu_id="58" />
<sys_role_menu role_id="1" menu_id="59" />
<sys_role_menu role_id="2" menu_id="1" />
<sys_role_menu role_id="2" menu_id="22" />
<sys_role_menu role_id="2" menu_id="3" />
<sys_role_menu role_id="2" menu_id="23" />
<sys_role_menu role_id="2" menu_id="24" />
<sys_role_menu role_id="2" menu_id="25" />
Expand All @@ -332,6 +352,26 @@
<sys_role_menu role_id="2" menu_id="37" />
<sys_role_menu role_id="2" menu_id="38" />
<sys_role_menu role_id="2" menu_id="39" />
<sys_role_menu role_id="2" menu_id="40" />
<sys_role_menu role_id="2" menu_id="41" />
<sys_role_menu role_id="2" menu_id="42" />
<sys_role_menu role_id="2" menu_id="43" />
<sys_role_menu role_id="2" menu_id="44" />
<sys_role_menu role_id="2" menu_id="45" />
<sys_role_menu role_id="2" menu_id="46" />
<sys_role_menu role_id="2" menu_id="47" />
<sys_role_menu role_id="2" menu_id="48" />
<sys_role_menu role_id="2" menu_id="49" />
<sys_role_menu role_id="2" menu_id="50" />
<sys_role_menu role_id="2" menu_id="51" />
<sys_role_menu role_id="2" menu_id="52" />
<sys_role_menu role_id="2" menu_id="53" />
<sys_role_menu role_id="2" menu_id="54" />
<sys_role_menu role_id="2" menu_id="55" />
<sys_role_menu role_id="2" menu_id="56" />
<sys_role_menu role_id="2" menu_id="57" />
<sys_role_menu role_id="2" menu_id="58" />
<sys_role_menu role_id="2" menu_id="59" />

<!-- 系统角色与菜单关联表 -->
<sys_role_category role_id="1" category_id="1" />
Expand Down Expand Up @@ -361,40 +401,18 @@
<sys_role_category role_id="1" category_id="25" />
<sys_role_category role_id="1" category_id="26" />
<sys_role_category role_id="1" category_id="27" />
<sys_role_category role_id="1" category_id="28" />
<sys_role_category role_id="1" category_id="29" />
<sys_role_category role_id="1" category_id="30" />
<sys_role_category role_id="1" category_id="31" />
<sys_role_category role_id="1" category_id="32" />
<sys_role_category role_id="1" category_id="33" />
<sys_role_category role_id="1" category_id="34" />
<sys_role_category role_id="1" category_id="35" />
<sys_role_category role_id="1" category_id="36" />
<sys_role_category role_id="1" category_id="37" />
<sys_role_category role_id="1" category_id="38" />
<sys_role_category role_id="1" category_id="39" />
<sys_role_category role_id="1" category_id="40" />
<sys_role_category role_id="1" category_id="41" />
<sys_role_category role_id="1" category_id="42" />
<sys_role_category role_id="1" category_id="43" />
<sys_role_category role_id="1" category_id="44" />
<sys_role_category role_id="1" category_id="45" />
<sys_role_category role_id="1" category_id="46" />
<sys_role_category role_id="1" category_id="47" />
<sys_role_category role_id="1" category_id="48" />
<sys_role_category role_id="1" category_id="49" />
<sys_role_category role_id="1" category_id="50" />
<sys_role_category role_id="1" category_id="51" />
<sys_role_category role_id="1" category_id="52" />
<sys_role_category role_id="1" category_id="53" />
<sys_role_category role_id="1" category_id="54" />
<sys_role_category role_id="1" category_id="55" />
<sys_role_category role_id="1" category_id="56" />
<sys_role_category role_id="1" category_id="57" />
<sys_role_category role_id="1" category_id="58" />
<sys_role_category role_id="1" category_id="59" />
<sys_role_category role_id="2" category_id="1" />
<sys_role_category role_id="2" category_id="2" />
<sys_role_category role_id="2" category_id="3" />
<sys_role_category role_id="2" category_id="4" />
<sys_role_category role_id="2" category_id="5" />
<sys_role_category role_id="2" category_id="6" />
<sys_role_category role_id="2" category_id="7" />
<sys_role_category role_id="2" category_id="8" />
<sys_role_category role_id="2" category_id="9" />
<sys_role_category role_id="2" category_id="10" />
<sys_role_category role_id="2" category_id="11" />
<sys_role_category role_id="2" category_id="12" />
<sys_role_category role_id="2" category_id="13" />
<sys_role_category role_id="2" category_id="14" />
<sys_role_category role_id="2" category_id="15" />
Expand All @@ -410,38 +428,6 @@
<sys_role_category role_id="2" category_id="25" />
<sys_role_category role_id="2" category_id="26" />
<sys_role_category role_id="2" category_id="27" />
<sys_role_category role_id="2" category_id="28" />
<sys_role_category role_id="2" category_id="29" />
<sys_role_category role_id="2" category_id="30" />
<sys_role_category role_id="2" category_id="31" />
<sys_role_category role_id="2" category_id="32" />
<sys_role_category role_id="2" category_id="33" />
<sys_role_category role_id="2" category_id="34" />
<sys_role_category role_id="2" category_id="35" />
<sys_role_category role_id="2" category_id="36" />
<sys_role_category role_id="2" category_id="37" />
<sys_role_category role_id="2" category_id="38" />
<sys_role_category role_id="2" category_id="39" />
<sys_role_category role_id="2" category_id="40" />
<sys_role_category role_id="2" category_id="41" />
<sys_role_category role_id="2" category_id="42" />
<sys_role_category role_id="2" category_id="43" />
<sys_role_category role_id="2" category_id="44" />
<sys_role_category role_id="2" category_id="45" />
<sys_role_category role_id="2" category_id="46" />
<sys_role_category role_id="2" category_id="47" />
<sys_role_category role_id="2" category_id="48" />
<sys_role_category role_id="2" category_id="49" />
<sys_role_category role_id="2" category_id="50" />
<sys_role_category role_id="2" category_id="51" />
<sys_role_category role_id="2" category_id="52" />
<sys_role_category role_id="2" category_id="53" />
<sys_role_category role_id="2" category_id="54" />
<sys_role_category role_id="2" category_id="55" />
<sys_role_category role_id="2" category_id="56" />
<sys_role_category role_id="2" category_id="57" />
<sys_role_category role_id="2" category_id="58" />
<sys_role_category role_id="2" category_id="59" />

<!-- 系统用户表 超级管理员 登录名：thinkgem 密码：admin -->
<sys_user id="1" area_id="1" office_id="1" login_name="thinkgem" password="02a3f0772fcca9f415adc990734b45c6f059c7d33ee28362c4852032" name="Thinkgem" email="[email protected]" phone="8675" mobile="8675" remarks="" />
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/thinkgem/jeesite/common/persistence/BaseDaoImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -305,9 +305,9 @@ public Page<T> find(Page<T> page, DetachedCriteria detachedCriteria) {
if (StringUtils.isNotBlank(page.getOrderBy())){
for (String order : StringUtils.split(page.getOrderBy(), ",")){
String[] o = StringUtils.split(order, " ");
if (o.length>=1){
if (o.length==1){
criteria.addOrder(Order.asc(o[0]));
}else if (o.length>=2){
}else if (o.length==2){
if ("DESC".equals(o[1].toUpperCase())){
criteria.addOrder(Order.desc(o[0]));
}else{
Expand Down
9 changes: 7 additions & 2 deletions src/main/java/com/thinkgem/jeesite/common/persistence/Page.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public Page(HttpServletRequest request, HttpServletResponse response){
* @param pageSize 分页大小，如果传递 -1 则为不分页，返回所有数据
*/
public Page(HttpServletRequest request, HttpServletResponse response, int pageSize){
// 获取页码参数（传递repage参数，来记住页码）
// 设置页码参数（传递repage参数，来记住页码）
String no = request.getParameter("pageNo");
if (StringUtils.isNumeric(no)){
CookieUtils.setCookie(response, "pageNo", no);
Expand All @@ -77,7 +77,7 @@ public Page(HttpServletRequest request, HttpServletResponse response, int pageSi
this.setPageNo(Integer.parseInt(no));
}
}
// 获取页面大小参数（传递repage参数，来记住页码大小）
// 设置页面大小参数（传递repage参数，来记住页码大小）
if (pageSize==-1){
String size = request.getParameter("pageSize");
if (StringUtils.isNumeric(size)){
Expand All @@ -92,6 +92,11 @@ public Page(HttpServletRequest request, HttpServletResponse response, int pageSi
}else{
this.setPageSize(pageSize);
}
// 设置排序参数
String orderBy = request.getParameter("orderBy");
if (StringUtils.isNotBlank(orderBy)){
this.setOrderBy(orderBy);
}
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/thinkgem/jeesite/modules/cms/service/CommentService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public Page<Comment> find(Page<Comment> page, Comment comment) {
dc.add(Restrictions.like("title", "%"+comment.getTitle()+"%"));
}
dc.add(Restrictions.eq("status", comment.getStatus()));
dc.addOrder(Order.desc("createDate"));
dc.addOrder(Order.desc("id"));
return commentDao.find(page, dc);
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/thinkgem/jeesite/modules/cms/service/SiteService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public Page<Site> find(Page<Site> page, Site site) {
dc.add(Restrictions.like("name", "%"+site.getName()+"%"));
}
dc.add(Restrictions.eq("delFlag", site.getDelFlag()));
dc.addOrder(Order.asc("id"));
//dc.addOrder(Order.asc("id"));
return siteDao.find(page, dc);
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/thinkgem/jeesite/modules/cms/web/SiteController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public String delete(Long id, @RequestParam(required=false) Boolean isRe, Redire
* @param siteId
* @return
*/
@RequiresPermissions("cms:view")
@RequiresPermissions("cms:site:select")
@RequiresUser
@RequestMapping(value = "select")
public String select(Long id, boolean flag){
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/thinkgem/jeesite/modules/sys/service/SystemService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public Page<User> findUser(Page<User> page, User user) {
dc.add(Restrictions.like("name", "%"+user.getName()+"%"));
}
dc.add(Restrictions.eq("delFlag", User.DEL_FLAG_NORMAL));
dc.addOrder(Order.asc("area.code")).addOrder(Order.asc("office.code")).addOrder(Order.asc("id"));
dc.addOrder(Order.asc("area.code")).addOrder(Order.asc("office.code"));;
return userDao.find(page, dc);
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/views/modules/cms/siteSelect.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<tbody>
<c:forEach items="${fnc:getSiteList()}" var="site">
<tr>
<td><a href="${ctx}/cms/site/select?id=${site.id}">${site.name}${fnc:getCurrentSiteId() eq site.id ? ' <font color="red">[当前站点]</font>' : ''}</a></td>
<td><a href="${ctx}/cms/site/select?id=${site.id}">${site.name}</a> ${fnc:getCurrentSiteId() eq site.id ? ' <font color="red">[当前站点]</font>' : ''}</td>
<shiro:hasPermission name="cms:view"><td>
<a href="${ctx}/cms/site/select?id=${site.id}">切换</a>
</td></shiro:hasPermission>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/views/modules/sys/sysIndex.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<c:set var="firstMenu" value="true"/><c:forEach items="${fns:getMenuList()}" var="menu" varStatus="idxStatus"><c:if test="${menu.parent.id eq 1&&menu.isShow eq 1}">
<li class="menu ${firstMenu?' active':''}"><a class="menu" href="${ctx}/sys/menu/tree?parentId=${menu.id}" target="menuFrame" >${menu.name}</a></li>
<c:if test="${firstMenu}"><c:set var="firstMenuId" value="${menu.id}"/></c:if><c:set var="firstMenu" value="false"/></c:if></c:forEach>
<shiro:hasPermission name="cms:view"><li class="dropdown">
<shiro:hasPermission name="cms:site:select"><li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">${fnc:getSite(fnc:getCurrentSiteId()).name}<b class="caret"></b></a>
<ul class="dropdown-menu">
<c:forEach items="${fnc:getSiteList()}" var="site"><li><a href="${ctx}/cms/site/select?id=${site.id}&flag=1">${site.name}</a></li></c:forEach>
Expand Down
28 changes: 27 additions & 1 deletion src/main/webapp/WEB-INF/views/modules/sys/userList.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,32 @@
<html>
<head>
<title>用户管理</title>
<style type="text/css">.sort{color:#0663A2;cursor:pointer;}</style>
<script type="text/javascript">
$(document).ready(function() {
// 表格排序
var orderBy = $("#orderBy").val().split(" ");
$("#contentTable th.sort").each(function(){
if ($(this).hasClass(orderBy[0])){
orderBy[1] = orderBy[1]&&orderBy[1].toUpperCase()=="DESC"?"down":"up";
$(this).html($(this).html()+" <i class=\"icon icon-arrow-"+orderBy[1]+"\"></i>");
}
});
$("#contentTable th.sort").click(function(){
var order = $(this).attr("class").split(" ");
var sort = $("#orderBy").val().split(" ");
for(var i=0; i<order.length; i++){
if (order[i] == "sort"){order = order[i+1]; break;}
}
if (order == sort[0]){
sort = (sort[1]&&sort[1].toUpperCase()=="DESC"?"ASC":"DESC");
$("#orderBy").val(order+" DESC"!=order+" "+sort?"":order+" "+sort);
}else{
$("#orderBy").val(order+" ASC");
}
$("#searchForm").submit();
});
});
function page(n,s){
$("#pageNo").val(n);
$("#pageSize").val(s);
Expand All @@ -20,6 +45,7 @@
<form:form id="searchForm" modelAttribute="user" action="${ctx}/sys/user/" method="post" class="breadcrumb form-search">
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
<input id="orderBy" name="orderBy" type="hidden" value="${page.orderBy}"/>
<div>
<%--<tags:treeDialog id="area" title="区域" url="/sys/area/treeData"/>
<form:hidden id="areaId" path="area.id" class="required"/>
Expand All @@ -39,7 +65,7 @@
</form:form>
<tags:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered ">
<thead><tr><th>区域</th><th>部门</th><th>登录名</th><th>姓名</th><th>电话</th><th>手机</th><th>角色</th><shiro:hasPermission name="sys:user:edit"><th>操作</th></shiro:hasPermission></tr></thead>
<thead><tr><th>区域</th><th>部门</th><th class="sort loginName">登录名</th><th class="sort name">姓名</th><th>电话</th><th>手机</th><th>角色</th><shiro:hasPermission name="sys:user:edit"><th>操作</th></shiro:hasPermission></tr></thead>
<tbody>
<c:forEach items="${page.list}" var="user">
<tr>
Expand Down

0 comments on commit 24bc90c

Please sign in to comment.