From 9abea324ebfd60d3e5f490f58ca934286ca5ce1d Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Tue, 29 Aug 2017 10:33:37 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-3914=20=E8=B0=83=E6=95=B4=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/mainframe/ElementCasePaneDelegate.java   |  7 +------
 .../mainframe/form/FormElementCasePaneDelegate.java |  7 +------
 designer/src/com/fr/poly/creator/ECBlockEditor.java |  7 +------
 .../design/mainframe/EastRegionContainerPane.java   | 13 +++++++++++--
 4 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java b/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java
index 89b3f681ab..dc8d5e1853 100644
--- a/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java
+++ b/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java
@@ -99,12 +99,7 @@ public class ElementCasePaneDelegate extends ElementCasePane<WorkSheet> {
                 EastRegionContainerPane.getInstance().replaceConditionAttrPane(conditionAttributesGroupPane);
                 EastRegionContainerPane.getInstance().replaceWidgetSettingsPane(CellWidgetPropertyPane.getInstance());
 
-                if (isSelectedOneCell()) {
-                    EastRegionContainerPane.getInstance().enableCellElementPane();
-                } else {  // 如果选中多个单元格，禁用单元格元素 tab
-                    EastRegionContainerPane.getInstance().disableCellElementPane();
-                    EastRegionContainerPane.getInstance().refreshRightPane();
-                }
+                EastRegionContainerPane.getInstance().updateCellElementState(isSelectedOneCell());
             }
             EastRegionContainerPane.getInstance().replaceHyperlinkPane(hyperlinkGroupPane);
             EastRegionContainerPane.getInstance().removeParameterPane();
diff --git a/designer/src/com/fr/design/mainframe/form/FormElementCasePaneDelegate.java b/designer/src/com/fr/design/mainframe/form/FormElementCasePaneDelegate.java
index 387ed8154b..68ee0d79bd 100644
--- a/designer/src/com/fr/design/mainframe/form/FormElementCasePaneDelegate.java
+++ b/designer/src/com/fr/design/mainframe/form/FormElementCasePaneDelegate.java
@@ -46,12 +46,7 @@ public class FormElementCasePaneDelegate extends ElementCasePane<FormElementCase
                 ConditionAttributesGroupPane conditionAttributesGroupPane = ConditionAttributesGroupPane.getInstance();
                 conditionAttributesGroupPane.populate(FormElementCasePaneDelegate.this);
 
-                if (isSelectedOneCell()) {
-                    EastRegionContainerPane.getInstance().enableCellElementPane();
-                } else {  // 如果选中多个单元格，禁用单元格元素 tab
-                    EastRegionContainerPane.getInstance().disableCellElementPane();
-                    EastRegionContainerPane.getInstance().refreshRightPane();
-                }
+                EastRegionContainerPane.getInstance().updateCellElementState(isSelectedOneCell());
             }
         });
         this.addTargetModifiedListener(new TargetModifiedListener() {
diff --git a/designer/src/com/fr/poly/creator/ECBlockEditor.java b/designer/src/com/fr/poly/creator/ECBlockEditor.java
index 6c36f24391..73d33defee 100644
--- a/designer/src/com/fr/poly/creator/ECBlockEditor.java
+++ b/designer/src/com/fr/poly/creator/ECBlockEditor.java
@@ -158,12 +158,7 @@ public class ECBlockEditor extends BlockEditor<ECBlockPane, PolyECBlock> {
             EastRegionContainerPane.getInstance().replaceCellElementPane(QuickEditorRegion.getInstance());
             EastRegionContainerPane.getInstance().replaceWidgetSettingsPane(CellWidgetPropertyPane.getInstance());
 
-            if (isSelectedOneCell()) {
-                EastRegionContainerPane.getInstance().enableCellElementPane();
-            } else {  // 如果选中多个单元格，禁用单元格元素 tab
-                EastRegionContainerPane.getInstance().disableCellElementPane();
-                EastRegionContainerPane.getInstance().refreshRightPane();
-            }
+            EastRegionContainerPane.getInstance().updateCellElementState(isSelectedOneCell());
         }
 
         EastRegionContainerPane.getInstance().replaceCellAttrPane(CellElementPropertyPane.getInstance());
diff --git a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java
index 9df6d601f2..ed2d245b6c 100644
--- a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java
+++ b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java
@@ -153,12 +153,21 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         return defaultPane;
     }
 
+    public void updateCellElementState(boolean isSelectedOneCell) {
+        if (isSelectedOneCell) {
+            enableCellElementPane();
+        } else {  // 如果选中多个单元格，禁用单元格元素 tab
+            disableCellElementPane();
+            refreshRightPane();
+        }
+    }
+
     // 禁用单元格元素tab
-    public void disableCellElementPane() {
+    private void disableCellElementPane() {
         propertyItemMap.get(KEY_CELL_ELEMENT).setEnabled(false);
     }
     // 禁用单元格元素tab
-    public void enableCellElementPane() {
+    private void enableCellElementPane() {
         propertyItemMap.get(KEY_CELL_ELEMENT).setEnabled(true);
     }