包名调整

src/main/java/cn/wujc/web/servlet/tags/easyui/BaseHtmlElementBodyTag.java

@@ -1,6 +1,6 @@
 package cn.wujc.web.servlet.tags.easyui;
 
-import edu.scup.web.servlet.tags.easyui.EDataGridBodyTag;
+import cn.wujc.web.servlet.tags.easyui.grid.EDataGridTag;
 import org.springframework.web.servlet.tags.RequestContextAwareTag;
 import org.springframework.web.servlet.tags.form.TagWriter;
 
@@ -45,7 +45,8 @@ protected void writeOptionalAttributes(TagWriter tagWriter) throws JspException
  }
 
  protected TagWriter createTagWriter() {
- return new TagWriter(this.pageContext);
+ //bodyTag中的pageContext.getOut()在setBodyContent()后会被换掉
+ return new TagWriter(this.pageContext.getOut());
  }
 
  @SuppressWarnings("unchecked")
@@ -60,12 +61,12 @@ protected StringBuilder getSnippets(String key) {
  return sb;
  }
 
- protected EDataGridBodyTag getEDataGridTag() {
+ protected EDataGridTag getEDataGridTag() {
  Tag tag = this;
- while (!EDataGridBodyTag.class.equals(tag.getClass())) {
+ while (!EDataGridTag.class.equals(tag.getClass())) {
  tag = getParent();
  }
- return (EDataGridBodyTag) tag;
+ return (EDataGridTag) tag;
  }
 
  /**

src/main/java/cn/wujc/web/servlet/tags/easyui/form/ComboBoxTag.java

@@ -160,7 +160,7 @@ public void setLoadFilter(String loadFilter) {
  @Override
  public int doEndTag() throws JspException {
  try {
- pageContext.pushBody().write(MAPPER.writeValueAsString(this));
+ pageContext.getOut().write(MAPPER.writeValueAsString(this));
  } catch (IOException e) {
  LOG.error("", e);
  }

src/main/java/edu/scup/web/servlet/tags/easyui/DataGridToolBarBodyTag.java → src/main/java/cn/wujc/web/servlet/tags/easyui/grid/DataGridToolBarTag.java

@@ -1,4 +1,4 @@
-package edu.scup.web.servlet.tags.easyui;
+package cn.wujc.web.servlet.tags.easyui.grid;
 
 import cn.wujc.web.servlet.tags.easyui.BaseHtmlElementBodyTag;
 import org.springframework.web.servlet.tags.form.TagWriter;
@@ -8,7 +8,7 @@
 /**
  * 列表工具条标签
  */
-public class DataGridToolBarBodyTag extends BaseHtmlElementBodyTag implements Cloneable {
+public class DataGridToolBarTag extends BaseHtmlElementBodyTag implements Cloneable {
  private static final long serialVersionUID = -4700257309735164138L;
  protected String url;
  private String exp;//判断链接是否显示的表达式
@@ -39,7 +39,7 @@ public void setUrl(String url) {
  @Override
  protected int writeTagContent(TagWriter tagWriter) throws JspException {
  getEDataGridTag().addToolbar(this.clone());
- return EVAL_PAGE;
+ return EVAL_BODY_INCLUDE;
  }
 
  public String getOnclick() {
@@ -55,9 +55,9 @@ public void setOperationCode(String operationCode) {
  }
 
  @Override
- public DataGridToolBarBodyTag clone() {
+ public DataGridToolBarTag clone() {
  try {
- return (DataGridToolBarBodyTag) super.clone();
+ return (DataGridToolBarTag) super.clone();
  } catch (CloneNotSupportedException ignored) {
  return null;
  }

src/main/java/edu/scup/web/servlet/tags/easyui/EDataGridColumnBodyTag.java → src/main/java/cn/wujc/web/servlet/tags/easyui/grid/EDataGridColumnTag.java

@@ -1,4 +1,4 @@
-package edu.scup.web.servlet.tags.easyui;
+package cn.wujc.web.servlet.tags.easyui.grid;
 
 import cn.wujc.web.servlet.tags.easyui.BaseHtmlElementBodyTag;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -19,7 +19,7 @@
 import java.util.List;
 import java.util.Map;
 
-public class EDataGridColumnBodyTag extends BaseHtmlElementBodyTag implements Cloneable {
+public class EDataGridColumnTag extends BaseHtmlElementBodyTag implements Cloneable {
  private static final long serialVersionUID = 1403854988552009583L;
  private static final ObjectMapper mapper = new ObjectMapper();
 
@@ -54,7 +54,7 @@ protected int writeTagContent(TagWriter tagWriter) throws JspException {
  acbf.autowireBean(this);
  }
 
- EDataGridColumnBodyTag columnTag = this.clone();
+ EDataGridColumnTag columnTag = this.clone();
 
  boolean dicCombobox = StringUtils.equals("combobox", editor) && StringUtils.isNotBlank(dictionary);
  if (dicCombobox) {
@@ -133,7 +133,7 @@ protected int writeTagContent(TagWriter tagWriter) throws JspException {
  }
  }
  getEDataGridTag().addColumn(columnTag);
- return EVAL_PAGE;
+ return EVAL_BODY_INCLUDE;
  }
 
  private void setFormatter(StringBuilder formatter, Map<String, Object> map) {
@@ -265,9 +265,9 @@ public void setRequired(boolean required) {
  }
 
  @Override
- public EDataGridColumnBodyTag clone() {
+ public EDataGridColumnTag clone() {
  try {
- return (EDataGridColumnBodyTag) super.clone();
+ return (EDataGridColumnTag) super.clone();
  } catch (CloneNotSupportedException ignored) {
  return null;
  }

src/main/java/edu/scup/web/servlet/tags/easyui/EDataGridBodyTag.java → src/main/java/cn/wujc/web/servlet/tags/easyui/grid/EDataGridTag.java

@@ -1,4 +1,4 @@
-package edu.scup.web.servlet.tags.easyui;
+package cn.wujc.web.servlet.tags.easyui.grid;
 
 import cn.wujc.web.servlet.tags.easyui.BaseHtmlElementBodyTag;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -19,7 +19,7 @@
 import java.util.List;
 import java.util.Map;
 
-public class EDataGridBodyTag extends BaseHtmlElementBodyTag {
+public class EDataGridTag extends BaseHtmlElementBodyTag {
  private static final long serialVersionUID = 3888335455632937097L;
  private static final ObjectMapper mapper = new ObjectMapper();
 
@@ -42,8 +42,8 @@ public class EDataGridBodyTag extends BaseHtmlElementBodyTag {
  private String idField = "id";
  private String sortName;
  private String sortOrder;
- private List<EDataGridColumnBodyTag> columns = new ArrayList<>();
- private List<DataGridToolBarBodyTag> toolbars = new ArrayList<>();
+ private List<EDataGridColumnTag> columns = new ArrayList<>();
+ private List<DataGridToolBarTag> toolbars = new ArrayList<>();
  private static final Map<String, String> selfFuncMap = new HashMap<>();
  private static final Map<String, String> selfFuncCssMap = new HashMap<>();
 
@@ -98,7 +98,7 @@ protected int writeTagContent(TagWriter tagWriter) throws JspException {
  tagWriter.startTag("thead");
  tagWriter.startTag("tr");
  tagWriter.forceBlock();
- return EVAL_PAGE;
+ return EVAL_BODY_INCLUDE;
  }
 
  @Override
@@ -115,12 +115,12 @@ private void addToolbar() throws JspException {
  tagWriter.startTag("div");
  tagWriter.writeAttribute("id", getToolbar().replace("#", ""));
  tagWriter.forceBlock();
- List<EDataGridColumnBodyTag> queryColumns = findQueryableColumns();
+ List<EDataGridColumnTag> queryColumns = findQueryableColumns();
  if (!queryColumns.isEmpty()) {
  tagWriter.startTag("div");
  tagWriter.writeAttribute("id", "searchColumns");
  }
- for (EDataGridColumnBodyTag column : queryColumns) {
+ for (EDataGridColumnTag column : queryColumns) {
  tagWriter.startTag("div");
  tagWriter.writeAttribute("style", "display: inline-block;padding: 10px;");
  tagWriter.forceBlock();
@@ -198,7 +198,7 @@ private void addToolbar() throws JspException {
  }
  tagWriter.startTag("div");
  StringBuilder links = new StringBuilder();
- for (DataGridToolBarBodyTag toolBarTag : toolbars) {
+ for (DataGridToolBarTag toolBarTag : toolbars) {
  String funcName = toolBarTag.getFuncName();
  boolean selfOperate = selfFuncMap.containsKey(funcName);
  links.append("<a ");
@@ -245,7 +245,7 @@ private void addScripts() throws JspException {
  .append("',\r\n\tupdateUrl: '").append(updateUrl).append("',\r\n\tdestroyUrl:'").append(destroyUrl).append("',\n")
  .append("\tcolumns: [[\n");
  List<String> columnsString = new ArrayList<>();
- for (EDataGridColumnBodyTag column : this.columns) {
+ for (EDataGridColumnTag column : this.columns) {
  Map<String, Object> json = new HashMap<>();
  json.put("field", column.getField());
  json.put("title", column.getColumnTitle());
@@ -283,9 +283,9 @@ private void addScripts() throws JspException {
  tagWriter.endTag();
  }
 
- private List<EDataGridColumnBodyTag> findQueryableColumns() {
- List<EDataGridColumnBodyTag> rt = new ArrayList<>();
- for (EDataGridColumnBodyTag column : columns) {
+ private List<EDataGridColumnTag> findQueryableColumns() {
+ List<EDataGridColumnTag> rt = new ArrayList<>();
+ for (EDataGridColumnTag column : columns) {
  if (column.isQuery()) {
  rt.add(column);
  }
@@ -345,11 +345,11 @@ public void setSortOrder(String sortOrder) {
  this.sortOrder = sortOrder;
  }
 
- public void addColumn(EDataGridColumnBodyTag column) {
+ public void addColumn(EDataGridColumnTag column) {
  this.columns.add(column);
  }
 
- public void addToolbar(DataGridToolBarBodyTag dataGridToolBarTag) {
+ public void addToolbar(DataGridToolBarTag dataGridToolBarTag) {
  this.toolbars.add(dataGridToolBarTag);
  }
 }

src/main/java/cn/wujc/web/servlet/tags/easyui/grid/editor/ComboBoxEditorTag.java

@@ -6,6 +6,7 @@
 import org.slf4j.LoggerFactory;
 
 import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.BodyContent;
 import javax.servlet.jsp.tagext.BodyTagSupport;
 import java.io.IOException;
 
@@ -21,6 +22,11 @@ public void setComboBox(ComboBoxTag comboBox) {
  this.comboBox = comboBox;
  }
 
+ @Override
+ public int doAfterBody() throws JspException {
+ return SKIP_BODY;
+ }
+
  @Override
  public int doEndTag() throws JspException {
  try {

src/main/resources/META-INF/easyui.tld

@@ -298,7 +298,7 @@
 
  <tag>
  <name>dgToolBar</name>
- <tag-class>edu.scup.web.servlet.tags.easyui.DataGridToolBarBodyTag</tag-class>
+ <tag-class>cn.wujc.web.servlet.tags.easyui.grid.DataGridToolBarTag</tag-class>
  <body-content>JSP</body-content>
  <description>列表工具条标签</description>
  <attribute>
@@ -349,7 +349,7 @@
 
  <tag>
  <name>edatagrid</name>
- <tag-class>edu.scup.web.servlet.tags.easyui.EDataGridBodyTag</tag-class>
+ <tag-class>cn.wujc.web.servlet.tags.easyui.grid.EDataGridTag</tag-class>
  <description>数据列表</description>
  <attribute>
  <name>id</name>
@@ -423,7 +423,7 @@
 
  <tag>
  <name>edgCol</name>
- <tag-class>edu.scup.web.servlet.tags.easyui.EDataGridColumnBodyTag</tag-class>
+ <tag-class>cn.wujc.web.servlet.tags.easyui.grid.EDataGridColumnTag</tag-class>
  <description>列表字段</description>
  <attribute>
  <name>columnTitle</name>