diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XWParameterLayout.java b/designer-form/src/main/java/com/fr/design/designer/creator/XWParameterLayout.java index aacdf6d04..d925df070 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XWParameterLayout.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XWParameterLayout.java @@ -272,13 +272,11 @@ public class XWParameterLayout extends XWAbsoluteLayout { } /** - * 修改form布局的宽度时,需要同时修改表单参数界面的布局的宽度。 + * 修改参数面板宽度 * */ - @Override - public void doLayout() { - layout(); + public void setParaWidth(int width) { if (data != null && data instanceof WParameterLayout) { - ((WParameterLayout) data).setDesignWidth(getWidth()); + ((WParameterLayout) data).setDesignWidth(width); } } diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormArea.java b/designer-form/src/main/java/com/fr/design/mainframe/FormArea.java index 759c0b6f7..e515dd1f3 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormArea.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormArea.java @@ -12,6 +12,7 @@ import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ibutton.UIButtonUI; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.imenu.UIPopupMenu; +import com.fr.design.designer.creator.XWParameterLayout; import com.fr.design.gui.itextfield.UINumberField; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; @@ -402,6 +403,12 @@ public class FormArea extends JComponent implements ScrollRulerComponent { } doReCalculateRoot(width, rec.height, layout); } + + // REPORT-66771, 调整参数面板宽度 + XLayoutContainer para = FormArea.this.designer.getParaComponent(); + if (para != null && para instanceof XWParameterLayout) { + ((XWParameterLayout) para).setParaWidth(width); + } } private void reCalculateHeight(int height) {