From c2708d7684a8df627a8de75d27b20a891c0b7dba Mon Sep 17 00:00:00 2001
From: Yvan <Yvan@fanruan.com>
Date: Wed, 26 Aug 2020 16:16:39 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-37950=20=E6=99=AE=E9=80=9A=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8-=E5=A4=9Asheet-=E6=8A=A5=E8=A1=A8=E5=9D=97=E7=BC=A9?=
 =?UTF-8?q?=E6=94=BE=E5=A4=B1=E6=95=88=201.=20bug=E5=8E=9F=E5=9B=A0?=
 =?UTF-8?q?=EF=BC=9A=E5=BD=93=E6=96=B0=E5=BB=BA=E4=B8=80=E4=B8=AASheet?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E4=BB=A3=E7=A0=81=E4=BC=9A=E8=B5=B0=E5=88=B0?=
 =?UTF-8?q?=E8=BF=99=E4=B8=80=E6=AD=A5=EF=BC=8C=E6=96=B0=E5=BB=BA=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AAJFormSliderPane=EF=BC=8C=E7=84=B6=E5=90=8E=E5=9C=A8?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E7=BC=A9=E6=94=BE=E6=97=B6=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E7=9A=84=E6=98=AF=E6=97=A7=E7=9A=84JFormSliderPane?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84showValue=EF=BC=8C=E8=80=8CReportComponentCom?=
 =?UTF-8?q?posite=E4=B8=ADgetShowValue=E5=8F=96=E5=88=B0=E7=9A=84=E9=83=BD?=
 =?UTF-8?q?=E6=98=AF=E6=96=B0=E7=9A=84JFormSliderPane=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E5=80=BC=EF=BC=8C=E6=89=80=E4=BB=A5=E4=BC=9A=E5=8F=91=E7=8E=B0?=
 =?UTF-8?q?=E6=96=B0=E7=9A=84JFormSliderPane=E4=B8=ADshowValue=E4=B8=80?=
 =?UTF-8?q?=E7=9B=B4=E4=B8=8D=E5=8F=98=EF=BC=8C=E6=BB=9A=E5=8A=A8=E6=9D=A1?=
 =?UTF-8?q?=E5=A4=B1=E6=95=88=202.=20=E4=BF=AE=E6=94=B9=E6=80=9D=E8=B7=AF?=
 =?UTF-8?q?=E4=B8=BA=EF=BC=8C=E6=96=B0=E5=BB=BAsheet=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=8D=E7=84=B6=E4=BD=BF=E7=94=A8=E5=8E=9F=E6=9D=A5=E7=9A=84?=
 =?UTF-8?q?JFormSliderPane=EF=BC=8C=E8=80=8C=E5=9B=A0=E4=B8=BA=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84=E7=BC=A9=E6=94=BE=E5=90=8E=E7=9A=84=E7=BB=98?=
 =?UTF-8?q?=E5=88=B6=E6=98=AF=E8=B7=9Fresolution=E5=88=86=E8=BE=A8?=
 =?UTF-8?q?=E7=8E=87=E6=9C=89=E5=85=B3=EF=BC=8C=E6=89=80=E4=BB=A5=E5=85=B1?=
 =?UTF-8?q?=E7=94=A8JFormSliderPane=E4=B9=8B=E5=90=8E=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E5=90=8Csheet=E4=B8=AD=E7=9A=84=E7=95=8C=E9=9D=A2=E7=BC=A9?=
 =?UTF-8?q?=E6=94=BE=E8=BF=98=E6=98=AF=E5=8F=AF=E4=BB=A5=E5=88=86=E5=BC=80?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fr/design/mainframe/ReportComponentComposite.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/ReportComponentComposite.java b/designer-realize/src/main/java/com/fr/design/mainframe/ReportComponentComposite.java
index 84ae83838..66fed7afe 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/ReportComponentComposite.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/ReportComponentComposite.java
@@ -119,7 +119,8 @@ public class ReportComponentComposite extends JComponent implements RemoveListen
                 templateStateList.add(null);
             }
             centerCardPane.editingComponet.setSelection(centerCardPane.editingComponet.getDefaultSelectElement());
-            jSliderContainer = JFormSliderPane.getInstance();
+            // Yvan: REPORT-37950 普通报表-多sheet-报表块缩放失效
+            //jSliderContainer = JFormSliderPane.getInstance();
         }
 
         if (centerCardPane.editingComponet.elementCasePane == null) {