diff --git a/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java b/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java
index 556b5d59e1..3529ebcd03 100644
--- a/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java
+++ b/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java
@@ -50,18 +50,18 @@ public class ElementCasePaneDelegate extends ElementCasePane<WorkSheet> {
                 if (!isEditable() && !BaseUtils.isAuthorityEditing()) {
                     return;
                 }
-                doOnSelectionChanged(e);
+                refreshPropertyPanes();
             }
         });
         this.addTargetModifiedListener(new TargetModifiedListener() {
             @Override
             public void targetModified(TargetModifiedEvent e) {
-                CellElementPropertyPane.getInstance().populate(ElementCasePaneDelegate.this);
+                refreshPropertyPanes();
             }
         });
     }
 
-    private void doOnSelectionChanged(SelectionEvent e) {
+    private void refreshPropertyPanes() {
         //在编辑权限，所以要更新权限编辑面板
         if (BaseUtils.isAuthorityEditing()) {
             AuthorityPropertyPane authorityPropertyPane = new AuthorityPropertyPane(ElementCasePaneDelegate.this);
@@ -76,7 +76,7 @@ public class ElementCasePaneDelegate extends ElementCasePane<WorkSheet> {
         QuickEditorRegion.getInstance().populate(getCurrentEditor());
         JTemplate editingTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
         if (editingTemplate != null && !editingTemplate.isUpMode()) {
-            Selection editingSelection = ((ElementCasePaneDelegate)e.getSource()).getSelection();
+            Selection editingSelection = getSelection();
             // 模板初始化完成后，才能初始化超级链接面板
             HyperlinkGroupPane hyperlinkGroupPane = editingTemplate.getHyperLinkPane(HyperlinkGroupPaneActionImpl.getInstance());
             hyperlinkGroupPane.populate(ElementCasePaneDelegate.this);
diff --git a/designer/src/com/fr/design/mainframe/form/FormElementCasePaneDelegate.java b/designer/src/com/fr/design/mainframe/form/FormElementCasePaneDelegate.java
index 68ee0d79bd..5ddd8efb51 100644
--- a/designer/src/com/fr/design/mainframe/form/FormElementCasePaneDelegate.java
+++ b/designer/src/com/fr/design/mainframe/form/FormElementCasePaneDelegate.java
@@ -36,32 +36,30 @@ public class FormElementCasePaneDelegate extends ElementCasePane<FormElementCase
         this.addSelectionChangeListener(new SelectionListener() {
             @Override
             public void selectionChanged(SelectionEvent e) {
-                CellElementPropertyPane.getInstance().populate(FormElementCasePaneDelegate.this);
-                QuickEditorRegion.getInstance().populate(getCurrentEditor());
-                // 超级链接
-                HyperlinkGroupPane hyperlinkGroupPane = DesignerContext.getDesignerFrame().getSelectedJTemplate().
-                        getHyperLinkPane(HyperlinkGroupPaneActionImpl.getInstance());
-                hyperlinkGroupPane.populate(FormElementCasePaneDelegate.this);
-                // 条件属性
-                ConditionAttributesGroupPane conditionAttributesGroupPane = ConditionAttributesGroupPane.getInstance();
-                conditionAttributesGroupPane.populate(FormElementCasePaneDelegate.this);
-
-                EastRegionContainerPane.getInstance().updateCellElementState(isSelectedOneCell());
+                refreshPropertyPanes();
             }
         });
         this.addTargetModifiedListener(new TargetModifiedListener() {
             @Override
             public void targetModified(TargetModifiedEvent e) {
-                CellElementPropertyPane.getInstance().populate(FormElementCasePaneDelegate.this);
+                refreshPropertyPanes();
             }
         });
     }
 
-//    private void populateHyperLinkGroupPane() {
-//        final TemplateElementCase report = this.getEditingElementCase();
-//        NameJavaScriptGroup nameHyperlinks = ReportHyperlinkGroupPane.getNameJSGroup(this, report);
-//        HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().getHyperLinkPane().populate(nameHyperlinks);
-//    }
+    private void refreshPropertyPanes() {
+        CellElementPropertyPane.getInstance().populate(FormElementCasePaneDelegate.this);
+        QuickEditorRegion.getInstance().populate(getCurrentEditor());
+        // 超级链接
+        HyperlinkGroupPane hyperlinkGroupPane = DesignerContext.getDesignerFrame().getSelectedJTemplate().
+                getHyperLinkPane(HyperlinkGroupPaneActionImpl.getInstance());
+        hyperlinkGroupPane.populate(FormElementCasePaneDelegate.this);
+        // 条件属性
+        ConditionAttributesGroupPane conditionAttributesGroupPane = ConditionAttributesGroupPane.getInstance();
+        conditionAttributesGroupPane.populate(FormElementCasePaneDelegate.this);
+
+        EastRegionContainerPane.getInstance().updateCellElementState(isSelectedOneCell());
+    }
 
     @Override
     protected boolean supportRepeatedHeaderFooter() {
diff --git a/designer/src/com/fr/poly/creator/ECBlockEditor.java b/designer/src/com/fr/poly/creator/ECBlockEditor.java
index ee8f2b56c2..fd158bf5e8 100644
--- a/designer/src/com/fr/poly/creator/ECBlockEditor.java
+++ b/designer/src/com/fr/poly/creator/ECBlockEditor.java
@@ -47,6 +47,7 @@ public class ECBlockEditor extends BlockEditor<ECBlockPane, PolyECBlock> {
             @Override
             public void targetModified(TargetModifiedEvent e) {
                 designer.fireTargetModified();
+                resetSelectionAndChooseState();
             }
         });
     }