From 9c694f26fc87fe23fc85d5ecefdc915bcd0ae6a9 Mon Sep 17 00:00:00 2001
From: plough <plough@fanruan.com>
Date: Fri, 7 Sep 2018 17:32:15 +0800
Subject: [PATCH 1/3] =?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 <Harrison@fanruan.com>
Date: Tue, 11 Sep 2018 09:58:25 +0800
Subject: [PATCH 2/3] =?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<T extends WebContent> extends BasicBeanPane<Re
         this.remove(title);
         // 如果是空值就说明采用服务器配置了
         if (reportWebAttr == null || this.getWebContent(reportWebAttr) == null) {
-            title = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ServerToolbar_Choose_Role"));
+            title = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Server_Toolbar_Choose_Role"));
             populateServerSettings();
             this.add(title, 0);
             return;

From 26504d4b45e64e8117ce15f7f390180ab274b2ff Mon Sep 17 00:00:00 2001
From: zheng <zheng@finereport.com>
Date: Tue, 11 Sep 2018 17:40:59 +0800
Subject: [PATCH 3/3] =?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<T extends AbstractData
 
     protected void initComponents() {
         String[] labels = fieldLabel();
-        TinyFormulaPane[] formulaPanes = formulaPanes();
+        Component[] formulaPanes = fieldComponents();
 
         int len = Math.min(labels.length, formulaPanes.length);
 
@@ -49,6 +49,10 @@ public abstract class AbstractExtendedChartReportDataPane<T extends AbstractData
         this.add(panel, BorderLayout.CENTER);
     }
 
+    protected Component[] fieldComponents() {
+        return formulaPanes();
+    }
+
     protected abstract String[] fieldLabel();
 
     protected abstract TinyFormulaPane[] formulaPanes();