From 8a19532679cba8f3a4e64d4939018ae64cbf366a Mon Sep 17 00:00:00 2001
From: "Link.Zhao" <Link.Zhao@fanruan.com>
Date: Tue, 21 Jun 2022 16:13:09 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-73970=20=E6=89=8B=E5=8A=A8=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=8F=82=E6=95=B0=E9=9D=A2=E6=9D=BF=E5=AE=BD=E5=BA=A6?=
 =?UTF-8?q?=E6=9C=AA=E7=94=9F=E6=95=88=201=E3=80=81REPORT-66771=E6=94=B9?=
 =?UTF-8?q?=E5=8A=A8=E5=AF=BC=E8=87=B4=EF=BC=8C=E5=9C=A8dolayout=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=E4=BF=AE=E6=94=B9=E4=BA=86=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=AE=BD=E5=BA=A6=202=E3=80=81=E6=94=B9=E4=B8=BA=EF=BC=8C?=
 =?UTF-8?q?=E5=9C=A8form=E5=AE=BD=E5=BA=A6=E4=BF=AE=E6=94=B9=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=AD=E4=BF=AE=E6=94=B9=E7=BB=84=E4=BB=B6=E5=AE=BD?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/designer/creator/XWParameterLayout.java | 8 +++-----
 .../src/main/java/com/fr/design/mainframe/FormArea.java   | 7 +++++++
 2 files changed, 10 insertions(+), 5 deletions(-)

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) {