Browse Source

REPORT-138174 fix: 数据集/公式面板补充上边距

fbp/master
Levy.Xie-解安森 1 month ago
parent
commit
1de9cea90f
  1. 5
      designer-base/src/main/java/com/fr/design/data/datapane/sqlpane/SQLEditPane.java
  2. 2
      designer-base/src/main/java/com/fr/design/formula/FormulaPane.java

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

@ -1,5 +1,6 @@
package com.fr.design.data.datapane.sqlpane; package com.fr.design.data.datapane.sqlpane;
import com.formdev.flatlaf.util.ScaledEmptyBorder;
import com.fr.data.core.DataCoreUtils; import com.fr.data.core.DataCoreUtils;
import com.fr.data.core.db.TableProcedure; import com.fr.data.core.db.TableProcedure;
import com.fr.design.actions.UpdateAction; 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.general.ComparatorUtils;
import com.fr.log.FineLoggerFactory; import com.fr.log.FineLoggerFactory;
import javax.swing.Icon;
import javax.swing.JPopupMenu; import javax.swing.JPopupMenu;
import javax.swing.text.BadLocationException; import javax.swing.text.BadLocationException;
import javax.swing.text.Document; import javax.swing.text.Document;
@ -57,8 +57,7 @@ public class SQLEditPane extends RSyntaxTextArea {
if (requestDroptarget) { if (requestDroptarget) {
new SQLPaneDropTarget(this); new SQLPaneDropTarget(this);
} }
setBorder(null); setBorder(new ScaledEmptyBorder(2, 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 // text
initFormulaTextArea(); initFormulaTextArea();
UIScrollPane formulaTextAreaScrollPane = new UIScrollPane(formulaTextArea); UIScrollPane formulaTextAreaScrollPane = new UIScrollPane(formulaTextArea);
formulaTextArea.setBorder(null); formulaTextArea.setBorder(new ScaledEmptyBorder(2, 2, 2, 2));
formulaTextAreaScrollPane.setBorder(FineBorderFactory.createWrappedRoundBorder()); formulaTextAreaScrollPane.setBorder(FineBorderFactory.createWrappedRoundBorder());
// buttonPane // buttonPane

Loading…
Cancel
Save