Merge pull request #387 in DESIGN/design from ~MATA.LI/designrel:release/10.0 to release/10.0

* commit '7446cc12fbc9a42d895ea111695803a1603c920b':
  REPORT-10572

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

@@ -1,7 +1,9 @@
 package com.fr.design.javascript;
 
 import com.fr.design.DesignerEnvManager;
+import com.fr.design.border.UIRoundedBorder;
 import com.fr.design.constants.KeyWords;
+import com.fr.design.constants.UIConstants;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.autocomplete.AutoCompletion;
 import com.fr.design.gui.autocomplete.BasicCompletion;
@@ -14,7 +16,6 @@ import com.fr.design.gui.syntax.ui.rsyntaxtextarea.RSyntaxTextArea;
 import com.fr.design.gui.syntax.ui.rsyntaxtextarea.SyntaxConstants;
 import com.fr.design.javascript.beautify.JavaScriptFormatHelper;
 import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.IOUtils;
 
 
@@ -60,10 +61,15 @@ public class JSContentPane extends BasicPane {
             }
         });
 
-        this.add(GUICoreUtils.createBorderLayoutPane(
+        //REPORT-10533 用户参数多达25个,导致JS没地方写,增加滚动条显示
-                funNameLabel, BorderLayout.WEST,
+        JPanel jsParaPane = new JPanel(new BorderLayout(4, 4));
-                label, BorderLayout.EAST
+        jsParaPane.setPreferredSize(new Dimension(300, 80));
-        ), BorderLayout.NORTH);
+        UIScrollPane scrollPane = new UIScrollPane(funNameLabel);
+        scrollPane.setPreferredSize(new Dimension(400, 80));
+        scrollPane.setBorder(new UIRoundedBorder(UIConstants.TITLED_BORDER_COLOR, 1, UIConstants.ARC));
+        jsParaPane.add(scrollPane, BorderLayout.WEST);
+        jsParaPane.add(label, BorderLayout.EAST);
+        this.add(jsParaPane, BorderLayout.NORTH);
 
         contentTextArea = new RSyntaxTextArea();
         contentTextArea.setCloseCurlyBraces(true);