From 4b1e21f01322f358b8b8fd3291d825504d3f71d4 Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Wed, 2 Nov 2016 09:44:13 +0800 Subject: [PATCH 1/3] rt --- .../src/com/fr/design/form/parameter/FormParaDesigner.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/designer_form/src/com/fr/design/form/parameter/FormParaDesigner.java b/designer_form/src/com/fr/design/form/parameter/FormParaDesigner.java index cfb3976ffd..44580ab8cf 100644 --- a/designer_form/src/com/fr/design/form/parameter/FormParaDesigner.java +++ b/designer_form/src/com/fr/design/form/parameter/FormParaDesigner.java @@ -232,6 +232,9 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP } ParameterPropertyPane.getInstance().getParameterToolbarPane().populateBean( p.getParameterArray() == null ? new Parameter[0] : p.getParameterArray()); + + //参数面板独立后只能这边触发调整高度，根据参数个数调整换行，计算高度 + EastRegionContainerPane.getInstance().setParameterHeight((p.getParameterArray().length + 5) / 6 * 30 + 80); ParameterPropertyPane.getInstance().repaintContainer(); } From 0998bf995e4a1833df29504dbbfa8cf55a87ad53 Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Wed, 2 Nov 2016 19:50:23 +0800 Subject: [PATCH 2/3] rt --- .../design/form/parameter/FormParaDesigner.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/designer_form/src/com/fr/design/form/parameter/FormParaDesigner.java b/designer_form/src/com/fr/design/form/parameter/FormParaDesigner.java index 44580ab8cf..c52eb8ea47 100644 --- a/designer_form/src/com/fr/design/form/parameter/FormParaDesigner.java +++ b/designer_form/src/com/fr/design/form/parameter/FormParaDesigner.java @@ -79,6 +79,7 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP private static final int SECOND_H_LOCATION = 170; private static final int ADD_HEIGHT = 20; private static final int H_GAP = 105; + private static int paraCount; private static Image paraImage = BaseUtils.readImage("/com/fr/design/images/form/parameter.png"); @@ -114,8 +115,6 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP if (!BaseUtils.isAuthorityEditing()) { EastRegionContainerPane.getInstance().replaceUpPane( WidgetPropertyPane.getInstance(this)); - EastRegionContainerPane.getInstance().addParameterPane(ParameterPropertyPane.getInstance(this)); - refreshParameter(); } else { showAuthorityEditPane(); } @@ -233,9 +232,16 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP ParameterPropertyPane.getInstance().getParameterToolbarPane().populateBean( p.getParameterArray() == null ? new Parameter[0] : p.getParameterArray()); - //参数面板独立后只能这边触发调整高度，根据参数个数调整换行，计算高度 - EastRegionContainerPane.getInstance().setParameterHeight((p.getParameterArray().length + 5) / 6 * 30 + 80); - ParameterPropertyPane.getInstance().repaintContainer(); + EastRegionContainerPane.getInstance().addParameterPane(ParameterPropertyPane.getInstance(this)); + if (p.getParameterArray().length == 0) { + EastRegionContainerPane.getInstance().setParameterHeight(30); + } else { + //参数面板独立后只能这边触发调整高度，根据参数个数调整换行，计算高度 + EastRegionContainerPane.getInstance().setParameterHeight((p.getParameterArray().length + 5) / 6 * 30 + 80); + } + System.out.print("1"); + + //ParameterPropertyPane.getInstance().repaintContainer(); } /** From 865d923177dbaed541f5c21a3815798920e4a20d Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Wed, 2 Nov 2016 19:51:41 +0800 Subject: [PATCH 3/3] rt --- .../src/com/fr/design/form/parameter/FormParaDesigner.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/designer_form/src/com/fr/design/form/parameter/FormParaDesigner.java b/designer_form/src/com/fr/design/form/parameter/FormParaDesigner.java index c52eb8ea47..c97e0b7235 100644 --- a/designer_form/src/com/fr/design/form/parameter/FormParaDesigner.java +++ b/designer_form/src/com/fr/design/form/parameter/FormParaDesigner.java @@ -79,7 +79,6 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP private static final int SECOND_H_LOCATION = 170; private static final int ADD_HEIGHT = 20; private static final int H_GAP = 105; - private static int paraCount; private static Image paraImage = BaseUtils.readImage("/com/fr/design/images/form/parameter.png"); @@ -239,9 +238,6 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP //参数面板独立后只能这边触发调整高度，根据参数个数调整换行，计算高度 EastRegionContainerPane.getInstance().setParameterHeight((p.getParameterArray().length + 5) / 6 * 30 + 80); } - System.out.print("1"); - - //ParameterPropertyPane.getInstance().repaintContainer(); } /**