Browse Source

Merge pull request #1438 in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0

* commit '96854b618530042e1b8ca9dbd9c12d608d25bb0e':
  CHART-12814 悬浮图表去掉clone
  CHART-12814 悬浮图表数据问题
feature/big-screen
Bjorn 4 years ago
parent
commit
86b6f4d7dc
  1. 7
      designer-realize/src/main/java/com/fr/design/actions/insert/flot/ChartFloatAction.java

7
designer-realize/src/main/java/com/fr/design/actions/insert/flot/ChartFloatAction.java

@ -17,7 +17,6 @@ import com.fr.design.menu.MenuKeySet;
import com.fr.design.module.DesignModuleFactory; import com.fr.design.module.DesignModuleFactory;
import com.fr.grid.Grid; import com.fr.grid.Grid;
import com.fr.grid.selection.FloatSelection; import com.fr.grid.selection.FloatSelection;
import com.fr.log.FineLoggerFactory;
import com.fr.report.ReportHelper; import com.fr.report.ReportHelper;
import com.fr.report.cell.FloatElement; import com.fr.report.cell.FloatElement;
import com.fr.report.elementcase.TemplateElementCase; import com.fr.report.elementcase.TemplateElementCase;
@ -86,8 +85,7 @@ public class ChartFloatAction extends ElementCaseAction {
public void doOk() { public void doOk() {
isRecordNeeded = true; isRecordNeeded = true;
FloatElement newFloatElement; FloatElement newFloatElement;
try { newFloatElement = new FloatElement(chartDialog.getChartCollection());
newFloatElement = new FloatElement(chartDialog.getChartCollection().clone());
newFloatElement.setWidth(new OLDPIX(BaseChartCollection.CHART_DEFAULT_WIDTH)); newFloatElement.setWidth(new OLDPIX(BaseChartCollection.CHART_DEFAULT_WIDTH));
newFloatElement.setHeight(new OLDPIX(BaseChartCollection.CHART_DEFAULT_HEIGHT)); newFloatElement.setHeight(new OLDPIX(BaseChartCollection.CHART_DEFAULT_HEIGHT));
@ -120,9 +118,6 @@ public class ChartFloatAction extends ElementCaseAction {
reportPane.getEditingElementCase().addFloatElement(newFloatElement); reportPane.getEditingElementCase().addFloatElement(newFloatElement);
reportPane.setSelection(new FloatSelection(newFloatElement.getName())); reportPane.setSelection(new FloatSelection(newFloatElement.getName()));
reportPane.fireSelectionChangeListener(); reportPane.fireSelectionChangeListener();
} catch (CloneNotSupportedException e) {
FineLoggerFactory.getLogger().error("Error in Float");
}
} }
}); });

Loading…
Cancel
Save