1.40

- vaadin flow itemlabelgenerator
Osiris-Team · Mar 12, 2024 · fd92192 · fd92192
1 parent 547e6c1
commit fd92192
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.osiris.jsqlgen</groupId>
     <artifactId>jSQL-Gen</artifactId>
-    <version>1.39</version>
+    <version>1.40</version>
     <name>jSQL-Gen</name>
 
     <properties>

diff --git a/src/main/java/com/osiris/jsqlgen/generator/GenVaadinFlow.java b/src/main/java/com/osiris/jsqlgen/generator/GenVaadinFlow.java
@@ -97,15 +97,20 @@ public static String s(Database db, Table t, LinkedHashSet<String> importsList)
                     s.append("        {"+fieldName+".setItems("+refTable.name+".get());\n" +
                             "            "+fieldName+".setRenderer(new ComponentRenderer<>(obj -> {\n" +
                             "                Div div = new Div();\n"+
-                            "                div.setText(\"\"+");
+                            "                div.setText(");
+                    String valAsString = "\"\"+";
                     for (Column refCol : refTable.columns) {
                         if (refCol.type.isBlob() || refCol.type.isDateOrTime()) continue;
-                        s.append("obj." + refCol.name);
-                        s.append("+\"; \"+");
+                        valAsString += "obj." + refCol.name;
+                        valAsString += "+\"; \"+";
                     }
-                    s.append("\"\");\n" +
+                    valAsString += "\"\"";
+                    s.append(valAsString + ");\n" +
                             "            return div;}));\n" +
-                            "        }");
+                            "            "+fieldName+".setItemLabelGenerator(obj -> {\n" +
+                            "                return "+valAsString+";\n" +
+                            "            });\n" +
+                            "        }\n");
                 } else{
                     fieldName = "nf" + colName;
                     s.append("        public NumberField " + fieldName + " = new NumberField(\"" + colName + "\");\n");

diff --git a/src/test/java/com/osiris/jsqlgen/testDB/PersonOrder.java b/src/test/java/com/osiris/jsqlgen/testDB/PersonOrder.java
@@ -564,7 +564,11 @@ public static class PersonOrderComp extends VerticalLayout{
                 Div div = new Div();
                 div.setText(""+obj.id+"; "+obj.name+"; "+obj.age+"; "+obj.flair+"; "+obj.lastName+"; "+obj.parentAge+"; "+"");
             return div;}));
-        }        public TextField tfName = new TextField("Name");
+            cbPerson.setItemLabelGenerator(obj -> {
+                return ""+obj.id+"; "+obj.name+"; "+obj.age+"; "+obj.flair+"; "+obj.lastName+"; "+obj.parentAge+"; "+"";
+            });
+        }
+        public TextField tfName = new TextField("Name");
         // Buttons
         public HorizontalLayout hlButtons = new HorizontalLayout();
         public Button btnAdd = new Button("Add");