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

Pull request #12067: REPORT-94597 安装【平台内打开标签页】插件，FR图表超链会多两个重复下拉项 

Merge in DESIGN/design from ~LEVY.XIE/design:release/11.0 to release/11.0

* commit '5deb7120453577b00087c82303a4c90030406874':
  REPORT-94597 安装【平台内打开标签页】插件，FR图表超链会多两个重复下拉项 改用ListMap保持一致
  REPORT-94597 安装【平台内打开标签页】插件，FR图表超链会多两个重复下拉项
  REPORT-94597 安装【平台内打开标签页】插件，FR图表超链会多两个重复下拉项
release/11.0
Levy.Xie-解安森 2 years ago
parent
bccc16fed0 5deb712045
commit
d3e537fea1
1 changed files with 8 additions and 9 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. 17
      designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartHyperLinkPane.java

17
designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartHyperLinkPane.java
Unescape View File

@ -154,24 +154,23 @@ public class VanChartHyperLinkPane extends VanChartUIListControlPane {
} }
HashMap paneMap = getHyperlinkMap(); HashMap paneMap = getHyperlinkMap();
//安装平台内打开插件时,添加相应按钮
Set<HyperlinkProvider> providers = ExtraDesignClassManager.getInstance().getArray(HyperlinkProvider.XML_TAG);
java.util.List<UIMenuNameableCreator> list = refreshList(paneMap); java.util.List<UIMenuNameableCreator> list = refreshList(paneMap);
Map<String, NameObjectCreator> creators = new ListMap<>();
int size = list.size(); int size = list.size();
NameObjectCreator[] creators = new NameObjectCreator[size + providers.size()];
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
UIMenuNameableCreator uiMenuNameableCreator = list.get(i); UIMenuNameableCreator uiMenuNameableCreator = list.get(i);
creators[i] = new NameObjectCreator(uiMenuNameableCreator.getName(), uiMenuNameableCreator.getObj().getClass(), uiMenuNameableCreator.getPaneClazz()); NameObjectCreator creator = new NameObjectCreator(uiMenuNameableCreator.getName(), uiMenuNameableCreator.getObj().getClass(), uiMenuNameableCreator.getPaneClazz());
creators.put(uiMenuNameableCreator.getName(), creator);
} }
//安装平台内打开插件时, 添加/替换 相应按钮
Set<HyperlinkProvider> providers = ExtraDesignClassManager.getInstance().getArray(HyperlinkProvider.XML_TAG);
for (HyperlinkProvider provider : providers) { for (HyperlinkProvider provider : providers) {
NameableCreator creator = provider.createHyperlinkCreator(); NameableCreator creator = provider.createHyperlinkCreator();
if (creator != null) { if (creator != null) {
creators[size] = new NameObjectCreator(creator.menuName(), creator.getHyperlink(), creator.getUpdatePane()); creators.put(creator.menuName(), new NameObjectCreator(creator.menuName(), creator.getHyperlink(), creator.getUpdatePane()));
size++;
} }
} }
refreshNameableCreator(creators.values().toArray(new NameObjectCreator[0]));
refreshNameableCreator(creators);
} }
public void populate(Plot plot) { public void populate(Plot plot) {
@ -303,7 +302,7 @@ public class VanChartHyperLinkPane extends VanChartUIListControlPane {
@Override @Override
protected void initCreatorsFilter() { protected void initCreatorsFilter() {
this.creatorsFilter = nameableCreator -> { this.creatorsFilter = nameableCreator -> {
Class<? extends JavaScript> clazz = nameableCreator.getHyperlink(); Class<? extends JavaScript> clazz = nameableCreator.getHyperlink();
JTemplate template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate(); JTemplate template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
if (!JTemplate.isValid(template)) { if (!JTemplate.isValid(template)) {

Write Preview
Loading…
Cancel
Save