From 63858532be7a7b874c90eb49835a96b52fe87b3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com> Date: Mon, 24 Feb 2020 16:49:48 +0800 Subject: [PATCH] =?UTF-8?q?CHART-12814=20=E6=82=AC=E6=B5=AE=E5=9B=BE?= =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/actions/insert/flot/ChartFloatAction.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/designer-realize/src/main/java/com/fr/design/actions/insert/flot/ChartFloatAction.java b/designer-realize/src/main/java/com/fr/design/actions/insert/flot/ChartFloatAction.java index b8f05c2e4..4fb950c6e 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/insert/flot/ChartFloatAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/insert/flot/ChartFloatAction.java @@ -7,6 +7,7 @@ import com.fr.base.BaseUtils; import com.fr.base.DynamicUnitList; import com.fr.base.Style; import com.fr.base.chart.BaseChartCollection; +import com.fr.chart.chartattr.ChartCollection; import com.fr.design.actions.ElementCaseAction; import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.file.HistoryTemplateListPane; @@ -18,6 +19,7 @@ import com.fr.design.module.DesignModuleFactory; import com.fr.grid.Grid; import com.fr.grid.selection.FloatSelection; import com.fr.log.FineLoggerFactory; +import com.fr.plugin.chart.vanchart.VanChart; import com.fr.report.ReportHelper; import com.fr.report.cell.FloatElement; import com.fr.report.elementcase.TemplateElementCase; @@ -87,7 +89,15 @@ public class ChartFloatAction extends ElementCaseAction { isRecordNeeded = true; FloatElement newFloatElement; try { - newFloatElement = new FloatElement(chartDialog.getChartCollection().clone()); + //TODO @Bjorn 这里不知道为什么要把ChartCollection克隆一下，会导致chart的ID发生变化，影响记录埋点的功能。 + //TODO 不知道去掉clone之后会有什么影响，下个版本的迭代中优化试着去掉clone方法，测试看看会不会有问题。 + ChartCollection chartCollection = (ChartCollection) chartDialog.getChartCollection().clone(); + VanChart vanChart = ((ChartCollection) chartDialog.getChartCollection()).getSelectedChartProvider(VanChart.class); + if (vanChart != null) { + chartCollection.getSelectedChartProvider(VanChart.class).setUuid(vanChart.getUuid()); + } + newFloatElement = new FloatElement(chartCollection); + newFloatElement.setWidth(new OLDPIX(BaseChartCollection.CHART_DEFAULT_WIDTH)); newFloatElement.setHeight(new OLDPIX(BaseChartCollection.CHART_DEFAULT_HEIGHT));