Merge pull request #1259 in BA/design from ~PLOUGH/design:release/9.0 to release/9.0

* commit '4ce94fac8b88ff73dde035e59f6dbc670facdf55':
  REPORT-4695 打开表单和报表，切换tab时模板内容没有切换
  REPORT-4672 单元格添加控件后删除单元格所在行，右侧属性面板保持不变

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);

designer/src/com/fr/design/mainframe/form/FormElementCasePaneDelegate.java

@@ -36,6 +36,18 @@ public class FormElementCasePaneDelegate extends ElementCasePane<FormElementCase
         this.addSelectionChangeListener(new SelectionListener() {
             @Override
             public void selectionChanged(SelectionEvent e) {
+                refreshPropertyPanes();
+            }
+        });
+        this.addTargetModifiedListener(new TargetModifiedListener() {
+            @Override
+            public void targetModified(TargetModifiedEvent e) {
+                refreshPropertyPanes();
+            }
+        });
+    }
+
+    private void refreshPropertyPanes() {
         CellElementPropertyPane.getInstance().populate(FormElementCasePaneDelegate.this);
         QuickEditorRegion.getInstance().populate(getCurrentEditor());
         // 超级链接
@@ -48,20 +60,6 @@ public class FormElementCasePaneDelegate extends ElementCasePane<FormElementCase
 
         EastRegionContainerPane.getInstance().updateCellElementState(isSelectedOneCell());
     }
-        });
-        this.addTargetModifiedListener(new TargetModifiedListener() {
-            @Override
-            public void targetModified(TargetModifiedEvent e) {
-                CellElementPropertyPane.getInstance().populate(FormElementCasePaneDelegate.this);
-            }
-        });
-    }
-
-//    private void populateHyperLinkGroupPane() {
-//        final TemplateElementCase report = this.getEditingElementCase();
-//        NameJavaScriptGroup nameHyperlinks = ReportHyperlinkGroupPane.getNameJSGroup(this, report);
-//        HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().getHyperLinkPane().populate(nameHyperlinks);
-//    }
 
     @Override
     protected boolean supportRepeatedHeaderFooter() {

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();
             }
         });
     }

designer_base/src/com/fr/design/roleAuthority/ReportAndFSManagePane.java

@@ -265,10 +265,12 @@ public class ReportAndFSManagePane extends DockingView implements Prepare4DataSo
         DesignTableDataManager.addDsChangeListener(new ChangeListener() {
 
             public void stateChanged(ChangeEvent e) {
+                if (BaseUtils.isAuthorityEditing()) {
                     roleTree.refreshTreeNode();
                     expandTree(roleTree, true);
                     roleTree.updateUI();
                 }
+            }
         });
 
     }