From 35cd80a22ac385a2ea55a1318a6167cfd44485db Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Tue, 10 Oct 2017 14:56:35 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-4887=20@plough=EF=BC=9A9.0=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1=E5=99=A8=E4=BA=A4=E4=BA=92=E9=AA=8C=E6=94=B6=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=3D>=E9=80=89=E4=B8=AD=E6=82=AC=E6=B5=AE=E5=85=83?=
 =?UTF-8?q?=E7=B4=A0=E6=97=B6=EF=BC=8C=E5=8E=BB=E9=99=A4=E5=8D=95=E5=85=83?=
 =?UTF-8?q?=E6=A0=BC=E8=8F=9C=E5=8D=95=E4=B8=AD=E7=9A=84=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/actions/cell/CellAttributeTableAction.java |  6 ++++++
 .../fr/design/actions/cell/CellWidgetAttrAction.java  |  6 ++++++
 .../actions/cell/ConditionAttributesAction.java       |  6 ++++++
 .../fr/design/mainframe/EastRegionContainerPane.java  | 11 +++++++++++
 4 files changed, 29 insertions(+)

diff --git a/designer/src/com/fr/design/actions/cell/CellAttributeTableAction.java b/designer/src/com/fr/design/actions/cell/CellAttributeTableAction.java
index 7c554ff04..70812af32 100644
--- a/designer/src/com/fr/design/actions/cell/CellAttributeTableAction.java
+++ b/designer/src/com/fr/design/actions/cell/CellAttributeTableAction.java
@@ -2,6 +2,7 @@ package com.fr.design.actions.cell;
 
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.mainframe.CellElementPropertyPane;
+import com.fr.design.mainframe.EastRegionContainerPane;
 
 import java.awt.event.ActionEvent;
 
@@ -20,4 +21,9 @@ public abstract class CellAttributeTableAction extends UpdateAction {
 		CellElementPropertyPane.getInstance().GoToPane(getID());
 	}
 
+	@Override
+	public void update() {
+		super.update();
+		this.setEnabled(EastRegionContainerPane.getInstance().isCellAttrPaneEnabled());
+	}
 }
\ No newline at end of file
diff --git a/designer/src/com/fr/design/actions/cell/CellWidgetAttrAction.java b/designer/src/com/fr/design/actions/cell/CellWidgetAttrAction.java
index 7c4ee7087..e6f0fec24 100644
--- a/designer/src/com/fr/design/actions/cell/CellWidgetAttrAction.java
+++ b/designer/src/com/fr/design/actions/cell/CellWidgetAttrAction.java
@@ -24,4 +24,10 @@ public class CellWidgetAttrAction extends UpdateAction {
         EastRegionContainerPane.getInstance().switchTabTo(EastRegionContainerPane.KEY_WIDGET_SETTINGS);
         EastRegionContainerPane.getInstance().setWindow2PreferWidth();
     }
+
+    @Override
+    public void update() {
+        super.update();
+        this.setEnabled(EastRegionContainerPane.getInstance().isWidgetSettingsPaneEnabled());
+    }
 }
\ No newline at end of file
diff --git a/designer/src/com/fr/design/actions/cell/ConditionAttributesAction.java b/designer/src/com/fr/design/actions/cell/ConditionAttributesAction.java
index 0d5d7202c..1aecf94d5 100644
--- a/designer/src/com/fr/design/actions/cell/ConditionAttributesAction.java
+++ b/designer/src/com/fr/design/actions/cell/ConditionAttributesAction.java
@@ -26,4 +26,10 @@ public class ConditionAttributesAction extends UpdateAction {
         EastRegionContainerPane.getInstance().switchTabTo(EastRegionContainerPane.KEY_CONDITION_ATTR);
         EastRegionContainerPane.getInstance().setWindow2PreferWidth();
     }
+
+    @Override
+    public void update() {
+        super.update();
+        this.setEnabled(EastRegionContainerPane.getInstance().isConditionAttrPaneEnabled());
+    }
 }
\ No newline at end of file
diff --git a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java
index cd5a03f65..f6393add6 100644
--- a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java
+++ b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java
@@ -466,6 +466,17 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         }
     }
 
+    public boolean isConditionAttrPaneEnabled() {
+        return propertyItemMap.get(KEY_CONDITION_ATTR).isEnabled();
+    }
+
+    public boolean isWidgetSettingsPaneEnabled() {
+        return propertyItemMap.get(KEY_WIDGET_SETTINGS).isEnabled();
+    }
+
+    public boolean isCellAttrPaneEnabled() {
+        return propertyItemMap.get(KEY_CELL_ATTR).isEnabled();
+    }
 
 
     class PropertyItem {