Pull request #9267: REPORT-73970 手动修改参数面板宽度未生效

Merge in DESIGN/design from ~LINK.ZHAO/design:release/11.0 to release/11.0

* commit 'cdb010553c569d5ac0324df94cd55d78a40f7bae':
  REPORT-73970 手动修改参数面板宽度未生效 1、REPORT-66771改动导致，在dolayout的时候修改了组件宽度 2、改为，在form宽度修改事件中修改组件宽度

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);
         }
     }
 

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