From 72d14d396ba3eccd5caaeec64c29e7d62e5ac5e7 Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Wed, 23 Aug 2017 09:48:53 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-4005=20[9.0=E4=B8=80=E8=BD=AE=E5=9B=9E?=
 =?UTF-8?q?=E5=BD=92]=20=E8=AE=BE=E7=BD=AE=E4=BA=8B=E4=BB=B6=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=8F=90=E4=BA=A4=E5=85=A5=E5=BA=93=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/mainframe/ElementCasePaneDelegate.java | 3 +++
 .../write/submit/SmartInsertDBManipulationPane.java      | 9 +++------
 designer/src/com/fr/poly/creator/ECBlockPane.java        | 3 +++
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java b/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java
index c5bd1e952..17eb28154 100644
--- a/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java
+++ b/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java
@@ -48,6 +48,9 @@ public class ElementCasePaneDelegate extends ElementCasePane<WorkSheet> {
 
             @Override
             public void selectionChanged(SelectionEvent e) {
+                if (!isEditable()) {
+                    return;
+                }
                 //在编辑权限，所以要更新权限编辑面板
                 if (BaseUtils.isAuthorityEditing()) {
                     AuthorityPropertyPane authorityPropertyPane = new AuthorityPropertyPane(ElementCasePaneDelegate.this);
diff --git a/designer/src/com/fr/design/write/submit/SmartInsertDBManipulationPane.java b/designer/src/com/fr/design/write/submit/SmartInsertDBManipulationPane.java
index e80d89c36..4c5cdb4e2 100644
--- a/designer/src/com/fr/design/write/submit/SmartInsertDBManipulationPane.java
+++ b/designer/src/com/fr/design/write/submit/SmartInsertDBManipulationPane.java
@@ -34,10 +34,7 @@ import com.fr.design.gui.ispinner.UIBasicSpinner;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
-import com.fr.design.mainframe.DesignerContext;
-import com.fr.design.mainframe.ElementCasePane;
-import com.fr.design.mainframe.JTemplate;
-import com.fr.design.mainframe.JWorkBook;
+import com.fr.design.mainframe.*;
 import com.fr.design.selection.SelectionEvent;
 import com.fr.design.selection.SelectionListener;
 import com.fr.general.Inter;
@@ -196,11 +193,11 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
 			/*
 			 * 当前的ReportPane不可编辑,不可切换Sheet,加GridSelectionChangeListener
 			 */
-			ePane.setSelection(NO_SELECTION);
 			ePane.setEditable(false);
+			ePane.setSelection(NO_SELECTION);
 			ePane.getGrid().setNotShowingTableSelectPane(false);
 
-			BasicDialog dlg = bPane.showWindow(SwingUtilities.getWindowAncestor(SmartInsertDBManipulationPane.this));
+			BasicDialog dlg = bPane.showWindow(DesignerContext.getDesignerFrame());
 
 			dlg.setModal(false);
 			dlg.setVisible(true);
diff --git a/designer/src/com/fr/poly/creator/ECBlockPane.java b/designer/src/com/fr/poly/creator/ECBlockPane.java
index edd93ce9a..ba6584767 100644
--- a/designer/src/com/fr/poly/creator/ECBlockPane.java
+++ b/designer/src/com/fr/poly/creator/ECBlockPane.java
@@ -52,6 +52,9 @@ public class ECBlockPane extends PolyElementCasePane {
 
             @Override
             public void selectionChanged(SelectionEvent e) {
+                if (!isEditable()) {
+                    return;
+                }
                 if (BaseUtils.isAuthorityEditing()) {
                     if (designer.getSelection().getEditingElementCasePane() == null) {
                         EastRegionContainerPane.getInstance().switchMode(EastRegionContainerPane.PropertyMode.AUTHORITY_EDITION_DISABLED);