Pull request #15145: REPORT-137786 & REPORT-138174 fix: NewUI细节问题

Merge in DESIGN/design from ~LEVY.XIE/design:fbp/master to fbp/master

* commit '1de9cea90f92412e22aba63d16c35243312d53bd':
  REPORT-138174 fix: 数据集/公式面板补充上边距
  无jira toolbar布局更新问题
  REPORT-137786 fix: 补充缩放适配

designer-base/src/main/java/com/fine/theme/light/ui/FineComboBoxUI.java

@@ -88,7 +88,7 @@ public class FineComboBoxUI extends FlatComboBoxUI {
             // 限制最大宽度，如超出则高度预留展示横向滚动条所需宽度
             int comboWidth = comboBox.getWidth();
             if (fitRectangle.width > comboWidth) {
-                return new Rectangle(px, py, comboWidth, fitRectangle.height + FlatUIUtils.getUIInt("ScrollBar.width", 10));
+                return new Rectangle(px, py, comboWidth, fitRectangle.height + FineUIUtils.getAndScaleInt("ScrollBar.width", 10));
             }
             return fitRectangle;
         }

designer-base/src/main/java/com/fr/design/data/datapane/sqlpane/SQLEditPane.java

@@ -1,5 +1,6 @@
 package com.fr.design.data.datapane.sqlpane;
 
+import com.formdev.flatlaf.util.ScaledEmptyBorder;
 import com.fr.data.core.DataCoreUtils;
 import com.fr.data.core.db.TableProcedure;
 import com.fr.design.actions.UpdateAction;
@@ -10,7 +11,6 @@ import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.ComparatorUtils;
 import com.fr.log.FineLoggerFactory;
 
-import javax.swing.Icon;
 import javax.swing.JPopupMenu;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.Document;
@@ -57,8 +57,7 @@ public class SQLEditPane extends RSyntaxTextArea {
         if (requestDroptarget) {
             new SQLPaneDropTarget(this);
         }
-		setBorder(null);
-
+		setBorder(new ScaledEmptyBorder(2, 2, 2, 2));
     }
 
 

designer-base/src/main/java/com/fr/design/formula/FormulaPane.java

@@ -315,7 +315,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
         // text
         initFormulaTextArea();
         UIScrollPane formulaTextAreaScrollPane = new UIScrollPane(formulaTextArea);
-        formulaTextArea.setBorder(null);
+        formulaTextArea.setBorder(new ScaledEmptyBorder(2, 2, 2, 2));
         formulaTextAreaScrollPane.setBorder(FineBorderFactory.createWrappedRoundBorder());
 
         // buttonPane

designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java

@@ -342,6 +342,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
         renameAction.setEnabled(false);
         delFileAction.setEnabled(false);
         vcsAction.setEnabled(false);
+        this.revalidate();
         this.repaint();
     }