From c221d03f544acb635c8a76d8d750aa935d5a1c79 Mon Sep 17 00:00:00 2001 From: Yvan Date: Tue, 22 Sep 2020 10:43:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?REPORT-38516=20=E3=80=90=E5=9B=9E=E5=BD=92?= =?UTF-8?q?=E3=80=91=E6=A8=A1=E6=9D=BF=E9=87=8D=E5=91=BD=E5=90=8D=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E8=BE=93=E5=85=A5=E6=A1=86=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=8D=E5=85=A8=201.=20bug=E5=8E=9F=E5=9B=A0=EF=BC=9A?= =?UTF-8?q?=E5=AD=97=E4=BD=93=E5=BC=82=E5=B8=B8=E5=AF=BC=E8=87=B4=E4=B9=8B?= =?UTF-8?q?=E5=89=8D=E8=83=BD=E6=94=BE=E4=B8=8B=E7=9A=84=E6=96=87=E6=9C=AC?= =?UTF-8?q?=E6=A1=86=E8=A2=AB=E6=8C=A4=E4=B8=8B=E5=8E=BB=E4=BA=86=202.=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B9=E6=A1=88=EF=BC=9A=E5=B0=86=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E9=87=8D=E5=91=BD=E5=90=8D=E5=BC=B9=E7=AA=97=E7=9A=84?= =?UTF-8?q?=E5=AE=BD=E5=BA=A6=E5=A2=9E=E5=A4=A7=EF=BC=8C=E4=B8=8Ehades?= =?UTF-8?q?=E6=94=B9=E7=9A=84=E6=96=87=E4=BB=B6=E5=A4=B9=E9=87=8D=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E5=BC=B9=E7=AA=97=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/mainframe/DesignerFrameFileDealerPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java index a9d9281e9..86f73982f 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java @@ -649,7 +649,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt BorderLayout.CENTER); - this.setSize(340, 180); + this.setSize(380, 180); this.setTitle(Toolkit.i18nText("Fine-Design_Basic_Rename")); this.setResizable(false); this.setAlwaysOnTop(true); From 22ad83f2e74a1b2061d2e07884dd598cb5ccbd26 Mon Sep 17 00:00:00 2001 From: Yvan Date: Wed, 23 Sep 2020 09:36:58 +0800 Subject: [PATCH 2/3] =?UTF-8?q?REPORT-39338=20=E3=80=90=E5=9B=9E=E5=BD=92?= =?UTF-8?q?=E3=80=91=E5=86=85=E7=BD=AE=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=E8=BF=9B=E5=BA=A6=E6=9D=A1=E4=BC=9A=E5=85=88=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E4=B8=8A=E6=AC=A1=E7=9A=84=E8=BF=9B=E5=BA=A6=E5=86=8D?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=20=E6=9B=B4=E6=96=B0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=96=B9=E6=A1=88=EF=BC=9A=E4=B8=8D=E6=94=B9=E5=8F=98?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E5=A4=A7=E5=B0=8F=EF=BC=8C=E5=B0=86=E5=8E=9F?= =?UTF-8?q?=E6=9C=AC=E6=96=87=E5=AD=97=E6=A0=87=E7=AD=BEsetPreferredSize?= =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=89=EF=BC=8C=E5=9C=A8FlowLayout?= =?UTF-8?q?=E5=B8=83=E5=B1=80=E4=B8=8B=EF=BC=8C=E6=A0=87=E7=AD=BE=E5=A4=A7?= =?UTF-8?q?=E5=B0=8F=E4=BC=9A=E8=87=AA=E9=80=82=E5=BA=94=EF=BC=8C=E5=8F=A6?= =?UTF-8?q?=E5=A4=96=E6=B5=8B=E8=AF=95=E7=9A=84=E6=97=B6=E5=80=99=E5=8F=91?= =?UTF-8?q?=E7=8E=B0=E5=9C=A8=E6=97=A5=E8=AF=AD=E5=92=8C=E9=9F=A9=E8=AF=AD?= =?UTF-8?q?=E4=B8=8B=E6=96=87=E5=AD=97=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8?= =?UTF-8?q?=EF=BC=8C=E8=BF=99=E6=98=AF=E4=B8=AA=E4=BB=A5=E5=89=8D=E5=B0=B1?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E4=B8=8E?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=92=8C=E5=9B=BD=E9=99=85=E5=8C=96=E5=90=8C?= =?UTF-8?q?=E5=AD=A6=E6=B2=9F=E9=80=9A=E4=BA=86=EF=BC=8C=E7=B2=BE=E7=AE=80?= =?UTF-8?q?=E7=BF=BB=E8=AF=91=EF=BC=8C=E8=BF=99=E6=AC=A1=E9=A1=BA=E4=BE=BF?= =?UTF-8?q?=E4=B8=80=E8=B5=B7=E6=94=B9=E4=BA=86=20CHART-15905=20=E6=9C=80?= =?UTF-8?q?=E6=96=B0=E7=9A=84release=E6=8F=92=E4=BB=B6=EF=BC=8C=E6=89=93?= =?UTF-8?q?=E5=BC=80cpt=E7=A9=BA=E7=99=BD=EF=BC=8C=E6=89=93=E5=BC=80frm?= =?UTF-8?q?=E7=9A=84=EF=BC=8C=E5=8F=B3=E4=BE=A7=E9=9D=A2=E6=9D=BF=E6=89=93?= =?UTF-8?q?=E4=B8=8D=E5=BC=80=20=E3=80=90=E9=97=AE=E9=A2=98=E5=8E=9F?= =?UTF-8?q?=E5=9B=A0=E3=80=91=E4=B9=8B=E5=89=8D=E6=94=B9=E5=8A=A8=E7=9A=84?= =?UTF-8?q?UISpinner=EF=BC=8C=E6=B7=BB=E5=8A=A0=E4=BA=86=E4=B8=80=E7=A7=8D?= =?UTF-8?q?=E4=BC=A0=E5=8F=82=E4=B8=BAdouble=E3=80=81double=E3=80=81double?= =?UTF-8?q?=E3=80=81int=E7=9A=84=E6=9E=84=E9=80=A0=E6=96=B9=E6=B3=95?= =?UTF-8?q?=EF=BC=8C=E4=B8=8E=E5=8F=A6=E4=B8=80=E4=B8=AA=E5=8E=9F=E6=9C=89?= =?UTF-8?q?=E7=9A=84double=E3=80=81double=E3=80=81double=E3=80=81double?= =?UTF-8?q?=E5=86=B2=E7=AA=81=E4=BA=86=EF=BC=8C=E5=9B=A0=E4=B8=BA=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=86=85=E5=BE=88=E5=A4=9A=E5=9C=B0=E6=96=B9=E9=83=BD?= =?UTF-8?q?=E6=98=AF=E4=BC=A0=E4=BA=86=E5=9B=9B=E4=B8=AAint=E5=80=BC?= =?UTF-8?q?=E8=BF=9B=E6=9D=A5=EF=BC=8C=E7=84=B6=E5=90=8E=E8=A2=AB=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E4=BA=86=E6=96=B0=E6=B7=BB=E5=8A=A0=E7=9A=84=E9=82=A3?= =?UTF-8?q?=E7=A7=8D=E6=9E=84=E9=80=A0=E6=96=B9=E6=B3=95=20=E3=80=90?= =?UTF-8?q?=E6=94=B9=E5=8A=A8=E6=80=9D=E8=B7=AF=E3=80=91=E5=B0=86=E6=96=B0?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=9A=84=E6=9E=84=E9=80=A0=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E4=BC=A0=E5=8F=82=E4=BF=AE=E6=94=B9=E4=B8=BAdouble=E3=80=81dou?= =?UTF-8?q?ble=E3=80=81double=E3=80=81double=E3=80=81int=EF=BC=8C=E5=AF=B9?= =?UTF-8?q?=E7=AC=AC=E5=9B=9B=E4=B8=AAdouble=E5=80=BC=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E5=88=A4=E6=96=AD=EF=BC=8C=E5=A6=82=E6=9E=9C=E7=AD=89=E4=BA=8E?= =?UTF-8?q?Double.MIN=5FVALUE=EF=BC=8C=E5=B0=B1=E4=B8=8D=E5=81=9A=E5=A4=84?= =?UTF-8?q?=E7=90=86=EF=BC=8C=E5=90=A6=E5=88=99=E6=AD=A3=E5=B8=B8=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E4=B8=BAdefaultValue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/gui/ispinner/UISpinner.java | 13 ++++++++++++- .../mainframe/DesignerFrameFileDealerPane.java | 4 ++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/gui/ispinner/UISpinner.java b/designer-base/src/main/java/com/fr/design/gui/ispinner/UISpinner.java index a418a2b37..0d7c11ac4 100644 --- a/designer-base/src/main/java/com/fr/design/gui/ispinner/UISpinner.java +++ b/designer-base/src/main/java/com/fr/design/gui/ispinner/UISpinner.java @@ -56,9 +56,20 @@ public class UISpinner extends JPanel implements UIObserver, GlobalNameObserver textField.setValue(defaultValue); } - public UISpinner(double minValue, double maxValue, double dierta, int numberFieldColumns) { + /** + * 为了避免跟上面的构造方法冲突，这边构造器接收五个参数，当传入defaultValue为Double.MIN_VALUE时，不设置默认值 + * @param minValue + * @param maxValue + * @param dierta + * @param defaultValue + * @param numberFieldColumns + */ + public UISpinner(double minValue, double maxValue, double dierta, double defaultValue, int numberFieldColumns) { this.numberFieldColumns = numberFieldColumns; init(minValue, maxValue, dierta); + if (defaultValue != Double.MIN_VALUE) { + textField.setValue(defaultValue); + } } private void init(double minValue, double maxValue, double dierta) { this.minValue = minValue; diff --git a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java index 86f73982f..870853a45 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java @@ -556,7 +556,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt ); newNameLabel.setHorizontalAlignment(SwingConstants.RIGHT); newNameLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 10)); - newNameLabel.setPreferredSize(new Dimension(118, 15)); + //newNameLabel.setPreferredSize(new Dimension(118, 15)); // 重命名输入框 nameField = new UITextField(oldName); @@ -649,7 +649,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt BorderLayout.CENTER); - this.setSize(380, 180); + this.setSize(340, 180); this.setTitle(Toolkit.i18nText("Fine-Design_Basic_Rename")); this.setResizable(false); this.setAlwaysOnTop(true); From 2815e81223bbcaf3f391749876cc184341ebcd71 Mon Sep 17 00:00:00 2001 From: Yvan Date: Wed, 23 Sep 2020 10:04:40 +0800 Subject: [PATCH 3/3] =?UTF-8?q?CHART-15905=20=E6=9B=B4=E6=96=B0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=96=B9=E6=A1=88=EF=BC=9A=E4=B9=8B=E5=89=8D=E4=BB=A5?= =?UTF-8?q?=E4=B8=BA=E5=88=9D=E5=A7=8B=E5=8C=96=E4=BA=86UINumberField?= =?UTF-8?q?=E4=B9=8B=E5=90=8E=EF=BC=8C=E4=B8=8D=E8=83=BD=E5=86=8D=E6=94=B9?= =?UTF-8?q?=E5=8F=98=E5=88=97=E6=95=B0=E4=BA=86=EF=BC=8C=E5=88=9A=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E4=BA=86=E4=B8=80=E4=B8=8B=E5=8F=91=E7=8E=B0=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E7=9A=84=EF=BC=8C=E6=89=80=E4=BB=A5=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E6=B7=BB=E5=8A=A0=E4=BA=86=E4=B8=80=E4=B8=AAset?= =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=8C=E5=8F=AF=E4=BB=A5=E4=BF=AE=E6=94=B9?= =?UTF-8?q?Spinner=E5=86=85=E7=9A=84UINumberField=E7=9A=84=E5=88=97?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tabledatapane/MaxMemRowCountPanel.java | 3 ++- .../com/fr/design/gui/ispinner/UISpinner.java | 22 ++++++------------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MaxMemRowCountPanel.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MaxMemRowCountPanel.java index 2df6cda02..13fd60a60 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MaxMemRowCountPanel.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MaxMemRowCountPanel.java @@ -72,7 +72,8 @@ public class MaxMemRowCountPanel extends UIToolbar { this.setBackground(UIConstants.NORMAL_BACKGROUND); switchCache = new UIComboBox(CACHE_LIST); switchCache.addActionListener(switchStateL); - numberSpinner = new UISpinner(0, Integer.MAX_VALUE, 1, 4); + numberSpinner = new UISpinner(0, Integer.MAX_VALUE, 1); + numberSpinner.setNumberFieldColumns(4); } private void showAllPanel() { diff --git a/designer-base/src/main/java/com/fr/design/gui/ispinner/UISpinner.java b/designer-base/src/main/java/com/fr/design/gui/ispinner/UISpinner.java index 0d7c11ac4..c60ae2760 100644 --- a/designer-base/src/main/java/com/fr/design/gui/ispinner/UISpinner.java +++ b/designer-base/src/main/java/com/fr/design/gui/ispinner/UISpinner.java @@ -56,21 +56,6 @@ public class UISpinner extends JPanel implements UIObserver, GlobalNameObserver textField.setValue(defaultValue); } - /** - * 为了避免跟上面的构造方法冲突，这边构造器接收五个参数，当传入defaultValue为Double.MIN_VALUE时，不设置默认值 - * @param minValue - * @param maxValue - * @param dierta - * @param defaultValue - * @param numberFieldColumns - */ - public UISpinner(double minValue, double maxValue, double dierta, double defaultValue, int numberFieldColumns) { - this.numberFieldColumns = numberFieldColumns; - init(minValue, maxValue, dierta); - if (defaultValue != Double.MIN_VALUE) { - textField.setValue(defaultValue); - } - } private void init(double minValue, double maxValue, double dierta) { this.minValue = minValue; this.maxValue = maxValue; @@ -180,6 +165,13 @@ public class UISpinner extends JPanel implements UIObserver, GlobalNameObserver fireStateChanged(); } + /** + * 设置Spinner内的数字输入框列数 + * @param numberFieldColumns 输入框列数 + */ + public void setNumberFieldColumns(int numberFieldColumns) { + textField.setColumns(numberFieldColumns); + } public void setEnabled(boolean flag) { super.setEnabled(flag);