From 7a046976134ef767de578d2134d7c835028acf6a Mon Sep 17 00:00:00 2001 From: hades Date: Fri, 30 Oct 2020 17:45:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-42470=20=E5=81=87=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/mainframe/JWorkBook.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java b/designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java index 05830dfd03..f48bd579f2 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java @@ -779,10 +779,10 @@ public class JWorkBook extends JTemplate { DesignModuleFactory.getFormHierarchyPane().refreshRoot(); } } else { - reportComposite.setSelectedIndex(u.getSelectedReportIndex()); u.getSelectedEditingState().revert(); TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter()).refreshDockingView(); } + reportComposite.setSelectedIndex(u.getSelectedReportIndex()); this.undoState = u; } else { //参数面板 From 683503e4c9e4037492a557e2e428ec0753c31343 Mon Sep 17 00:00:00 2001 From: hades Date: Mon, 2 Nov 2020 11:30:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-42470=20=E8=B0=83=E6=95=B4=E4=B8=8B?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=20=E4=BF=9D=E8=AF=81=E5=8E=9F=E9=A1=BA?= =?UTF-8?q?=E5=BA=8F=E4=B8=8D=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/mainframe/JWorkBook.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java b/designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java index f48bd579f2..7cc0ca2832 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java @@ -776,13 +776,14 @@ public class JWorkBook extends JTemplate { if (hasParameterPane()) { parameterPane.populate(u.getApplyTarget()); setAutoHeightForCenterPane(); + reportComposite.setSelectedIndex(u.getSelectedReportIndex()); DesignModuleFactory.getFormHierarchyPane().refreshRoot(); } } else { + reportComposite.setSelectedIndex(u.getSelectedReportIndex()); u.getSelectedEditingState().revert(); TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter()).refreshDockingView(); } - reportComposite.setSelectedIndex(u.getSelectedReportIndex()); this.undoState = u; } else { //参数面板