diff --git a/README.md b/README.md index 10d42fd7..308799db 100644 --- a/README.md +++ b/README.md @@ -102,7 +102,7 @@ JEECG 技术交流 ----------------------------------- * 作者:[张代浩](http://blog.csdn.net/zhangdaiscott) -* QQ交流群: 176031980、106838471(满)、106259349(满) +* QQ交流群: ⑤190866569、④176031980(满)、②106838471(满)、①106259349(满)、③289782002(满) 社区荣誉 diff --git a/src/main/java/org/jeecgframework/tag/core/easyui/DataGridTag.java b/src/main/java/org/jeecgframework/tag/core/easyui/DataGridTag.java index 70f7c042..c2a28047 100644 --- a/src/main/java/org/jeecgframework/tag/core/easyui/DataGridTag.java +++ b/src/main/java/org/jeecgframework/tag/core/easyui/DataGridTag.java @@ -88,7 +88,9 @@ public class DataGridTag extends TagSupport { private Boolean singleSelect;//鏄惁鍗曢塼rue,false protected String cssTheme ; - + + private boolean isShowSearch=false;//妫绱㈠尯鍩熸槸鍚﹀彲鏀剁缉 + public String getCssTheme() { return cssTheme; } @@ -187,6 +189,12 @@ public class DataGridTag extends TagSupport { this.singleSelect = singleSelect; } + public boolean getIsShowSearch() { + return isShowSearch; + } + public void setIsShowSearch(boolean isShowSearch) { + this.isShowSearch = isShowSearch; + } /** * 璁剧疆璇㈤棶鎿嶄綔URL */ @@ -460,7 +468,7 @@ public class DataGridTag extends TagSupport { out = this.pageContext.getOut(); // String indexStyle =null; -//-----author:jg_longjb----start-----date:20150408--------for:璇诲彇cookie涓婚鏍峰紡 ace鐣岄潰涓媡able鐨勮緭鍑 + // Cookie[] cookies = ((HttpServletRequest) super.pageContext // .getRequest()).getCookies(); // for (Cookie cookie : cookies) { @@ -479,7 +487,7 @@ public class DataGridTag extends TagSupport { out.print(end().toString()); out.flush(); // } -//-----author:jg_longjb----end-----date:20150408--------for:璇诲彇cookie涓婚鏍峰紡 ace鐣岄潰涓媡able鐨勮緭鍑 + }else{ out.print(datatables().toString()); out.flush(); @@ -588,7 +596,7 @@ public class DataGridTag extends TagSupport { StringBuffer sb = new StringBuffer(); width = (width == null) ? "auto" : width; height = (height == null) ? "auto" : height; - sb.append(""); sb.append("