From c81cccaa8a45a668306095ae56cc20afdd2340d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=E7=A3=8A?= <294531121@qq.com> Date: Mon, 23 Aug 2021 18:05:26 +0800 Subject: [PATCH 1/5] =?UTF-8?q?REPORT-56855=20=E6=A0=91=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E4=BF=AE=E6=94=B9=E5=90=8D=E7=A7=B0=E5=90=8E-?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8=E5=86=85=E7=9A=84=E6=A0=91?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E5=90=8D=E7=A7=B0=E4=B8=8D=E4=BC=9A?= =?UTF-8?q?=E6=94=B9=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/data/DesignTableDataManager.java | 9 +++++++++ .../fr/design/data/datapane/TreeTableDataComboBox.java | 10 ++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java b/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java index f1758f0689..4018a4f1d2 100644 --- a/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java +++ b/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java @@ -168,6 +168,15 @@ public abstract class DesignTableDataManager { } } + public static String getFinalChangedDsNameByOldDsName(String oldDsName) { + String changeName = getChangedDsNameByOldDsName(oldDsName); + if (StringUtils.isNotEmpty(changeName)) { + return getFinalChangedDsNameByOldDsName(changeName); + } else { + return oldDsName; + } + } + public static void addGlobalDsChangeListener(ChangeListener l) { globalDsListeners.add(l); } diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TreeTableDataComboBox.java b/designer-base/src/main/java/com/fr/design/data/datapane/TreeTableDataComboBox.java index 8964ff8de0..7ab969ae6f 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/TreeTableDataComboBox.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/TreeTableDataComboBox.java @@ -9,6 +9,7 @@ import com.fr.design.data.tabledata.wrapper.TemplateTableDataWrapper; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.icombobox.UIComboBoxRenderer; import com.fr.file.TableDataConfig; +import com.fr.stable.StringUtils; import javax.swing.*; import java.awt.*; @@ -80,12 +81,13 @@ public class TreeTableDataComboBox extends UIComboBox { } public void setSelectedTableDataByName(String name) { + refresh(); TableDataWrapper tableDataWrapper; - if (res_map.get(name) != null) { - tableDataWrapper = res_map.get(name); - } else { - String changeName = DesignTableDataManager.getChangedDsNameByOldDsName(name); + String changeName = DesignTableDataManager.getFinalChangedDsNameByOldDsName(name); + if (StringUtils.isNotEmpty(changeName)) { tableDataWrapper = res_map.get(changeName); + } else { + tableDataWrapper = res_map.get(name); } this.getModel().setSelectedItem(tableDataWrapper); } From 9f2e530ba4d81e585da4d69f8127e6b81f3c3cf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=E7=A3=8A?= <294531121@qq.com> Date: Tue, 24 Aug 2021 09:57:16 +0800 Subject: [PATCH 2/5] =?UTF-8?q?REPORT-56855=20=E5=B0=86=E5=8E=9F=E6=9D=A5?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=E5=90=8E=E7=9A=84=E5=90=8D=E5=AD=97=E7=9A=84=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E6=94=B9=E6=88=90=E7=A7=81=E6=9C=89=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/data/DesignTableDataManager.java | 8 +++--- .../data/datapane/TableDataComboBox.java | 25 +++++++++---------- .../data/datapane/TreeTableDataComboBox.java | 2 +- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java b/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java index 4018a4f1d2..ee8214297f 100644 --- a/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java +++ b/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java @@ -160,7 +160,7 @@ public abstract class DesignTableDataManager { return dsNameChangedMap.containsKey(oldDsName); } - public static String getChangedDsNameByOldDsName(String oldDsName) { + private static String getChangedDsNameFromMap(String oldDsName) { if (isDsNameChanged(oldDsName)) { return dsNameChangedMap.get(oldDsName); } else { @@ -168,10 +168,10 @@ public abstract class DesignTableDataManager { } } - public static String getFinalChangedDsNameByOldDsName(String oldDsName) { - String changeName = getChangedDsNameByOldDsName(oldDsName); + public static String getChangedDsNameByOldDsName(String oldDsName) { + String changeName = getChangedDsNameFromMap(oldDsName); if (StringUtils.isNotEmpty(changeName)) { - return getFinalChangedDsNameByOldDsName(changeName); + return getChangedDsNameByOldDsName(changeName); } else { return oldDsName; } diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataComboBox.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataComboBox.java index ebbdbf0f35..cda0fd084e 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataComboBox.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataComboBox.java @@ -1,27 +1,26 @@ package com.fr.design.data.datapane; -import java.awt.Component; -import java.awt.event.ItemEvent; -import java.util.Iterator; -import java.util.Map.Entry; - -import javax.swing.DefaultComboBoxModel; -import javax.swing.JLabel; -import javax.swing.JList; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; - +import com.fr.data.TableDataSource; import com.fr.design.constants.UIConstants; import com.fr.design.data.DesignTableDataManager; -import com.fr.data.TableDataSource; import com.fr.design.data.tabledata.Prepare4DataSourceChange; -import com.fr.design.data.tabledata.wrapper.TemplateTableDataWrapper; import com.fr.design.data.tabledata.wrapper.TableDataWrapper; +import com.fr.design.data.tabledata.wrapper.TemplateTableDataWrapper; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.icombobox.UIComboBoxRenderer; import com.fr.general.ComparatorUtils; import com.fr.stable.StringUtils; +import javax.swing.DefaultComboBoxModel; +import javax.swing.JLabel; +import javax.swing.JList; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; +import java.awt.Component; +import java.awt.event.ItemEvent; +import java.util.Iterator; +import java.util.Map.Entry; + /** * 包含所有数据集的下拉框 * diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TreeTableDataComboBox.java b/designer-base/src/main/java/com/fr/design/data/datapane/TreeTableDataComboBox.java index 7ab969ae6f..422a3a49a8 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/TreeTableDataComboBox.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/TreeTableDataComboBox.java @@ -83,7 +83,7 @@ public class TreeTableDataComboBox extends UIComboBox { public void setSelectedTableDataByName(String name) { refresh(); TableDataWrapper tableDataWrapper; - String changeName = DesignTableDataManager.getFinalChangedDsNameByOldDsName(name); + String changeName = DesignTableDataManager.getChangedDsNameByOldDsName(name); if (StringUtils.isNotEmpty(changeName)) { tableDataWrapper = res_map.get(changeName); } else { From 2b1ac0869c58761749fca3dd19790f269fd60e25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=E7=A3=8A?= <294531121@qq.com> Date: Tue, 24 Aug 2021 10:22:05 +0800 Subject: [PATCH 3/5] =?UTF-8?q?REPORT-56855=20=E4=BC=98=E5=8C=96=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/data/DesignTableDataManager.java | 11 ++++---- .../data/datapane/TableDataComboBox.java | 25 ++++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java b/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java index ee8214297f..ab86a0d6f2 100644 --- a/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java +++ b/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java @@ -160,16 +160,15 @@ public abstract class DesignTableDataManager { return dsNameChangedMap.containsKey(oldDsName); } - private static String getChangedDsNameFromMap(String oldDsName) { + public static String getChangedDsNameByOldDsName(String oldDsName) { + String changeName; + if (isDsNameChanged(oldDsName)) { - return dsNameChangedMap.get(oldDsName); + changeName = dsNameChangedMap.get(oldDsName); } else { - return StringUtils.EMPTY; + changeName = StringUtils.EMPTY; } - } - public static String getChangedDsNameByOldDsName(String oldDsName) { - String changeName = getChangedDsNameFromMap(oldDsName); if (StringUtils.isNotEmpty(changeName)) { return getChangedDsNameByOldDsName(changeName); } else { diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataComboBox.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataComboBox.java index cda0fd084e..ebbdbf0f35 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataComboBox.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataComboBox.java @@ -1,26 +1,27 @@ package com.fr.design.data.datapane; -import com.fr.data.TableDataSource; +import java.awt.Component; +import java.awt.event.ItemEvent; +import java.util.Iterator; +import java.util.Map.Entry; + +import javax.swing.DefaultComboBoxModel; +import javax.swing.JLabel; +import javax.swing.JList; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; + import com.fr.design.constants.UIConstants; import com.fr.design.data.DesignTableDataManager; +import com.fr.data.TableDataSource; import com.fr.design.data.tabledata.Prepare4DataSourceChange; -import com.fr.design.data.tabledata.wrapper.TableDataWrapper; import com.fr.design.data.tabledata.wrapper.TemplateTableDataWrapper; +import com.fr.design.data.tabledata.wrapper.TableDataWrapper; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.icombobox.UIComboBoxRenderer; import com.fr.general.ComparatorUtils; import com.fr.stable.StringUtils; -import javax.swing.DefaultComboBoxModel; -import javax.swing.JLabel; -import javax.swing.JList; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; -import java.awt.Component; -import java.awt.event.ItemEvent; -import java.util.Iterator; -import java.util.Map.Entry; - /** * 包含所有数据集的下拉框 * From b4dc091c764c9f86c510fe93acb774aff1898f33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=E7=A3=8A?= <294531121@qq.com> Date: Tue, 24 Aug 2021 10:56:47 +0800 Subject: [PATCH 4/5] =?UTF-8?q?REPORT-57202=20FR11=E4=B8=80=E8=BD=AE?= =?UTF-8?q?=E5=9B=9E=E5=BD=92-=E9=A1=B5=E9=9D=A2=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E7=BA=B8=E5=BC=A0=E5=A4=A7=E5=B0=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/gui/frpane/JTreeAutoBuildPane.java | 11 +++++++---- .../main/java/com/fr/design/report/PageSetupPane.java | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java index 6103e68002..83c52ac784 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java @@ -27,13 +27,16 @@ import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.stable.StringUtils; -import java.awt.*; + +import javax.swing.JPanel; +import javax.swing.event.PopupMenuEvent; +import javax.swing.event.PopupMenuListener; +import java.awt.BorderLayout; +import java.awt.Component; +import java.awt.Dimension; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import java.util.List; -import javax.swing.*; -import javax.swing.event.PopupMenuEvent; -import javax.swing.event.PopupMenuListener; public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previewable, EditOrNewLabel.Editable { private TreeTableDataComboBox treeTableDataComboBox; diff --git a/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java b/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java index 668700a95e..ff297929a6 100644 --- a/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java @@ -779,7 +779,7 @@ public class PageSetupPane extends BasicPane { //使用科学计数法显示长度的时候，限制纵向显示长度为9位 if (h_str.contains(E)) { String str1 = h_str.substring(h_str.indexOf(E)); - String str2 = h_str.substring(0, 9 - str1.length()); + String str2 = h_str.substring(0, h_str.length() - str1.length()); h_str = str2 + str1; } else if (h_str.indexOf(CoreConstants.DOT) > 0) { h_str = h_str.substring(0, h_str.indexOf(CoreConstants.DOT) + 2); From ee29df29ba37529ef032740f07c5140faa588740 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=E7=A3=8A?= <294531121@qq.com> Date: Tue, 24 Aug 2021 11:27:32 +0800 Subject: [PATCH 5/5] =?UTF-8?q?REPORT-57202=20=E6=B7=BB=E5=8A=A0=E5=8E=9F?= =?UTF-8?q?=E5=85=88=E2=80=9C=E7=BA=B5=E5=90=91=E6=98=BE=E7=A4=BA=E9=95=BF?= =?UTF-8?q?=E5=BA=A6=E4=B8=BA9=E4=BD=8D=E2=80=9D=E7=9A=84=E9=99=90?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/report/PageSetupPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java b/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java index ff297929a6..3074bb009a 100644 --- a/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java @@ -779,7 +779,7 @@ public class PageSetupPane extends BasicPane { //使用科学计数法显示长度的时候，限制纵向显示长度为9位 if (h_str.contains(E)) { String str1 = h_str.substring(h_str.indexOf(E)); - String str2 = h_str.substring(0, h_str.length() - str1.length()); + String str2 = h_str.substring(0, Math.min(h_str.length(), 9) - str1.length()); h_str = str2 + str1; } else if (h_str.indexOf(CoreConstants.DOT) > 0) { h_str = h_str.substring(0, h_str.indexOf(CoreConstants.DOT) + 2);