diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/FormWidgetAuthorityEditPane.java b/designer-form/src/main/java/com/fr/design/designer/properties/FormWidgetAuthorityEditPane.java
index b66293cfc..080465d46 100644
--- a/designer-form/src/main/java/com/fr/design/designer/properties/FormWidgetAuthorityEditPane.java
+++ b/designer-form/src/main/java/com/fr/design/designer/properties/FormWidgetAuthorityEditPane.java
@@ -56,6 +56,7 @@ public class FormWidgetAuthorityEditPane extends AuthorityEditPane {
             for (String selectedRole : selectedArray) {
                 for (Widget widget : widgets) {
                     widget.changeVisibleAuthorityState(selectedRole, widgetVisible.isSelected());
+                    widgetAvailable.setEnabled(widgetVisible.isSelected());
                 }
             }
             doAfterAuthority();
diff --git a/designer-realize/src/main/java/com/fr/design/webattr/ToolBarDragPane.java b/designer-realize/src/main/java/com/fr/design/webattr/ToolBarDragPane.java
index c420c04b4..fc3d81352 100644
--- a/designer-realize/src/main/java/com/fr/design/webattr/ToolBarDragPane.java
+++ b/designer-realize/src/main/java/com/fr/design/webattr/ToolBarDragPane.java
@@ -35,6 +35,7 @@ import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.image.ImageObserver;
+import java.util.List;
 
 /**
  * 新的拖拽ToolBar button以实现自定义工具栏 报表web设置那儿的.应该不叫ToolBarDragPane，因为实际没有提供drag功能
@@ -225,6 +226,16 @@ public class ToolBarDragPane extends WidgetToolBarPane {
 	public void setAllEnabled(boolean b) {
 		GUICoreUtils.setEnabled(this, b);
 		isEnabled = b;
+		removeAllListener(northToolBar.getToolBarButtons());
+	}
+
+	private void removeAllListener(List<ToolBarButton> toolBarButtons) {
+		for (ToolBarButton button : toolBarButtons) {
+			button.setEnabled(isEnabled);
+			if (!isEnabled) {
+				button.removeMouseListener(button);
+			}
+		}
 	}
 
 	/**
diff --git a/designer-realize/src/main/java/com/fr/design/webattr/WebSettingPane.java b/designer-realize/src/main/java/com/fr/design/webattr/WebSettingPane.java
index ea8225ea0..59b0d2316 100644
--- a/designer-realize/src/main/java/com/fr/design/webattr/WebSettingPane.java
+++ b/designer-realize/src/main/java/com/fr/design/webattr/WebSettingPane.java
@@ -122,8 +122,8 @@ public abstract class WebSettingPane<T extends WebContent> extends BasicBeanPane
 			choseComboBox.removeItemListener(itemListener);
 			choseComboBox.setSelectedIndex(SERVER_SET);
 			choseComboBox.addItemListener(itemListener);
-			checkEnabled(false);
 			populateServerSettings();
+			checkEnabled(false);
 			return;
 		}
 		// 模板设置
diff --git a/designer-realize/src/main/java/com/fr/poly/creator/ECBlockEditor.java b/designer-realize/src/main/java/com/fr/poly/creator/ECBlockEditor.java
index 674de0e2d..809a246e1 100644
--- a/designer-realize/src/main/java/com/fr/poly/creator/ECBlockEditor.java
+++ b/designer-realize/src/main/java/com/fr/poly/creator/ECBlockEditor.java
@@ -136,6 +136,7 @@ public class ECBlockEditor extends BlockEditor<ECBlockPane, PolyECBlock> {
      * @date 2014-11-24-下午3:48:19
      */
     public void resetSelectionAndChooseState() {
+        boolean chooseBlock = designer.isChooseBlock();
         designer.setChooseType(SelectionType.INNER);
         if (DesignerMode.isAuthorityEditing()) {
             JTemplate jTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
@@ -167,7 +168,9 @@ public class ECBlockEditor extends BlockEditor<ECBlockPane, PolyECBlock> {
             conditionAttributesGroupPane.populate(editComponent);
 
             EastRegionContainerPane.getInstance().updateCellElementState(isSelectedOneCell());
-
+            if (chooseBlock) {
+                EastRegionContainerPane.getInstance().switchTabTo(EastRegionContainerPane.KEY_CELL_ATTR);
+            }
         }
 
         // 超级链接