midsuit
/
core-jgi
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-4415 Window Toolbar, report popup flickering (#738) 

* IDEMPIERE-4415 Window Toolbar, report popup flickering

- Fix an invalid css selector (z-row-over doesn't exists)
- Fix report popup flickering
This commit is contained in:
hengsin 2021-06-28 19:50:22 +08:00 committed by GitHub
parent df704cb236
commit 48f6e3b9d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ReportAction.java
View File

@ -38,6 +38,7 @@ import org.adempiere.webui.component.Panel;
import org.adempiere.webui.component.Row; import org.adempiere.webui.component.Row;
import org.adempiere.webui.component.Rows; import org.adempiere.webui.component.Rows;
import org.adempiere.webui.component.Window; import org.adempiere.webui.component.Window;
import org.adempiere.webui.component.ZkCssHelper;
import org.adempiere.webui.util.ZKUpdateUtil; import org.adempiere.webui.util.ZKUpdateUtil;
import org.adempiere.webui.window.FDialog; import org.adempiere.webui.window.FDialog;
import org.compiere.model.GridTab; import org.compiere.model.GridTab;
@ -58,11 +59,11 @@ import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.event.Events;
import org.zkoss.zk.ui.util.Clients; import org.zkoss.zk.ui.util.Clients;
import org.zkoss.zul.Div;
import org.zkoss.zul.Filedownload; import org.zkoss.zul.Filedownload;
import org.zkoss.zul.Popup; import org.zkoss.zul.Popup;
import org.zkoss.zul.Space; import org.zkoss.zul.Space;
import org.zkoss.zul.Tabpanel; import org.zkoss.zul.Tabpanel;
import org.zkoss.zul.Vbox;
import org.zkoss.zul.impl.LabelImageElement; import org.zkoss.zul.impl.LabelImageElement;
/** /**
@ -143,22 +144,24 @@ public class ReportAction implements EventListener<Event>
chkAllColumns.setVisible(AD_PrintFormat_ID == -1); chkAllColumns.setVisible(AD_PrintFormat_ID == -1);
} }
Vbox vb = new Vbox(); Div vb = new Div();
ZkCssHelper.appendStyle(vb, "display: flex; flex-direction: column;");
ZKUpdateUtil.setWidth(vb, "100%"); ZKUpdateUtil.setWidth(vb, "100%");
ZKUpdateUtil.setHeight(vb, "200px");
winReport.appendChild(vb); winReport.appendChild(vb);
winReport.setSclass("toolbar-popup-window"); winReport.setSclass("toolbar-popup-window");
vb.setSclass("toolbar-popup-window-cnt"); vb.setSclass("toolbar-popup-window-cnt");
vb.setAlign("stretch");
Grid grid = GridFactory.newGridLayout(); Grid grid = GridFactory.newGridLayout();
ZkCssHelper.appendStyle(grid, "flex-grow: 1;");
vb.appendChild(grid); vb.appendChild(grid);
Columns columns = new Columns(); Columns columns = new Columns();
Column column = new Column(); Column column = new Column();
ZKUpdateUtil.setHflex(column, "min"); column.setWidth("25%");
columns.appendChild(column); columns.appendChild(column);
column = new Column(); column = new Column();
ZKUpdateUtil.setHflex(column, "1"); column.setWidth("75%");
columns.appendChild(column); columns.appendChild(column);
grid.appendChild(columns); grid.appendChild(columns);
@ -169,7 +172,7 @@ public class ReportAction implements EventListener<Event>
rows.appendChild(row); rows.appendChild(row);
row.appendChild(new Label(Msg.translate(Env.getCtx(), "AD_PrintFormat_ID"))); row.appendChild(new Label(Msg.translate(Env.getCtx(), "AD_PrintFormat_ID")));
row.appendChild(cboPrintFormat); row.appendChild(cboPrintFormat);
ZKUpdateUtil.setHflex(cboPrintFormat, "1"); cboPrintFormat.setWidth("100%");
cboPrintFormat.addEventListener(Events.ON_SELECT, this); cboPrintFormat.addEventListener(Events.ON_SELECT, this);
row = new Row(); row = new Row();
@ -202,6 +205,7 @@ public class ReportAction implements EventListener<Event>
vb.appendChild(confirmPanel); vb.appendChild(confirmPanel);
LayoutUtils.addSclass("dialog-footer", confirmPanel); LayoutUtils.addSclass("dialog-footer", confirmPanel);
confirmPanel.addActionListener(this); confirmPanel.addActionListener(this);
ZkCssHelper.appendStyle(confirmPanel, "flex-grow: 0;");
} }
LabelImageElement toolbarItem = panel.getToolbar().getToolbarItem("Report"); LabelImageElement toolbarItem = panel.getToolbar().getToolbarItem("Report");

4
org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/grid.css.dsp
View File

@ -95,10 +95,10 @@ div.z-column-cnt, div.z-grid-header div.z-auxheader-cnt {
border: none !important; border: none !important;
background-color: transparent !important; background-color: transparent !important;
} }
.grid-layout tr.z-row-over>td.z-row-inner, .grid-layout tr.z-row-over>.z-cell { .grid-layout tr.z-row:hover>td.z-row-inner, .grid-layout tr.z-row:hover>.z-cell {
border: none !important; border: none !important;
} }
.grid-layout tr.z-row-over>td.z-row-inner, .grid-layout tr.z-row-over>.z-cell { .grid-layout tr.z-row:hover>td.z-row-inner, .grid-layout tr.z-row:hover>.z-cell {
background-image: none !important; background-image: none !important;
} }