From 41d6740245a428f91878fb40c7f2cce21db4633d Mon Sep 17 00:00:00 2001
From: renekton <Renekton@fanruan.com>
Date: Tue, 30 Jul 2024 10:41:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E7=AE=A1=E7=90=86/=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E5=A1=AB=E6=8A=A5=E5=B1=9E=E6=80=A7/=E8=B6=85?=
 =?UTF-8?q?=E7=BA=A7=E9=93=BE=E6=8E=A5/=E6=9C=8D=E5=8A=A1=E5=99=A8?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/hyperlink/ReportletHyperNorthPane.java  | 8 ++++----
 .../com/fr/design/hyperlink/popup/ContentSettingPane.java | 2 --
 .../com/fr/design/hyperlink/popup/MobilePopupUIUtils.java | 8 ++++++++
 .../main/java/com/fr/design/headerfooter/ImagePane.java   | 3 ++-
 .../main/java/com/fr/design/report/ReportEnginePane.java  | 7 -------
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperNorthPane.java b/designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperNorthPane.java
index 2b757db6df..df7374e757 100644
--- a/designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperNorthPane.java
+++ b/designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperNorthPane.java
@@ -370,19 +370,19 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane<ReportletHyp
     }
 
     private void initDialogSizePanel(List<Component[]> dialogComponents) {// 对话框大小
-        final JPanel sizeJPanel = new JPanel(new BorderLayout());
+        final JPanel sizePane = new JPanel(new BorderLayout());
         UILabel heightLabel = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Height"));
         UISpinner heightTextFiled = new UISpinner(0, Integer.MAX_VALUE, 1, DEFAULT_H_VALUE);
         this.setHeightTextFiled(heightTextFiled);
         UILabel widthLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Designer_Width"));
         UISpinner widthTextFiled = new UISpinner(0, Integer.MAX_VALUE, 1, DEFAULT_V_VALUE);
         this.setWidthTextFiled(widthTextFiled);
-        sizeJPanel.add(column(8,
+        sizePane.add(column(8,
                 row(10, cell(heightLabel).weight(0.2), cell(heightTextFiled).weight(0.8)),
                 row(10, cell(widthLabel).weight(0.2), cell(widthTextFiled).weight(0.8))
         ).getComponent());
-        sizeJPanel.setVisible(true);
-        dialogComponents.add(new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Dialog_Size")), sizeJPanel});
+        sizePane.setVisible(true);
+        dialogComponents.add(new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Dialog_Size")), sizePane});
     }
 
     private void initDialogLocationPanel(List<Component[]> dialogComponents) {
diff --git a/designer-base/src/main/java/com/fr/design/hyperlink/popup/ContentSettingPane.java b/designer-base/src/main/java/com/fr/design/hyperlink/popup/ContentSettingPane.java
index 2b5f42398f..07be5714a4 100644
--- a/designer-base/src/main/java/com/fr/design/hyperlink/popup/ContentSettingPane.java
+++ b/designer-base/src/main/java/com/fr/design/hyperlink/popup/ContentSettingPane.java
@@ -138,12 +138,10 @@ public class ContentSettingPane extends AbstractHyperLinkPane<MobilePopupHyperli
         JPanel templatePanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
         // 路径输入框
         templatePathTextField = new UITextField(20);
-        //templatePanel.add(templatePathTextField, BorderLayout.CENTER);
 
         // 选择路径按钮
         UIButton templateSelectButton = new UIButton(Toolkit.i18nText("FR-Plugin-Designer_Mobile_Popup_Select"));
         templateSelectButton.setPreferredSize(new Dimension(templateSelectButton.getPreferredSize().width, 20));
-        //templatePanel.add(templateSelectButton, BorderLayout.EAST);
         templateSelectButton.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent evt) {
diff --git a/designer-base/src/main/java/com/fr/design/hyperlink/popup/MobilePopupUIUtils.java b/designer-base/src/main/java/com/fr/design/hyperlink/popup/MobilePopupUIUtils.java
index 65a413e479..b5b23c7f0f 100644
--- a/designer-base/src/main/java/com/fr/design/hyperlink/popup/MobilePopupUIUtils.java
+++ b/designer-base/src/main/java/com/fr/design/hyperlink/popup/MobilePopupUIUtils.java
@@ -18,6 +18,14 @@ public class MobilePopupUIUtils {
     static public JPanel createLeftTileRightContentPanel(String title, JComponent contentPanel) {
         return createLeftTileRightContentPanel(title, contentPanel, null);
     }
+
+    /**
+     * 创建子标题和组件行布局
+     * @param title 子标题
+     * @param contentPanel 组件
+     * @param color 子标题颜色，默认黑色
+     * @return JPanel
+     */
     static public JPanel createLeftTileRightContentPanel(String title, JComponent contentPanel, Color color) {
         JPanel jp = new JPanel();
         jp.setLayout(new BorderLayout());
diff --git a/designer-realize/src/main/java/com/fr/design/headerfooter/ImagePane.java b/designer-realize/src/main/java/com/fr/design/headerfooter/ImagePane.java
index 65ff1a1e84..008c851b85 100644
--- a/designer-realize/src/main/java/com/fr/design/headerfooter/ImagePane.java
+++ b/designer-realize/src/main/java/com/fr/design/headerfooter/ImagePane.java
@@ -4,6 +4,7 @@
 package com.fr.design.headerfooter;
 
 import com.fine.theme.light.ui.FineRoundBorder;
+import com.fine.theme.utils.FineUIScale;
 import com.formdev.flatlaf.ui.FlatUIUtils;
 import com.formdev.flatlaf.util.ScaledEmptyBorder;
 import com.fr.design.dialog.BasicPane;
@@ -49,7 +50,7 @@ public class ImagePane extends BasicPane {
         previewPane.add(new JScrollPane(imagePreviewPane));
 
         previewPane.setBorder(new FineRoundBorder());
-        previewPane.setPreferredSize(new Dimension(500, 400));
+        previewPane.setPreferredSize(new Dimension(FineUIScale.scale(500), FineUIScale.scale(400)));
         previewPane.setBackground(FlatUIUtils.getUIColor("background.normal", Color.WHITE));
 
 
diff --git a/designer-realize/src/main/java/com/fr/design/report/ReportEnginePane.java b/designer-realize/src/main/java/com/fr/design/report/ReportEnginePane.java
index 71d77249e5..9fbeee2098 100644
--- a/designer-realize/src/main/java/com/fr/design/report/ReportEnginePane.java
+++ b/designer-realize/src/main/java/com/fr/design/report/ReportEnginePane.java
@@ -1,8 +1,6 @@
 package com.fr.design.report;
 
-import com.fine.swing.ui.layout.Layouts;
 import com.fine.theme.utils.FineUIScale;
-import com.fine.theme.utils.FineUIUtils;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.editor.editor.IntegerEditor;
@@ -28,7 +26,6 @@ import javax.swing.AbstractButton;
 import javax.swing.BorderFactory;
 import javax.swing.ButtonGroup;
 import javax.swing.JLabel;
-import javax.swing.JLayeredPane;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JRadioButton;
@@ -46,7 +43,6 @@ import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.List;
-import com.fr.design.i18n.Toolkit;
 
 import static com.fine.swing.ui.layout.Layouts.cell;
 import static com.fine.swing.ui.layout.Layouts.column;
@@ -278,14 +274,12 @@ public class ReportEnginePane extends BasicBeanPane<LayerReportAttr> {
         radioButtons.get(0).setSelected(ob.getEngineState() == LayerReportAttr.ENGINE_X);
         radioButtons.get(1).setSelected(ob.getEngineState() == LayerReportAttr.LINE_ENGINE);
         if (ob.getEngineState() == LayerReportAttr.ENGINE_X) {
-            //engineSettingPane.moveToFront(outEngineXSettingPane);
             outEngineXSettingPane.setVisible(true);
             outLineEngineSettingPane.setVisible(false);
             engineXCountPerPageEditor.setValue(new Integer(ob.getCountPerPage()));
             engineXPageQueryBox.setSelected(ob.isPageQuery());
             engineXPageQueryPane.setVisible(ob.isPageQuery());
         } else {
-            //engineSettingPane.moveToFront(outLineEngineSettingPane);
             outEngineXSettingPane.setVisible(false);
             outLineEngineSettingPane.setVisible(true);
             lineEngineCountPerPageEditor.setValue(new Integer(ob.getCountPerPage()));
@@ -380,7 +374,6 @@ public class ReportEnginePane extends BasicBeanPane<LayerReportAttr> {
                 target.setVisible(true);
                 showTarget.setVisible(true);
                 notShowTarget.setVisible(false);
-                //target.moveToFront(showTarget);
             } else {
                 target.setVisible(false);
             }