Browse Source

Pull request #12088: REPORT-94114 11.0.15.1维护版本,同步到persist

Merge in DESIGN/design from ~LEO.QIN/design:persist/11.0 to persist/11.0

* commit 'd661eb200986b8e7d6ce4d846c73ed7c6b881f9f':
  REPORT-94114 11.0.15.1维护版本,同步到persist
fix-lag
Leo.Qin-覃宇攀 2 years ago
parent
commit
55afff2c3d
  1. 14
      designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartHyperLinkPane.java

14
designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartHyperLinkPane.java

@ -309,15 +309,27 @@ public class VanChartHyperLinkPane extends VanChartUIListControlPane {
if (!JTemplate.isValid(template)) { if (!JTemplate.isValid(template)) {
return false; return false;
} }
if (template.isJWorkBook()) {
// 如果是普通报表单元格,那么没有 FormHyperlink 选项
FormHyperlinkProvider formHyperlink = StableFactory.getMarkedInstanceObjectFromClass(FormHyperlinkProvider.XML_TAG, FormHyperlinkProvider.class);
return !ComparatorUtils.equals(clazz, formHyperlink.getClass());
} else {
// 如果是决策报表
if (template.getEditingReportIndex() == BaseJForm.ELEMENTCASE_TAB) {
// 编辑的是决策报表中的报表块,那么没有 ChartHyperRelateFloatLink选项
return !ComparatorUtils.equals(clazz, ChartHyperRelateFloatLink.class);
}
Class[] classes = new Class[]{ChartHyperRelateCellLink.class, ChartHyperRelateFloatLink.class}; Class[] classes = new Class[]{ChartHyperRelateCellLink.class, ChartHyperRelateFloatLink.class};
for (Class aClass : classes) { for (Class aClass : classes) {
if (template.getEditingReportIndex() == BaseJForm.FORM_TAB) { if (template.getEditingReportIndex() == BaseJForm.FORM_TAB) {
// 编辑的是决策报表中的图表,那么没有ChartHyperRelateFloatLink 和 ChartHyperRelateCellLink 选项,有FormHyperlink 选项 // 编辑的是决策报表中的图表,那么没有 ChartHyperRelateFloatLink 和 ChartHyperRelateCellLink 选项
if (ComparatorUtils.equals(aClass, clazz)) { if (ComparatorUtils.equals(aClass, clazz)) {
return false; return false;
} }
} }
} }
}
return true; return true;
}; };
} }

Loading…
Cancel
Save