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("
"); sb.append("
"); + + if(hasQueryColum(columnList)&&isShowSearch==true){ + sb.append(""); + } + if(hasQueryColum(columnList)){ - sb.append("
"); + sb.append("
"); + + sb.append(""); + //-----longjb1 澧炲姞鐢ㄤ簬楂樼骇鏌ヨ鐨勫弬鏁伴」 sb.append(""); - //update by jg_renjie at 2016/1/11 for:TASK #823 澧炲姞form瀹炵幇Form琛ㄥ崟楠岃瘉 + sb.append("
"); sb.append(""); sb.append(""); sb.append(""); sb.append(""); sb.append(""); - //update by jg_renjie at 2016/1/11 for:TASK #823 - //濡傛灉琛ㄥ崟鏄粍鍚堟煡璇 + + //濡傛灉琛ㄥ崟鏄粍鍚堟煡璇 if("group".equals(getQueryMode())){ for (DataGridColumn col : columnList) { if (col.isQuery()) { @@ -1257,8 +1290,64 @@ public class DataGridTag extends TagSupport { sb.append(",align:\'" + column.getAlign() + "\'"); } if(StringUtils.isNotEmpty(column.getExtendParams())){ - sb.append(","+column.getExtendParams().substring(0, - column.getExtendParams().length()-1)); + + if(column.getExtendParams().indexOf("editor:'combobox'")>-1){//鍊樿嫢鎵╁睍鍙傛暟涓寘鍚玡ditor:'combobox' + if(!StringUtil.isEmpty(column.getDictionary())){//鏍规嵁鏁版嵁瀛楀吀鐢熸垚editor:'combobox' + if(column.getDictionary().contains(",")){ + String[] dic = column.getDictionary().split(","); + String sql = "select " + dic[1] + " as field," + dic[2] + + " as text from " + dic[0]; + systemService = ApplicationContextUtil.getContext().getBean( + SystemService.class); + List> list = systemService.findForJdbc(sql); + sb.append(",editor:{type:'combobox',options:{valueField:'typecode',textField:'typename',data:["); + for (Map map : list){ + sb.append("{'typecode':'"+map.get("field")+"','typename':'"+map.get("text")+"'},"); + } + sb.append("],required:true}}"); + //鍐嶅鍔爁ormatter鍙傛暟 + + sb.append(",formatter:function(value,row){"); + for (Map map : list){ + sb.append("if(value =='"+map.get("field")+"'){"); + sb.append("return '"+map.get("text")+"';"); + sb.append("}"); + sb.append("return row."+map.get("field")+";"); + } + sb.append("}"); + }else{ + Map> typedatas = ResourceUtil.allTypes; + List types = typedatas.get(column.getDictionary().toLowerCase()); + if (types != null) { + sb.append(",editor:{type:'combobox',options:{valueField:'typecode',textField:'typename',data:["); + for (TSType type : types) { + sb.append("{'typecode':'"+type.getTypecode()+"','typename':'"+MutiLangUtil.getMutiLangInstance().getLang(type.getTypename())+"'},"); + } + sb.append("],required:true}}"); + //鍐嶅鍔爁ormatter鍙傛暟 + sb.append(",formatter:function(value,row){"); + for (TSType type : types) { + sb.append("if(value =='"+type.getTypecode()+"'){"); + sb.append("return '"+MutiLangUtil.getMutiLangInstance().getLang(type.getTypename())+"';"); + sb.append("}"); + sb.append("return row."+field+";"); + } + sb.append("}"); + } + } + } + }else{ + + //sb.append(","+column.getExtendParams().substring(0,column.getExtendParams().length()-1)); + if(column.getExtendParams().lastIndexOf(",")!=-1 || column.getExtendParams().lastIndexOf("''")!=-1){ + sb.append(","+column.getExtendParams().substring(0,column.getExtendParams().length()-1)); + }else{ + sb.append(","+column.getExtendParams()); + } + + } + + } // 闅愯棌瀛楁 @@ -1273,8 +1362,14 @@ public class DataGridTag extends TagSupport { } } if(column.getFormatterjs()!=null){ - sb.append(",formatter:function(value,rec,index){"); - sb.append(" return "+column.getFormatterjs()+"(value,rec,index);}"); + + if(StringUtils.isNotEmpty(column.getExtendParams())&&column.getExtendParams().indexOf("editor:'combobox'")>-1){//鍊樿嫢鎵╁睍鍙傛暟涓寘鍚玡ditor:'combobox' + //涓嶅啀閲嶅澧炲姞formatter鍙傛暟锛 + }else{ + sb.append(",formatter:function(value,rec,index){"); + sb.append(" return "+column.getFormatterjs()+"(value,rec,index);}"); + } + }else { // 鏄剧ず鍥剧墖 if (column.isImage()) { @@ -1307,14 +1402,14 @@ public class DataGridTag extends TagSupport { sb.append(",formatter:function(value,rec,index){"); sb.append(" return new Date().format('"+column.getFormatter()+"',value);}"); } - //author:xugj-----start-----date:20160512 ---- for: TASK #1080 銆怳I鏍囩鏀归犮憈:dgCol 鏄剧ず鍐呭闀垮害鎺у埗 + else if(column.getShowLen()!=null){ //璁剧疆浜嗘樉绀哄灏戦暱搴︾殑 sb.append(",formatter:function(value,rec,index){"); sb.append(" if(value==undefined) {return ''} "); sb.append(" if(value.length<=");sb.append(column.getShowLen());sb.append(") {return value}"); sb.append(" else{ return ''+ value.substring(0,");sb.append(column.getShowLen());sb.append(")+'...';}}"); } - //author:xugj-----end-----date:20160512 ---- for: TASK #1080 銆怳I鏍囩鏀归犮憈:dgCol 鏄剧ず鍐呭闀垮害鎺у埗 + else if (columnValueList.size() > 0 && !column.getField().equals("opt")) {// 鍊兼浛鎻 String testString = ""; for (ColumnValue columnValue : columnValueList) { @@ -1574,7 +1669,6 @@ public class DataGridTag extends TagSupport { this.langArg = langArg; } - //-----author:jg_longjb----start-----date:20150408--------for:鏂板ace 鐣岄潰涓嬬殑button class鏍峰紡 public StringBuffer aceStyleTable() { String grid = ""; StringBuffer sb = new StringBuffer(); @@ -1876,10 +1970,7 @@ public class DataGridTag extends TagSupport { } return sb; } - //-----author:jg_longjb----end-----date:20150408--------for:鏂板灏佽鏌ヨ鍣ㄧ粍浠- - - - //-----author:jg_longjb----start-----date:20150427--------for:鏂板楂樼骇鏌ヨ鍣╭ueryBuilder + private void appendLine(StringBuffer sb,String str) { String format = "\r\n"; //璋冭瘯 鏍煎紡鍖 sb.append(str).append(format); @@ -2239,5 +2330,5 @@ appendLine(sb," }}\">鍏崇郴"); } return sb.toString(); } -//----author:jg_longjb----start-----date:20150427--------for:鏂板灏佽鏌ヨ鍣ㄧ粍浠---- + } diff --git a/src/main/webapp/webpage/jeecg/cgform/autoform/autoForm-add.jsp b/src/main/webapp/webpage/jeecg/cgform/autoform/autoForm-add.jsp index 87272394..07246896 100644 --- a/src/main/webapp/webpage/jeecg/cgform/autoform/autoForm-add.jsp +++ b/src/main/webapp/webpage/jeecg/cgform/autoform/autoForm-add.jsp @@ -42,19 +42,23 @@ function initMainTableSourceSelect(){ var ztree = $.fn.zTree.getZTreeObj("dbSelect"); var node = ztree.getNodesByParam("pid", 0, null); + //update-begin--Author: jg_renjie Date:20151210 for锛氥愯嚜瀹氫箟琛ㄥ崟銆戣〃鍗曚富鏁版嵁婧愪笉鍏佽褰曞叆锛屽彧鍏佽閫夋嫨 var options = ""; $.each(node,function(i,f){ options += ""; }) $("#mainTableSource").html(options); + //update-end--Author: jg_renjie Date:20151210 for锛氥愯嚜瀹氫箟琛ㄥ崟銆戣〃鍗曚富鏁版嵁婧愪笉鍏佽褰曞叆锛屽彧鍏佽閫夋嫨 } $(function(){ $.fn.zTree.init($("#dbSelect"), setting, []); var styleDate = eval('${styleSelect}'); + //update-begin--Author: jg_huangxg Date:20151102 for锛氭爲鑿滃崟ICON鍥炬爣鑷畾涔夊疄鐜 var iconPath = "plug-in/ztree/css/img/diy/2.png"; $(styleDate).each(function(i){ this.icon = iconPath; }); + //update-end--Author: jg_huangxg Date:20151102 for锛氭爲鑿滃崟ICON鍥炬爣鑷畾涔夊疄鐜 $.fn.zTree.init($("#styleSelect"), stylesetting, styleDate); initMainTableSourceSelect(); @@ -392,11 +396,11 @@ - + - + diff --git a/src/main/webapp/webpage/jeecg/demo/jeecgDemo/rowEditDemo.jsp b/src/main/webapp/webpage/jeecg/demo/jeecgDemo/rowEditDemo.jsp index 7db4170f..230ef222 100644 --- a/src/main/webapp/webpage/jeecg/demo/jeecgDemo/rowEditDemo.jsp +++ b/src/main/webapp/webpage/jeecg/demo/jeecgDemo/rowEditDemo.jsp @@ -6,15 +6,16 @@ - - - - - - - - - + + + + + + + + + + @@ -81,6 +82,7 @@ $('#'+gname).datagrid('beginEdit', index); } } + //update-begin--Author:寮犲繝浜 Date:20150709 for锛氫慨姝 鍙栨秷缂栬緫鍚庡啀娆$偣鍑诲綍鍏ヤ笉杩涘叆缂栬緫鐘舵 //鍙栨秷缂栬緫 function reject(title,addurl,gname){ $('#'+gname).datagrid('clearChecked');