Incorrect display of the Template name #192

jmix-projects · Jul 20, 2021 · f20308a · f20308a
1 parent 744304f
commit f20308a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 36 deletions.
diff --git a/reports-ui/src/main/java/io/jmix/reportsui/screen/report/wizard/step/SaveStepFragment.java b/reports-ui/src/main/java/io/jmix/reportsui/screen/report/wizard/step/SaveStepFragment.java
@@ -93,9 +93,6 @@ public class SaveStepFragment extends StepFragment {
     @Autowired
     protected ComboBox<ChartType> diagramType;
 
-    @Autowired
-    protected Label diagramTypeLabel;
-
     @Autowired
     protected RandomChartDataGenerator randomChartDataGenerator;
 
@@ -180,7 +177,6 @@ protected void initChartPreview() {
         boolean isChartTemplate = outputFileFormat.getValue() == ReportOutputType.CHART;
         chartPreviewBox.setVisible(isChartTemplate);
         diagramType.setVisible(isChartTemplate);
-        diagramTypeLabel.setVisible(isChartTemplate);
         if (isChartTemplate) {
             showChart();
 

diff --git a/...-ui/src/main/resources/io/jmix/reportsui/screen/report/wizard/step/save-step-fragment.xml b/...-ui/src/main/resources/io/jmix/reportsui/screen/report/wizard/step/save-step-fragment.xml
@@ -25,40 +25,29 @@
     <layout expand="groupBox" width="100%">
         <groupBox id="groupBox" expand="props" width="100%">
             <vbox id="props" expand="chartPreviewBox">
-                <gridLayout width="100%" spacing="true">
-                    <columns>
-                        <column flex="0"/>
-                        <column flex="1"/>
-                    </columns>
-                    <rows>
-                        <row>
-                            <label value="msg://downloadTemplateFile"/>
+                <form width="100%">
+                    <column width="100%">
+                        <hbox caption="msg://downloadTemplateFile" width="100%">
                             <button id="downloadTemplateFile" stylename="link"
                                     description="msg://templateHintMsg" align="MIDDLE_LEFT"/>
-                        </row>
-                        <row>
-                            <label value="msg://outputFileName" align="MIDDLE_LEFT"/>
-                            <textField id="outputFileName" width="100%" required="true"
-                                       dataContainer="reportDataDc" property="outputNamePattern"
-                                       description="msg://outputFileNameHintMsg" maxLength="255">
-                                <validators>
-                                    <custom bean="report_OutputFileNameValidator"/>
-                                </validators>
-                            </textField>
-                        </row>
-                        <row>
-                            <label value="msg://outputFileFormat" align="MIDDLE_LEFT"/>
-                            <comboBox id="outputFileFormat" required="true" width="100%"
-                                      dataContainer="reportDataDc" property="outputFileType"
-                                      description="msg://outputFileTypeHintMsg"/>
-                        </row>
-                        <row>
-                            <label id="diagramTypeLabel" value="msg://diagramType" visible="false" align="MIDDLE_LEFT"/>
-                            <comboBox id="diagramType" required="true" width="100%" visible="false"
-                                      optionsEnum="io.jmix.reports.entity.charts.ChartType"/>
-                        </row>
-                    </rows>
-                </gridLayout>
+                        </hbox>
+                        <textField id="outputFileName" width="100%" required="true"
+                                   caption="msg://outputFileName"
+                                   dataContainer="reportDataDc" property="outputNamePattern"
+                                   description="msg://outputFileNameHintMsg" maxLength="255">
+                            <validators>
+                                <custom bean="report_OutputFileNameValidator"/>
+                            </validators>
+                        </textField>
+                        <comboBox id="outputFileFormat" required="true" width="100%"
+                                  caption="msg://outputFileFormat"
+                                  dataContainer="reportDataDc" property="outputFileType"
+                                  description="msg://outputFileTypeHintMsg"/>
+                        <comboBox id="diagramType" required="true" width="100%" visible="false"
+                                  caption="msg://diagramType"
+                                  optionsEnum="io.jmix.reports.entity.charts.ChartType"/>
+                    </column>
+                </form>
                 <vbox id="chartPreviewBox" visible="false" width="100%">
                 </vbox>
             </vbox>