Merge branch 'master' into bndtools

hengsin · Oct 6, 2024 · d9b4b99 · d9b4b99
2 parents f57471d + 8e065a5
commit d9b4b99
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 17 deletions.
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridTabRowRenderer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridTabRowRenderer.java
@@ -70,6 +70,7 @@
 import org.zkoss.zul.Row;
 import org.zkoss.zul.RowRenderer;
 import org.zkoss.zul.RowRendererExt;
+import org.zkoss.zul.Span;
 import org.zkoss.zul.impl.XulElement;
 
 /**
@@ -339,17 +340,23 @@ private Component getDisplayComponent(int rowIndex, Object value, GridField grid
 			editor.addActionListener(buttonListener);
 			component = editor.getComponent();
 		} else if (gridField.getDisplayType() == DisplayType.Image) {
-			WImageEditor editor = new WImageEditor(gridField);
-			editor.setReadWrite(false);
-			editor.setValue(value);
-			Image image = editor.getComponent();
-			if (image.getContent() != null) {
-				image.setWidth(MSysConfig.getIntValue(MSysConfig.ZK_THUMBNAIL_IMAGE_WIDTH, 100, Env.getAD_Client_ID(Env.getCtx()))+"px");
-				image.setHeight(MSysConfig.getIntValue(MSysConfig.ZK_THUMBNAIL_IMAGE_HEIGHT, 100, Env.getAD_Client_ID(Env.getCtx()))+"px");
-				image.setClientAttribute("onmouseenter", "idempiere.showFullSizeImage(event)");
-				image.setClientAttribute("onmouseleave", "idempiere.hideFullSizeImage(event)");
+			if (value != null) {
+				WImageEditor editor = new WImageEditor(gridField);
+				editor.setReadWrite(false);
+				editor.setValue(value);
+				Image image = editor.getComponent();
+				if (image.getContent() != null) {
+					image.setWidth(MSysConfig.getIntValue(MSysConfig.ZK_THUMBNAIL_IMAGE_WIDTH, 100, Env.getAD_Client_ID(Env.getCtx()))+"px");
+					image.setHeight(MSysConfig.getIntValue(MSysConfig.ZK_THUMBNAIL_IMAGE_HEIGHT, 100, Env.getAD_Client_ID(Env.getCtx()))+"px");
+					image.setClientAttribute("onmouseenter", "idempiere.showFullSizeImage(event)");
+					image.setClientAttribute("onmouseleave", "idempiere.hideFullSizeImage(event)");
+				}
+				component = image;
+			} else {
+				Span span = new Span();
+				span.setSclass("no-image");
+				component = span;
 			}
-			component = image;
 		} else {
 			String text = getDisplayText(value, gridField, rowIndex, isForceGetValue);
 			WEditor editor = getEditorCell(gridField);
@@ -359,8 +366,17 @@ private Component getDisplayComponent(int rowIndex, Object value, GridField grid
 				component = label;
 			}else{
 				component = editor.getDisplayComponent();
-				if (component instanceof Html){
-					((Html)component).setContent(text);
+				if (component instanceof Html html){
+					if (Util.isEmpty(text) && value == null) {
+						String nullText = editor.getDisplayTextForGridView(value);
+						if (!Util.isEmpty(nullText)) {
+							html.setContent(nullText);
+						} else {
+							html.setContent(text);
+						}
+					} else {
+						html.setContent(text);
+					}
 				}else{
 					throw new UnsupportedOperationException("Only implemented for Html component.");
 				}

diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DashboardController.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DashboardController.java
@@ -39,6 +39,7 @@
 import org.adempiere.webui.LayoutUtils;
 import org.adempiere.webui.apps.AEnv;
 import org.adempiere.webui.apps.BusyDialog;
+import org.adempiere.webui.apps.DesktopRunnable;
 import org.adempiere.webui.apps.WReport;
 import org.adempiere.webui.apps.graph.IChartRendererService;
 import org.adempiere.webui.apps.graph.WGraph;
@@ -337,7 +338,7 @@ protected void doRun() {
 							}
 						}
 					};	        		
-	        		Adempiere.getThreadPoolExecutor().submit(cr);
+	        		Adempiere.getThreadPoolExecutor().submit(new DesktopRunnable(cr, parent.getDesktop()));
 	        	}
 	        }
 
@@ -647,7 +648,7 @@ protected void doRun() {
 							}
 						}
 					};	        		
-	        		Adempiere.getThreadPoolExecutor().submit(cr);					
+	        		Adempiere.getThreadPoolExecutor().submit(new DesktopRunnable(cr, parent.getDesktop()));				
 	        	}
 	        }
 

diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WImageEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WImageEditor.java
@@ -32,6 +32,7 @@
 import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zk.ui.event.Events;
 import org.zkoss.zul.Cell;
+import org.zkoss.zul.Html;
 import org.zkoss.zul.Image;
 
 /**
@@ -178,8 +179,8 @@ public void setValue(Object value)
 
     @Override
 	public String getDisplayTextForGridView(Object value) {
-		if (value == null) {
-			return "";
+		if (value == null || (value instanceof Integer && (Integer)value == 0)) {
+			return "<span class='no-image'/>";
 		} else {
 			return "...";
 		}
@@ -231,4 +232,12 @@ public void onEvent(Event event) throws Exception {
 	public void fillHorizontal() {
 	}
 
+	@Override
+	public Component getDisplayComponent() {
+		if (m_mImage == null)
+			return new Html();
+		else
+			return null;
+	}
+
 }
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WImageURLEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WImageURLEditor.java
@@ -231,7 +231,7 @@ public String getDisplayTextForGridView(GridRowCtx gridRowCtx, Object value) {
 				.append("onmouseenter='idempiere.showFullSizeImage(event)' onmouseleave='idempiere.hideFullSizeImage(event)'/>");
 			return builder.toString();
 		} else {
-			return "";
+			return "<span class='no-image'/>";
 		}
 	}		
 }
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java
@@ -1596,6 +1596,8 @@ protected void prepareTable(ColumnInfo[] layout, String from, String where,
 							image.setClientAttribute("onmouseenter", "idempiere.showFullSizeImage(event)");
 							image.setClientAttribute("onmouseleave", "idempiere.hideFullSizeImage(event)");
 						}
+						if (t.value == null)
+							LayoutUtils.addSclass("no-image", editor.getComponent());
 						return editor;
 					});
 				}