From 52e4a734e7ddbf9a51ec495c519fb84c6e71acd3 Mon Sep 17 00:00:00 2001 From: "Mata.Li" Date: Wed, 22 Aug 2018 17:03:15 +0800 Subject: [PATCH 1/2] REPORT-10780 --- .../src/main/java/com/fr/design/mainframe/JForm.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/designer-form/src/main/java/com/fr/design/mainframe/JForm.java b/designer-form/src/main/java/com/fr/design/mainframe/JForm.java index 36bd3f32f7..27fa7ce9c9 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/JForm.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/JForm.java @@ -57,7 +57,12 @@ import com.fr.form.ui.container.WBorderLayout; import com.fr.form.ui.container.WLayout; import com.fr.general.ComparatorUtils; import com.fr.log.FineLoggerFactory; +import com.fr.main.impl.WorkBook; +import com.fr.main.impl.WorkBookAdapter; import com.fr.page.PaperSettingProvider; +import com.fr.report.cell.Elem; +import com.fr.report.cell.cellattr.CellImage; +import com.fr.report.cell.painter.CellImagePainter; import com.fr.report.worksheet.FormElementCase; import com.fr.stable.ArrayUtils; import com.fr.stable.Constants; @@ -460,7 +465,10 @@ public class JForm extends JTemplate implements BaseJForm { // ////////////////for toolbarMenuAdapter////////////////////////////// // //////////////////////////////////////////////////////////////////// - + @Override + public void setPictureElem(Elem elem, CellImage cellImage) { + elem.setValue(cellImage.getImage()); + } /** * 目标菜单 * From 88d5dbbc13d66d524987445e7c6fa0309c0dc690 Mon Sep 17 00:00:00 2001 From: "Mata.Li" Date: Wed, 22 Aug 2018 17:04:49 +0800 Subject: [PATCH 2/2] REPORT-10780 --- designer-form/src/main/java/com/fr/design/mainframe/JForm.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/designer-form/src/main/java/com/fr/design/mainframe/JForm.java b/designer-form/src/main/java/com/fr/design/mainframe/JForm.java index 27fa7ce9c9..df113a7bb9 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/JForm.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/JForm.java @@ -57,12 +57,9 @@ import com.fr.form.ui.container.WBorderLayout; import com.fr.form.ui.container.WLayout; import com.fr.general.ComparatorUtils; import com.fr.log.FineLoggerFactory; -import com.fr.main.impl.WorkBook; -import com.fr.main.impl.WorkBookAdapter; import com.fr.page.PaperSettingProvider; import com.fr.report.cell.Elem; import com.fr.report.cell.cellattr.CellImage; -import com.fr.report.cell.painter.CellImagePainter; import com.fr.report.worksheet.FormElementCase; import com.fr.stable.ArrayUtils; import com.fr.stable.Constants;