Pull request #14609: REPORT-130848 - 设计器操作-控件设置-导出事件中字显示不全

Merge in DESIGN/design from ~RENEKTON/design:newui to newui

* commit 'ac332ccb06fa8479be2dafa41e08a68cb862b94e':
  边框问题

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

@@ -72,6 +72,7 @@ import static com.fine.swing.ui.layout.Layouts.cell;
 import static com.fine.swing.ui.layout.Layouts.column;
 import static com.fine.swing.ui.layout.Layouts.row;
 import static com.fine.swing.ui.layout.Layouts.flex;
+import static com.fine.theme.utils.FineUIScale.scale;
 import static com.fine.theme.utils.FineUIUtils.wrapComponentWithTitle;
 
 public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript> {
@@ -136,7 +137,7 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
             extendParametersCheckBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Basic_Export_JS_Extend_Parameters"));
             extendParametersCheckBox.setSelected(true);
             parameterViewPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane());
-            parameterViewPane.setPreferredSize(FineUIScale.scale(new Dimension(-1, 200)));
+            parameterViewPane.setPreferredSize(scale(new Dimension(-1, 200)));
             parameterViewPane.setVisible(false);
             addListener(parameterViewPane);
             extendParametersCheckBox.addItemListener(new ItemListener() {
@@ -252,7 +253,7 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
             this.setLayout(FRGUIPaneFactory.createBorderLayout());
             editorPane = new UITableEditorPane<>(new ExportJSTableModel());
             editorPane.setHeaderResizing(false);
-            editorPane.setPreferredSize(FineUIScale.scale(new Dimension(-1,300)));
+            editorPane.setPreferredSize(scale(new Dimension(-1,300)));
             this.add(wrapComponentWithTitle(editorPane, Toolkit.i18nText("Fine-Design_Basic_Export_JS_Template_Other")));
         }
 
@@ -301,9 +302,9 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
             this.setDefaultEditor(ParameterCombobox.class, new ParameterCombobox());
             this.setDefaultEditor(ParameterSettingButton.class, new ParameterSettingButton());
             this.setDefaultRenderer(ParameterSettingButton.class, new ParameterSettingButton());
-            this.createTable().getColumnModel().getColumn(2).setMaxWidth(FineUIScale.scale(60));
+            this.createTable().getColumnModel().getColumn(2).setMaxWidth(scale(60));
-            this.createTable().getColumnModel().getColumn(4).setMaxWidth(FineUIScale.scale(60));
+            this.createTable().getColumnModel().getColumn(4).setMaxWidth(scale(60));
-            this.createTable().getColumnModel().getColumn(5).setMaxWidth(FineUIScale.scale(50));
+            this.createTable().getColumnModel().getColumn(5).setMaxWidth(scale(50));
         }
 
         @Override

designer-chart/src/main/java/com/fr/design/mainframe/ChartPropertyPane.java

@@ -46,7 +46,7 @@ public class ChartPropertyPane extends BaseChartPropertyPane {
         this.setLayout(new BorderLayout());
         this.setBorder(new ScaledEmptyBorder(10, 0, 0, 0));
         // 外部轮廓大小固定，适配滚动面板
-        this.setPreferredSize(new Dimension(getWidth(), FineUIScale.scale(800)));
+        this.setPreferredSize(new Dimension(getWidth(), FineUIScale.scale(900)));
     }
 
     @Override