From 07f57f8677ce42b6bdbe2a368ce1c427bc6fb3f5 Mon Sep 17 00:00:00 2001
From: MoMeak <MoMeak@fanruan.com>
Date: Tue, 15 Aug 2017 16:35:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B4=A8=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/mainframe/ReportComponentComposite.java |  2 +-
 designer/src/com/fr/poly/PolyDesigner.java            | 11 ++++-------
 .../fr/design/editor/DoubleDeckValueEditorPane.java   |  1 +
 .../com/fr/design/present/dict/DatabaseDictPane.java  |  2 --
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/designer/src/com/fr/design/mainframe/ReportComponentComposite.java b/designer/src/com/fr/design/mainframe/ReportComponentComposite.java
index 0e166904c..09b03c183 100644
--- a/designer/src/com/fr/design/mainframe/ReportComponentComposite.java
+++ b/designer/src/com/fr/design/mainframe/ReportComponentComposite.java
@@ -129,7 +129,7 @@ public class ReportComponentComposite extends JComponent {
         }
 
         if (centerCardPane.editingComponet.elementCasePane == null) {
-            ((PolyDesigner)centerCardPane.editingComponet).polyArea.addMouseWheelListener(showValSpinnerMouseWheelListener);
+            centerCardPane.getPolyDezi().polyArea.addMouseWheelListener(showValSpinnerMouseWheelListener);
             return;
         }
         Grid grid = centerCardPane.editingComponet.elementCasePane.getGrid();
diff --git a/designer/src/com/fr/poly/PolyDesigner.java b/designer/src/com/fr/poly/PolyDesigner.java
index 03226fbb7..0c700a7bf 100644
--- a/designer/src/com/fr/poly/PolyDesigner.java
+++ b/designer/src/com/fr/poly/PolyDesigner.java
@@ -140,13 +140,10 @@ public class PolyDesigner extends ReportComponent<PolyWorkSheet, PolyElementCase
         @Override
         public void mouseWheelMoved(MouseWheelEvent evt) {
             int id = evt.getID();
-            switch (id) {
-                case MouseEvent.MOUSE_WHEEL: {
-                    if (!InputEventBaseOnOS.isControlDown(evt)) {
-                        int rotations = evt.getWheelRotation();
-                        verScrollBar.setValue(verScrollBar.getValue() + rotations * ROTATIONS);
-                    }
-                    break;
+            if (id == MouseEvent.MOUSE_WHEEL){
+                if (!InputEventBaseOnOS.isControlDown(evt)) {
+                    int rotations = evt.getWheelRotation();
+                    verScrollBar.setValue(verScrollBar.getValue() + rotations * ROTATIONS);
                 }
             }
         }
diff --git a/designer_base/src/com/fr/design/editor/DoubleDeckValueEditorPane.java b/designer_base/src/com/fr/design/editor/DoubleDeckValueEditorPane.java
index 94e73b450..77f50aa6d 100644
--- a/designer_base/src/com/fr/design/editor/DoubleDeckValueEditorPane.java
+++ b/designer_base/src/com/fr/design/editor/DoubleDeckValueEditorPane.java
@@ -340,6 +340,7 @@ public class DoubleDeckValueEditorPane extends BasicPane implements UIObserver,
      * 清除组件数据
      */
     public void clearComponentsData() {
+        setCurrentEditor(0);
         for (Editor card : cards) {
             card.clearData();
         }
diff --git a/designer_base/src/com/fr/design/present/dict/DatabaseDictPane.java b/designer_base/src/com/fr/design/present/dict/DatabaseDictPane.java
index c97487829..4b25c3436 100644
--- a/designer_base/src/com/fr/design/present/dict/DatabaseDictPane.java
+++ b/designer_base/src/com/fr/design/present/dict/DatabaseDictPane.java
@@ -270,9 +270,7 @@ public class DatabaseDictPane extends FurtherBasicBeanPane<DatabaseDictionary> i
      */
     public void reset() {
         keyColumnPane.clearComponentsData();
-        keyColumnPane.setCurrentEditor(0);
         valueDictPane.clearComponentsData();
-        valueDictPane.setCurrentEditor(0);
         chooseTable.resetComponets();
     }