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 3a3b3b75..70a64c91 100644 --- a/src/main/java/org/jeecgframework/tag/core/easyui/DataGridTag.java +++ b/src/main/java/org/jeecgframework/tag/core/easyui/DataGridTag.java @@ -455,6 +455,7 @@ public class DataGridTag extends JeecgTag { dataGridColumn.setShowMode(showMode); columnList.add(dataGridColumn); + Set operationCodes = (Set) super.pageContext.getRequest().getAttribute(Globals.OPERATIONCODES); if (null!=operationCodes) { for (String MyoperationCode : operationCodes) { @@ -468,6 +469,7 @@ public class DataGridTag extends JeecgTag { } } } + if (field != "opt") { fields += field + ","; if ("group".equals(queryMode)) { @@ -785,6 +787,7 @@ public class DataGridTag extends JeecgTag { } sb.append("
"); sb.append("');"); + //表格顶部查询 if(hasQueryColum(columnList) && !columnList.isEmpty()){ for (DataGridColumn column : columnList) { @@ -993,6 +996,7 @@ public class DataGridTag extends JeecgTag { } } } + //工具栏的处理方式 if(toolBarList.size() > 0){ @@ -1262,6 +1266,7 @@ public class DataGridTag extends JeecgTag { if(btnCls!=null && btnCls.indexOf("bootstrap")==0){ sb.append(""); } + width = (width == null) ? "auto" : width; height = (height == null) ? "auto" : height; sb.append("