From aa942e7f8f72b461233555d314fcb27c419c182f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Levy=2EXie-=E8=A7=A3=E5=AE=89=E6=A3=AE?= Date: Thu, 9 Jan 2025 16:27:33 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-145928=20=E4=BC=98=E5=8C=96=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hyperlink/AbstractHyperNorthPane.java | 36 +++++++++---------- .../hyperlink/ReportletHyperNorthPane.java | 12 +++---- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/hyperlink/AbstractHyperNorthPane.java b/designer-base/src/main/java/com/fr/design/hyperlink/AbstractHyperNorthPane.java index 1ed57797ac..e52c07d76a 100644 --- a/designer-base/src/main/java/com/fr/design/hyperlink/AbstractHyperNorthPane.java +++ b/designer-base/src/main/java/com/fr/design/hyperlink/AbstractHyperNorthPane.java @@ -31,11 +31,11 @@ public abstract class AbstractHyperNorthPane extends BasicB /** * 对话框高度输入框 */ - private UISpinner heightTextFiled; + private UISpinner heightSpinner; /** * 对话框宽度输入框 */ - private UISpinner widthTextFiled; + private UISpinner widthSpinner; public AbstractHyperNorthPane() { @@ -60,12 +60,12 @@ public abstract class AbstractHyperNorthPane extends BasicB final JPanel newWindowConfPane = new JPanel(new BorderLayout()); UILabel heightLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Height")); - heightTextFiled = new UISpinner(0, Integer.MAX_VALUE, 1, DEFAULT_H_VALUE); + heightSpinner = new UISpinner(0, Integer.MAX_VALUE, 1, DEFAULT_H_VALUE); UILabel widthLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Designer_Width")); - widthTextFiled = new UISpinner(0, Integer.MAX_VALUE, 1, DEFAULT_V_VALUE); + widthSpinner = new UISpinner(0, Integer.MAX_VALUE, 1, DEFAULT_V_VALUE); newWindowConfPane.add(column(10, - row(cell(heightLabel).weight(0.2), cell(heightTextFiled).weight(0.8)), - row(cell(widthLabel).weight(0.2), cell(widthTextFiled).weight(0.8)) + row(cell(heightLabel).weight(0.2), cell(heightSpinner).weight(0.8)), + row(cell(widthLabel).weight(0.2), cell(widthSpinner).weight(0.8)) ).getComponent()); JPanel centerPanel = new JPanel(new BorderLayout()); @@ -104,28 +104,28 @@ public abstract class AbstractHyperNorthPane extends BasicB this.targetFrameComboBox = targetFrameComboBox; } - public UISpinner getHeightTextFiled() { - return heightTextFiled; + public UISpinner getHeightSpinner() { + return heightSpinner; } - public void setHeightTextFiled(UISpinner heightTextFiled) { - this.heightTextFiled = heightTextFiled; + public void setHeightSpinner(UISpinner heightSpinner) { + this.heightSpinner = heightSpinner; } - public UISpinner getWidthTextFiled() { - return widthTextFiled; + public UISpinner getWidthSpinner() { + return widthSpinner; } - public void setWidthTextFiled(UISpinner widthTextFiled) { - this.widthTextFiled = widthTextFiled; + public void setWidthSpinner(UISpinner widthSpinner) { + this.widthSpinner = widthSpinner; } @Override public void populateBean(T link) { String name = link.getTargetFrame(); targetFrameComboBox.setSelectedIndex(HyperlinkTargetFrame.convert(name)); - heightTextFiled.setValue(link.getHeight() == 0 ? DEFAULT_H_VALUE : link.getHeight()); - widthTextFiled.setValue(link.getWidth() == 0 ? DEFAULT_V_VALUE : link.getWidth()); + heightSpinner.setValue(link.getHeight() == 0 ? DEFAULT_H_VALUE : link.getHeight()); + widthSpinner.setValue(link.getWidth() == 0 ? DEFAULT_V_VALUE : link.getWidth()); populateSubHyperlinkBean(link); } @@ -145,8 +145,8 @@ public abstract class AbstractHyperNorthPane extends BasicB public void updateBean(T link) { updateSubHyperlinkBean(link); link.setTargetFrame(HyperlinkTargetFrame.parse(targetFrameComboBox.getSelectedIndex()).getName()); - link.setHeight(Utils.objectToNumber(heightTextFiled.getValue(), false).intValue()); - link.setWidth(Utils.objectToNumber(widthTextFiled.getValue(), false).intValue()); + link.setHeight(Utils.objectToNumber(heightSpinner.getValue(), false).intValue()); + link.setWidth(Utils.objectToNumber(widthSpinner.getValue(), false).intValue()); } } 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 55bb6edd58..1858efb5b5 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 @@ -372,14 +372,14 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane dialogComponents) {// 对话框大小 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); + UISpinner heightSpinner = new UISpinner(0, Integer.MAX_VALUE, 1, DEFAULT_H_VALUE); + this.setHeightSpinner(heightSpinner); 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); + UISpinner widthSpinner = new UISpinner(0, Integer.MAX_VALUE, 1, DEFAULT_V_VALUE); + this.setWidthSpinner(widthSpinner); sizePane.add(column(10, - row(4, cell(heightLabel).weight(0.15), cell(heightTextFiled).weight(0.85)), - row(4, cell(widthLabel).weight(0.15), cell(widthTextFiled).weight(0.85)) + row(4, cell(heightLabel).weight(0.15), cell(heightSpinner).weight(0.85)), + row(4, cell(widthLabel).weight(0.15), cell(widthSpinner).weight(0.85)) ).getComponent()); sizePane.setVisible(true); dialogComponents.add(new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Dialog_Size")), sizePane});