From 80fa1d102a53a75759b12bb73f00396ebb8f235b Mon Sep 17 00:00:00 2001 From: hades Date: Fri, 30 Oct 2020 17:45:48 +0800 Subject: [PATCH 1/3] =?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 a139a54280..f084d83766 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 @@ -763,10 +763,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 ea7874963102b82ba63a1ae5bd3c9ad635bb532a Mon Sep 17 00:00:00 2001 From: hades Date: Mon, 2 Nov 2020 11:30:57 +0800 Subject: [PATCH 2/3] =?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 f084d83766..6032479144 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 @@ -760,13 +760,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 { //参数面板 From 63d53215ffdef923d2e2d80e1f31db38daa64933 Mon Sep 17 00:00:00 2001 From: hades Date: Wed, 11 Nov 2020 17:34:55 +0800 Subject: [PATCH 3/3] =?UTF-8?q?REPORT-43280=20=E5=8F=82=E6=95=B0=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=E6=8E=A7=E4=BB=B6=E9=80=89=E4=B8=8D=E5=88=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/designer/beans/models/StateModel.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/designer-form/src/main/java/com/fr/design/designer/beans/models/StateModel.java b/designer-form/src/main/java/com/fr/design/designer/beans/models/StateModel.java index c5150baa56..5045e13875 100644 --- a/designer-form/src/main/java/com/fr/design/designer/beans/models/StateModel.java +++ b/designer-form/src/main/java/com/fr/design/designer/beans/models/StateModel.java @@ -301,12 +301,14 @@ public class StateModel { Rectangle bounds = createCurrentBounds(x, y); // 有参数面板时 要考虑下参数面板的高度影响 - int yOffset = 0; - XLayoutContainer paramComponent = designer.getParaComponent(); - if (paramComponent != null) { - yOffset = paramComponent.getHeight(); + if (!designer.isFormParaDesigner()) { + int yOffset = 0; + XLayoutContainer paramComponent = designer.getParaComponent(); + if (paramComponent != null) { + yOffset = paramComponent.getHeight(); + } + bounds.y = Math.max(bounds.y - yOffset, 0); } - bounds.y = Math.max(bounds.y - yOffset, 0); if ((x != currentX) || (y != currentY)) { ArrayList creators = getHotspotCreators(bounds, designer.getRootComponent());