fanruan
/
design
6
1
Fork 2
Code Issues 2 Pull Requests Releases Wiki Activity
Browse Source

Pull request #5414: REPORT-57520 报表块内图表超链不应该显示悬浮窗图表 

Merge in DESIGN/design from ~TOMMY/design:feature/10.0 to feature/10.0

* commit 'd357671ce55a7b260e29a0dc4c86a66d4ad57467':
  REPORT-57520 报表块内图表超链不应该显示悬浮窗图表
feature/10.0
Tommy 3 years ago
parent
bca27bfa2a d357671ce5
commit
e7cd03cfa4
1 changed files with 16 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 40
      designer-chart/src/main/java/com/fr/design/module/ChartHyperlinkGroup.java

40
designer-chart/src/main/java/com/fr/design/module/ChartHyperlinkGroup.java
Unescape View File

@ -58,26 +58,21 @@ public class ChartHyperlinkGroup extends BaseHyperlinkGroup {
if (template == null) { if (template == null) {
return false; return false;
} }
if (template.isJWorkBook() || DesignModeContext.isDuchampMode()) { if (template.isJWorkBook() || DesignModeContext.isDuchampMode()) {
// 如果是普通报表单元格，那么没有 FormHyperlink 选项 // 如果是普通报表单元格，那么没有 FormHyperlink 选项
FormHyperlinkProvider formHyperlink = StableFactory.getMarkedInstanceObjectFromClass(FormHyperlinkProvider.XML_TAG, FormHyperlinkProvider.class); FormHyperlinkProvider formHyperlink = StableFactory.getMarkedInstanceObjectFromClass(FormHyperlinkProvider.XML_TAG, FormHyperlinkProvider.class);
//返回true表示可用，返回false表示不可用 //返回true表示可用，返回false表示不可用
return !ComparatorUtils.equals(clazz, formHyperlink.getClass()); return !ComparatorUtils.equals(clazz, formHyperlink.getClass());
} else { } else {
// 如果是决策报表 // 如果是决策报表
Class[] classes = new Class[]{ChartHyperRelateCellLink.class, ChartHyperRelateFloatLink.class}; if (template.getEditingReportIndex() == BaseJForm.FORM_TAB) {
for (Class aClass : classes) { // 编辑的是决策报表中的图表，那么没有ChartHyperRelateFloatLink 和 ChartHyperRelateCellLink 选项，有FormHyperlink 选项
if (template.getEditingReportIndex() == BaseJForm.FORM_TAB) { Class[] classes = new Class[]{ChartHyperRelateCellLink.class, ChartHyperRelateFloatLink.class};
// 编辑的是决策报表中的图表，那么没有ChartHyperRelateFloatLink 和 ChartHyperRelateCellLink 选项，有FormHyperlink 选项 return !ArrayUtils.contains(classes, clazz);
if (ComparatorUtils.equals(aClass, clazz)) { } else if (template.getEditingReportIndex() == BaseJForm.ELEMENTCASE_TAB) {
return false; // 编辑的是决策报表中的报表块，那么没有 ChartHyperPoplink 和 ChartHyperRelateFloatLink
} Class[] classes = new Class[]{ChartHyperPoplink.class, ChartHyperRelateFloatLink.class};
} else if (template.getEditingReportIndex() == BaseJForm.ELEMENTCASE_TAB) { return !ArrayUtils.contains(classes, clazz);
// 编辑的是决策报表中的报表块，那么没有 ChartHyperRelateFloatLink，有ChartHyperRelateCellLink 和 FormHyperlink 选项
return !ComparatorUtils.equals(clazz, ChartHyperRelateFloatLink.class);
}
} }
} }
return true; return true;
@ -101,17 +96,14 @@ public class ChartHyperlinkGroup extends BaseHyperlinkGroup {
return !ComparatorUtils.equals(object.getClass(), formHyperlink.getClass()); return !ComparatorUtils.equals(object.getClass(), formHyperlink.getClass());
} else { } else {
// 如果是决策报表 // 如果是决策报表
Class[] classes = new Class[]{ChartHyperRelateCellLink.class, ChartHyperRelateFloatLink.class}; if (template.getEditingReportIndex() == BaseJForm.FORM_TAB) {
for (Class aClass : classes) { // 编辑的是决策报表中的图表，那么没有ChartHyperRelateFloatLink 和 ChartHyperRelateCellLink 选项，有FormHyperlink 选项
if (template.getEditingReportIndex() == BaseJForm.FORM_TAB) { Class[] classes = new Class[]{ChartHyperRelateCellLink.class, ChartHyperRelateFloatLink.class};
// 编辑的是决策报表中的图表，那么没有ChartHyperRelateFloatLink 和 ChartHyperRelateCellLink 选项，有FormHyperlink 选项 return !ArrayUtils.contains(classes, object.getClass());
if (ComparatorUtils.equals(aClass, object.getClass())) { } else if (template.getEditingReportIndex() == BaseJForm.ELEMENTCASE_TAB) {
return false; // 编辑的是决策报表中的报表块，那么没有 ChartHyperPoplink 和 ChartHyperRelateFloatLink
} Class[] classes = new Class[]{ChartHyperPoplink.class, ChartHyperRelateFloatLink.class};
} else if (template.getEditingReportIndex() == BaseJForm.ELEMENTCASE_TAB) { return !ArrayUtils.contains(classes, object.getClass());
// 编辑的是决策报表中的报表块，那么没有 ChartHyperRelateFloatLink，有ChartHyperRelateCellLink 和 FormHyperlink 选项
return !ComparatorUtils.equals(object.getClass(), ChartHyperRelateFloatLink.class);
}
} }
} }
return true; return true;

Write Preview
Loading…
Cancel
Save