From 6d8b49ce602b2df6e3484e60cb344b95d39dbe98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Levy=2EXie-=E8=A7=A3=E5=AE=89=E6=A3=AE?= Date: Thu, 29 Aug 2024 18:57:17 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-132512=20&=20REPORT-132661=20&=20REPORT-?= =?UTF-8?q?130846=20&=20REPORT-132274=20fix:=20NewUI=E7=BB=86=E8=8A=82?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/data/datapane/sqlpane/SQLEditPane.java | 1 + .../design/gui/icontainer/UIResizableContainer.java | 11 ----------- .../actions/cell/style/ReportFontNameAction.java | 3 +-- .../actions/cell/style/ReportFontSizeAction.java | 4 ++-- .../mainframe/cell/settingpane/CellOtherSetPane.java | 2 +- .../CellDesensitizationGroupsPane.java | 1 + 6 files changed, 6 insertions(+), 16 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/sqlpane/SQLEditPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/sqlpane/SQLEditPane.java index 7f5d083004..c0849032d3 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/sqlpane/SQLEditPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/sqlpane/SQLEditPane.java @@ -57,6 +57,7 @@ public class SQLEditPane extends RSyntaxTextArea { if (requestDroptarget) { new SQLPaneDropTarget(this); } + setBorder(null); } diff --git a/designer-base/src/main/java/com/fr/design/gui/icontainer/UIResizableContainer.java b/designer-base/src/main/java/com/fr/design/gui/icontainer/UIResizableContainer.java index 6cd8e8df4f..4d1b5e69bd 100644 --- a/designer-base/src/main/java/com/fr/design/gui/icontainer/UIResizableContainer.java +++ b/designer-base/src/main/java/com/fr/design/gui/icontainer/UIResizableContainer.java @@ -391,17 +391,6 @@ public class UIResizableContainer extends JPanel { repaint(); } - @Override - public void mouseClicked(MouseEvent e) { - if (e.getX() <= ARROW_RANGE) { - toolPaneY = 0; - } else if (e.getX() >= getWidth() - ARROW_RANGE) { - toolPaneY = UIResizableContainer.this.getHeight() - toolPaneHeight - getParameterPaneHeight(); - } else { - return; - } - refreshContainer(); - } }); } diff --git a/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontNameAction.java b/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontNameAction.java index c6f0f6416d..735802057e 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontNameAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontNameAction.java @@ -3,7 +3,6 @@ */ package com.fr.design.actions.cell.style; -import com.fine.theme.utils.FineUIScale; import com.fr.design.utils.DesignUtils; import com.fr.stable.os.OperatingSystem; import java.awt.Dimension; @@ -84,7 +83,7 @@ public class ReportFontNameAction extends AbstractStyleAction { UIComboBox itemComponent = new UIComboBox(DesignUtils.getAvailableFontFamilyNames4Report()); this.putValue(UIComboBox.class.getName(), itemComponent); //设置最佳宽度. - itemComponent.setPreferredSize(FineUIScale.scale(new Dimension(140, 24))); + itemComponent.setPreferredSize(new Dimension(150, 24)); itemComponent.setEnabled(this.isEnabled()); itemComponent.addActionListener(this); diff --git a/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontSizeAction.java b/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontSizeAction.java index 5a19a507bd..f9564a8a2e 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontSizeAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontSizeAction.java @@ -95,8 +95,8 @@ public class ReportFontSizeAction extends AbstractStyleAction { UIComboBox itemComponent = new UIComboBox(integerList); this.putValue(UIComboBox.class.getName(), itemComponent); - itemComponent.setMinimumSize(new Dimension(50, 20)); - itemComponent.setPreferredSize(new Dimension(50, 20)); + itemComponent.setMinimumSize(new Dimension(70, 24)); + itemComponent.setPreferredSize(new Dimension(70, 24)); itemComponent.setEnabled(this.isEnabled()); itemComponent.addActionListener(this); //需求字体大小可编辑 diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java index 0483a4662d..e80002e52c 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java @@ -360,7 +360,7 @@ public class CellOtherSetPane extends AbstractCellAttrPane { ).getComponent()) .addSupplier("showChar", () -> column(LayoutConstants.VERTICAL_GAP, cell(textOverflowCheckBox), - row(cell(showPartLabel).weight(1.2), cell(showPartComboBox).weight(1.6), flex(0.1), cell(numberLabel).weight(0.5), cell(showCharNums).weight(0.8)), + row(cell(showPartLabel).weight(1.2), cell(showPartComboBox).weight(1.4), flex(0.1), cell(numberLabel).weight(0.5), cell(showCharNums).weight(1.0)), row(cell(hideTypeLabel).weight(1.2), cell(textOverflowTypeComboBox).weight(3.0)) ).getComponent()) .addSupplier("showCell", () -> column(LayoutConstants.VERTICAL_GAP, diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/desensitization/CellDesensitizationGroupsPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/desensitization/CellDesensitizationGroupsPane.java index e741da25cd..5831e9aa0e 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/desensitization/CellDesensitizationGroupsPane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/desensitization/CellDesensitizationGroupsPane.java @@ -62,6 +62,7 @@ public class CellDesensitizationGroupsPane extends JPanel { private JPanel initAddPane(CellDesensitizationTableModel model) { UIButton addButton = new UIButton(model.getAction()); UILabel addLabel = new UILabel(Toolkit.i18nText("Fine-Design_Report_Desensitization_Setting")); + addLabel.setToolTipText(Toolkit.i18nText("Fine-Design_Report_Desensitization_Setting")); return Layouts.row( cell(addLabel).weight(1.2), cell(addButton).weight(3.0)