Browse Source

Pull request #3748: REPORT-48324 聚合报表,超链在设计器中切换模板后显示不对

Merge in DESIGN/design from ~KERRY/design_10.0:final/10.0 to final/10.0

* commit 'c02afbf2bc35660f134af2cd5e81e1693197a7ba':
  REPORT-48324 聚合报表,超链在设计器中切换模板后显示不对
final/10.0
Kara 4 years ago
parent
commit
c662188cdc
  1. 4
      designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
  2. 3
      designer-realize/src/main/java/com/fr/poly/creator/ECBlockEditor.java

4
designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java

@ -977,6 +977,10 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
* @param jt 添加的模板. * @param jt 添加的模板.
*/ */
public void addAndActivateJTemplate(JTemplate<?, ?> jt) { public void addAndActivateJTemplate(JTemplate<?, ?> jt) {
JTemplate currentEditingTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
if (currentEditingTemplate != null) {
currentEditingTemplate.stopEditing();
}
//切换文件后清空FixedPopupPane面板 //切换文件后清空FixedPopupPane面板
EastRegionContainerPane.getInstance().clearCurrentPopupPane(); EastRegionContainerPane.getInstance().clearCurrentPopupPane();
//释放模板对象 //释放模板对象

3
designer-realize/src/main/java/com/fr/poly/creator/ECBlockEditor.java

@ -176,6 +176,7 @@ public class ECBlockEditor extends BlockEditor<ECBlockPane, PolyECBlock> {
// 超级链接 // 超级链接
HyperlinkGroupPane hyperlinkGroupPane = DesignerContext.getDesignerFrame().getSelectedJTemplate() HyperlinkGroupPane hyperlinkGroupPane = DesignerContext.getDesignerFrame().getSelectedJTemplate()
.getHyperLinkPane(HyperlinkGroupPaneActionImpl.getInstance()); .getHyperLinkPane(HyperlinkGroupPaneActionImpl.getInstance());
EastRegionContainerPane.getInstance().replaceHyperlinkPane(hyperlinkGroupPane);
hyperlinkGroupPane.populate(editComponent); hyperlinkGroupPane.populate(editComponent);
} }
@ -187,4 +188,4 @@ public class ECBlockEditor extends BlockEditor<ECBlockPane, PolyECBlock> {
ElementCasePane ePane = (ElementCasePane)jTemplate.getCurrentElementCasePane(); ElementCasePane ePane = (ElementCasePane)jTemplate.getCurrentElementCasePane();
return ePane != null && ePane.isSelectedOneCell(); return ePane != null && ePane.isSelectedOneCell();
} }
} }

Loading…
Cancel
Save