From a8844694bc424fcac7140a6f91a1c68a3e58841a Mon Sep 17 00:00:00 2001 From: hengsin Date: Fri, 17 Nov 2023 19:31:22 +0800 Subject: [PATCH] IDEMPIERE-5920 Scrollbar in reports (#2109) * IDEMPIERE-5920 Scrollbar in reports * IDEMPIERE-5920 Scrollbar in reports - implement alternative solution using details element --- .../src/org/compiere/print/ReportEngine.java | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/print/ReportEngine.java b/org.adempiere.base/src/org/compiere/print/ReportEngine.java index bfd7760d26..3b5e5cb01a 100644 --- a/org.adempiere.base/src/org/compiere/print/ReportEngine.java +++ b/org.adempiere.base/src/org/compiere/print/ReportEngine.java @@ -861,14 +861,12 @@ queued-job-count = 0 (class javax.print.attribute.standard.QueuedJobCount) String paraWrapId = null; if (parameterTable != null) { paraWrapId = cssPrefix + "-para-table-wrap"; - w.print("
"); + w.print("
"); + w.print(""+Msg.getMsg(getCtx(), "Parameter")+""); w.print(compress(parameterTable.toString(), minify)); tr tr = new tr(); tr.setClass("tr-parameter"); - th th = new th(); - tr.addElement(th); - th.addElement(Msg.getMsg(getCtx(), "Parameter") + ":"); MQuery query = m_query; if (m_query.getReportProcessQuery() != null) @@ -878,9 +876,6 @@ queued-job-count = 0 (class javax.print.attribute.standard.QueuedJobCount) if (r > 0) { tr = new tr(); tr.setClass("tr-parameter"); - td td = new td(); - tr.addElement(td); - td.addElement(" "); } td td = new td(); @@ -899,15 +894,16 @@ queued-job-count = 0 (class javax.print.attribute.standard.QueuedJobCount) } w.print(""); - w.print("
"); + w.print(""); } StringBuilder tableWrapDiv = new StringBuilder(); tableWrapDiv.append("
0) document.getElementById('") - .append(paraWrapId).append("').style.display='none'; ") - .append("else document.getElementById('").append(paraWrapId).append("').style.display='block';\""); + String paraWrapGet = "document.getElementById(\""+paraWrapId+"\")"; + tableWrapDiv.append("onscroll='setTimeout(() => {if (this.scrollTop > 0) ") + .append(" if(").append(paraWrapGet).append(".open) ") + .append(paraWrapGet).append(".open=false;}, 100)'"); } tableWrapDiv.append(" >");