Pull request #15000: REPORT-136580 【fr-fbp回归】JS编辑器的UI效果不好

Merge in DESIGN/design from ~RENEKTON/design:fbp/release to fbp/release

* commit '218dac3c1b80659b155b62846761b645af0fcb5c':
  js高级编辑缩放

designer-base/src/main/java/com/fr/design/javascript/JSContentWithDescriptionPane.java

@@ -762,7 +762,7 @@ public class JSContentWithDescriptionPane extends JSContentPane implements KeyLi
     private JPanel createTipsPane() {
         JPanel tipsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         tipsPane.setLayout(new BorderLayout(4, 4));
-        tipsPane.setBorder(BorderFactory.createEmptyBorder(30, 2, 0, 0));
+        tipsPane.setBorder(new ScaledEmptyBorder(30, 2, 0, 0));
         JPanel searchPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         searchPane.setLayout(new BorderLayout(4, 4));
         keyWordTextField.setPlaceholder(Toolkit.i18nText("Fine-Design_Search_Interface"));

designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java

@@ -30,6 +30,7 @@ import java.util.List;
 
 import static com.fine.swing.ui.layout.Layouts.row;
 import static com.fine.swing.ui.layout.Layouts.cell;
+import static com.fine.theme.utils.FineUIScale.scale;
 
 public class JavaScriptImplPane extends AbstractHyperLinkPane<JavaScriptImpl> {
     private static final int BOTTOM_BORDER = 12;
@@ -73,7 +74,7 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane<JavaScriptImpl> {
                 cell(FineUIUtils.wrapComponentWithTitle(importedJsPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportServerP_Import_JavaScript"))).weight(0.5),
                 cell(FineUIUtils.wrapComponentWithTitle(parameterPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter"))).weight(0.5)
         ).getComponent());
-        topPane.setPreferredSize(new Dimension(super.getPreferredSize().width, 150));
+        topPane.setPreferredSize(new Dimension(super.getPreferredSize().width, scale(150)));
 
         this.setLayout(new BorderLayout());
         this.add(topPane, BorderLayout.NORTH);