Browse Source

Merge pull request #6696 in DESIGN/design from bugfix/10.0 to feature/10.0

* commit '5c4a18f4e65e1d6b2443fe01a191329218f99939':
  CHART-21951 第三方图表插件无法创建复用组件
feature/10.0
superman 3 years ago
parent
commit
8e24fc5bb5
  1. 21
      designer-realize/src/main/java/com/fr/design/share/effect/EffectItemGroup.java

21
designer-realize/src/main/java/com/fr/design/share/effect/EffectItemGroup.java

@ -109,15 +109,7 @@ public class EffectItemGroup {
Object value = cellElement.getValue(); Object value = cellElement.getValue();
if (value instanceof ChartCollection) { if (value instanceof ChartCollection) {
ChartCollection chartCollection = (ChartCollection) value; ChartCollection chartCollection = (ChartCollection) value;
for (int index = 0; index < chartCollection.getChartCount(); index++) { initChartEditorByChartCollection(chartCollection, cellSourceNode);
Chart chart= (Chart) chartCollection.getChart(index, ChartProvider.class);
Plot plot = chart.getPlot();
if (plot == null) {
continue;
}
SourceNode chartSourceNode = SourceNodeUtils.createSourceNode(plot, chartCollection.getChartName(index), cellSourceNode);
initChartPlot(plot, chartSourceNode, false);
}
} }
} }
@ -127,16 +119,23 @@ public class EffectItemGroup {
private void initChartEditor() { private void initChartEditor() {
ChartEditor editor = (ChartEditor) this.widget; ChartEditor editor = (ChartEditor) this.widget;
ChartCollection chartCollection = (ChartCollection) editor.getChartCollection(); ChartCollection chartCollection = (ChartCollection) editor.getChartCollection();
initChartEditorByChartCollection(chartCollection, null);
}
private void initChartEditorByChartCollection(ChartCollection chartCollection, SourceNode sourceNode) {
for (int index = 0; index < chartCollection.getChartCount(); index++) { for (int index = 0; index < chartCollection.getChartCount(); index++) {
ChartProvider chartProvider = chartCollection.getChart(index, ChartProvider.class);
if (chartProvider instanceof Chart) {
Chart chart= (Chart) chartCollection.getChart(index, ChartProvider.class); Chart chart= (Chart) chartCollection.getChart(index, ChartProvider.class);
Plot plot = chart.getPlot(); Plot plot = chart.getPlot();
if (plot == null) { if (plot == null) {
continue; continue;
} }
SourceNode plotSourceNode = SourceNodeUtils.createSourceNode(plot, chartCollection.getChartName(index), null); SourceNode plotSourceNode = SourceNodeUtils.createSourceNode(plot, chartCollection.getChartName(index), sourceNode);
initChartPlot(plot, plotSourceNode, false); initChartPlot(plot, plotSourceNode, false);
} }
}
} }
private void initChartPlot(Plot plot, SourceNode sourceNode, boolean isSubChart) { private void initChartPlot(Plot plot, SourceNode sourceNode, boolean isSubChart) {

Loading…
Cancel
Save