From 1e2fdb3455db8c0287b7a118c09c58a93ecdc067 Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Tue, 19 Sep 2017 16:12:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?REPORT-4672=20=E5=8D=95=E5=85=83=E6=A0=BC?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=A7=E4=BB=B6=E5=90=8E=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=8D=95=E5=85=83=E6=A0=BC=E6=89=80=E5=9C=A8=E8=A1=8C=EF=BC=8C?=
 =?UTF-8?q?=E5=8F=B3=E4=BE=A7=E5=B1=9E=E6=80=A7=E9=9D=A2=E6=9D=BF=E4=BF=9D?=
 =?UTF-8?q?=E6=8C=81=E4=B8=8D=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mainframe/ElementCasePaneDelegate.java    |  8 ++---
 .../form/FormElementCasePaneDelegate.java     | 32 +++++++++----------
 .../com/fr/poly/creator/ECBlockEditor.java    |  1 +
 3 files changed, 20 insertions(+), 21 deletions(-)

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

From 4ce94fac8b88ff73dde035e59f6dbc670facdf55 Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Tue, 19 Sep 2017 17:30:07 +0800
Subject: [PATCH 2/2] =?UTF-8?q?REPORT-4695=20=E6=89=93=E5=BC=80=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E5=92=8C=E6=8A=A5=E8=A1=A8=EF=BC=8C=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?tab=E6=97=B6=E6=A8=A1=E6=9D=BF=E5=86=85=E5=AE=B9=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/roleAuthority/ReportAndFSManagePane.java    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/designer_base/src/com/fr/design/roleAuthority/ReportAndFSManagePane.java b/designer_base/src/com/fr/design/roleAuthority/ReportAndFSManagePane.java
index 75dfa99bdf..8b406de1d2 100644
--- a/designer_base/src/com/fr/design/roleAuthority/ReportAndFSManagePane.java
+++ b/designer_base/src/com/fr/design/roleAuthority/ReportAndFSManagePane.java
@@ -265,9 +265,11 @@ public class ReportAndFSManagePane extends DockingView implements Prepare4DataSo
         DesignTableDataManager.addDsChangeListener(new ChangeListener() {
 
             public void stateChanged(ChangeEvent e) {
-                roleTree.refreshTreeNode();
-                expandTree(roleTree, true);
-                roleTree.updateUI();
+                if (BaseUtils.isAuthorityEditing()) {
+                    roleTree.refreshTreeNode();
+                    expandTree(roleTree, true);
+                    roleTree.updateUI();
+                }
             }
         });