Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~kerry/design_10.0 into release/10.0

designer-form/src/main/java/com/fr/design/mainframe/JForm.java

@@ -58,6 +58,8 @@ import com.fr.form.ui.container.WLayout;
 import com.fr.general.ComparatorUtils;
 import com.fr.log.FineLoggerFactory;
 import com.fr.page.PaperSettingProvider;
+import com.fr.report.cell.Elem;
+import com.fr.report.cell.cellattr.CellImage;
 import com.fr.report.worksheet.FormElementCase;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.Constants;
@@ -460,7 +462,10 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
     // ////////////////for toolbarMenuAdapter//////////////////////////////
     // ////////////////////////////////////////////////////////////////////
 
-
+    @Override
+    public void setPictureElem(Elem elem, CellImage cellImage) {
+        elem.setValue(cellImage.getImage());
+    }
     /**
      * 目标菜单
      *