Browse Source

Pull request #4987: REPORT-55339 权限编辑时,聚合报表单元格属性设置面板,在切换参数面板编辑后,面板未刷新

Merge in DESIGN/design from ~FANGLEI/design10.0:release/10.0 to release/10.0

* commit 'de8c84681a30810f0e422da3216af708cc02d9ea':
  REPORT-55339 权限编辑时,聚合报表单元格属性设置面板,在切换参数面板编辑后,面板未刷新
zheng-1641779399395
fanglei 3 years ago
parent
commit
f860604017
  1. 5
      designer-realize/src/main/java/com/fr/poly/creator/ECBlockPane.java

5
designer-realize/src/main/java/com/fr/poly/creator/ECBlockPane.java

@ -18,6 +18,7 @@ import com.fr.design.actions.edit.HyperlinkAction;
import com.fr.design.actions.edit.merge.MergeCellAction; import com.fr.design.actions.edit.merge.MergeCellAction;
import com.fr.design.actions.edit.merge.UnmergeCellAction; import com.fr.design.actions.edit.merge.UnmergeCellAction;
import com.fr.design.actions.utils.DeprecatedActionManager; import com.fr.design.actions.utils.DeprecatedActionManager;
import com.fr.design.base.mode.DesignModeContext;
import com.fr.design.event.TargetModifiedEvent; import com.fr.design.event.TargetModifiedEvent;
import com.fr.design.event.TargetModifiedListener; import com.fr.design.event.TargetModifiedListener;
import com.fr.design.file.HistoryTemplateListPane; import com.fr.design.file.HistoryTemplateListPane;
@ -55,10 +56,10 @@ public class ECBlockPane extends PolyElementCasePane {
@Override @Override
public void selectionChanged(SelectionEvent e) { public void selectionChanged(SelectionEvent e) {
if (!isEditable()) { if (!isEditable() && !DesignModeContext.isAuthorityEditing()) {
return; return;
} }
if (DesignerMode.isAuthorityEditing()) { if (DesignModeContext.isAuthorityEditing()) {
if (designer.getSelection().getEditingElementCasePane() == null) { if (designer.getSelection().getEditingElementCasePane() == null) {
EastRegionContainerPane.getInstance().switchMode(EastRegionContainerPane.PropertyMode.AUTHORITY_EDITION_DISABLED); EastRegionContainerPane.getInstance().switchMode(EastRegionContainerPane.PropertyMode.AUTHORITY_EDITION_DISABLED);
EastRegionContainerPane.getInstance().replaceAuthorityEditionPane(new NoSupportAuthorityEdit()); EastRegionContainerPane.getInstance().replaceAuthorityEditionPane(new NoSupportAuthorityEdit());

Loading…
Cancel
Save