From 9c694f26fc87fe23fc85d5ecefdc915bcd0ae6a9 Mon Sep 17 00:00:00 2001 From: plough Date: Fri, 7 Sep 2018 17:32:15 +0800 Subject: [PATCH 1/4] =?UTF-8?q?REPORT-11044=20frm=E4=B8=AD=E9=80=89?= =?UTF-8?q?=E4=B8=AD=E5=9D=97=E6=97=B6=EF=BC=8C=E8=80=81=E6=98=AF=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/mainframe/FormArea.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormArea.java b/designer-form/src/main/java/com/fr/design/mainframe/FormArea.java index 762b412f1..b42d1b41e 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormArea.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormArea.java @@ -540,16 +540,16 @@ public class FormArea extends JComponent implements ScrollRulerComponent { layout(); if (isValid) { XLayoutContainer root = designer.getRootComponent(); - setScrollBarProperties(root.getWidth() - designer.getWidth(), horScrollBar); + setScrollBarProperties(root.getWidth() - designer.getWidth(), horScrollBar, horizontalValue); //计算滚动条值的时候应该算上参数面板的高度 - setScrollBarProperties(designer.getParaHeight() + root.getHeight() - designer.getHeight(), verScrollBar); + setScrollBarProperties(designer.getParaHeight() + root.getHeight() - designer.getHeight(), verScrollBar, verticalValue); } } /** * 设置滚动条的属性 */ - private void setScrollBarProperties(int value, FormScrollBar bar) { + private void setScrollBarProperties(int value, FormScrollBar bar, int oldValue) { if (value == 0 && isScrollNotVisible(bar)) { return; } @@ -560,12 +560,11 @@ public class FormArea extends JComponent implements ScrollRulerComponent { bar.setValue(0); bar.setEnabled(false); } else { - //参数面板拖拽过程中value一直为当前value - int oldValue = verticalValue; setScrollBarMax(value, bar); bar.setEnabled(true); bar.setMaximum(value); bar.setValue(value); + //参数面板拖拽过程中value一直为当前value bar.setValue(oldValue); } } From dfc9a02c1810889d9563fe32e0ce33563da93c52 Mon Sep 17 00:00:00 2001 From: Harrison Date: Tue, 11 Sep 2018 09:58:25 +0800 Subject: [PATCH 2/4] =?UTF-8?q?REPORT-11201=20=E6=9D=83=E9=99=90=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E4=B8=AD=E7=9A=84=E5=9B=BD=E9=99=85=E5=8C=96=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/mainframe/AuthorityToolBarPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/AuthorityToolBarPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/AuthorityToolBarPane.java index ce336b23f..1fc891c8b 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/AuthorityToolBarPane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/AuthorityToolBarPane.java @@ -273,7 +273,7 @@ public class AuthorityToolBarPane extends BasicBeanPane Date: Tue, 11 Sep 2018 17:40:59 +0800 Subject: [PATCH 3/4] =?UTF-8?q?CHART-2912=20=E6=95=B0=E6=8D=AE=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=E8=87=AA=E5=AE=9A=E4=B9=89=EF=BC=88=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E6=95=B0=E6=8D=AE=E4=B8=8D=E7=94=A8=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E6=A1=86&=E5=8D=95=E5=85=83=E6=A0=BC=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=B8=8D=E7=94=A8=E5=85=AC=E5=BC=8F=E8=BE=93=E5=85=A5=E6=A1=86?= =?UTF-8?q?=EF=BC=89=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extended/chart/AbstractExtendedChartReportDataPane.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java b/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java index 9e4a84f03..b221ccb44 100644 --- a/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java +++ b/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java @@ -26,7 +26,7 @@ public abstract class AbstractExtendedChartReportDataPane Date: Wed, 12 Sep 2018 14:53:32 +0800 Subject: [PATCH 4/4] REPORT-11144 --- designer-realize/src/main/java/com/fr/start/Designer.java | 2 ++ .../src/main/java/com/fr/start/module/PreStartActivator.java | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/designer-realize/src/main/java/com/fr/start/Designer.java b/designer-realize/src/main/java/com/fr/start/Designer.java index 812359e39..3a5fe8f6b 100644 --- a/designer-realize/src/main/java/com/fr/start/Designer.java +++ b/designer-realize/src/main/java/com/fr/start/Designer.java @@ -4,6 +4,7 @@ import com.fr.base.BaseUtils; import com.fr.base.FRContext; import com.fr.base.vcs.DesignerMode; import com.fr.design.DesignerEnvManager; +import com.fr.design.RestartHelper; import com.fr.design.actions.core.ActionFactory; import com.fr.design.actions.file.WebPreviewUtils; import com.fr.design.actions.file.newReport.NewPolyReportAction; @@ -102,6 +103,7 @@ public class Designer extends BaseDesigner { DesignUtils.clientSend(args); return; } + RestartHelper.deleteRecordFilesWhenStart(); preloadResource(); diff --git a/designer-realize/src/main/java/com/fr/start/module/PreStartActivator.java b/designer-realize/src/main/java/com/fr/start/module/PreStartActivator.java index 1f7db5622..c4eea3bad 100644 --- a/designer-realize/src/main/java/com/fr/start/module/PreStartActivator.java +++ b/designer-realize/src/main/java/com/fr/start/module/PreStartActivator.java @@ -23,7 +23,6 @@ public class PreStartActivator extends Activator { @Override public void start() { - RestartHelper.deleteRecordFilesWhenStart(); CloudCenter.getInstance(); if (checkMultiStart()) { return;