Pull request #14929: REPORT-135680 fix:fbp回归问题修复

Merge in DESIGN/design from ~RICHARD.FANG/design:fbp/release to fbp/release

* commit 'dedc0dde723deb72eb4f11cae7cffb389485f0d4':
  REPORT-135680 fix:fbp回归问题修复

designer-base/src/main/java/com/fr/design/web/CustomIconPane.java

@@ -6,6 +6,7 @@ import com.fr.base.GraphHelper;
 import com.fr.base.Icon;
 import com.fr.base.IconManager;
 import com.fr.design.border.FineBorderFactory;
+import com.fr.design.constants.LayoutConstants;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.dialog.FineJOptionPane;
@@ -419,7 +420,7 @@ public class CustomIconPane extends BasicPane {
             this.setLayout(FRGUIPaneFactory.createBorderLayout());
             UIButton browseButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Icon_SelectIcon"));
             browseButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Click_this_button"));
-            nameTextField = new UITextField(20);
+            nameTextField = new UITextField();
             nameTextField.setPreferredSize(FineUIScale.createScaleDimension(172, 24));
 
             browseButton.addActionListener(e -> onBrowseButtonClicked(SwingUtilities.getWindowAncestor(EditIconDialog.this)));
@@ -446,16 +447,14 @@ public class CustomIconPane extends BasicPane {
             showImageLabel = new UILabel();
             showImageLabel.setPreferredSize(FineUIScale.createScaleDimension(50, 50));
 
-            JPanel centerPane = column(10,
+            JPanel centerPane = column(LayoutConstants.VERTICAL_GAP,
-                    row(
+                    row(40,
-                            cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name") + ":")).weight(1.2),
+                            cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name") + ":")),
-                            cell(nameTextField).weight(3)
+                            cell(nameTextField)
                     ),
-                    row(
+                    row(40,
-                            cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Icon") + ":")).weight(1.2),
+                            cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Icon") + ":")),
-                            row(
+                            row(cell(showImageLabel), column(fix(13), cell(browseButton), fix(13)).weight(1)).weight(1)
-                                    cell(showImageLabel), column(fix(13), cell(browseButton), fix(13)).weight(1)
-                            ).weight(3)
                     )
             ).getComponent();
             this.add(centerPane, BorderLayout.WEST);