Merge pull request #970 in DESIGN/design from ~ZACK/design:release/10.0 to release/10.0

* commit 'ad5153b945ded1ab03e0afeb06a665ea8308e462':
  REPORT-18855 & REPORT-18857 jpg图片持久化遗漏了一些场景

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

@@ -87,7 +87,7 @@ public class ImageFloatAction extends ElementCaseAction {
 
                 if (selectedFile != null && selectedFile.isFile()) {
                     CellImage cellImage = selectImagePane.update();
-                    Image image = cellImage.getImage();
+                    Image image = cellImage.getBufferImage();
                     JTemplate<?, ?> currentEditingTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
                     currentEditingTemplate.setPictureElem(floatElement, cellImage);
 

designer-realize/src/main/java/com/fr/design/headerfooter/ImagePane.java

@@ -78,7 +78,7 @@ public class ImagePane extends BasicPane {
     }
 
     public Image update() {
-        return this.imagePreviewPane.getImage();
+        return this.imagePreviewPane.getImageWithSuffix();
     }
 
     /**

designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java

@@ -68,7 +68,6 @@ import com.fr.file.FILE;
 import com.fr.file.FileNodeFILE;
 import com.fr.file.filetree.FileNode;
 import com.fr.general.ComparatorUtils;
-import com.fr.general.ImageWithSuffix;
 import com.fr.general.ModuleContext;
 import com.fr.grid.Grid;
 import com.fr.grid.GridUtils;
@@ -90,7 +89,6 @@ import com.fr.report.elementcase.TemplateElementCase;
 import com.fr.report.poly.PolyWorkSheet;
 import com.fr.report.worksheet.WorkSheet;
 import com.fr.stable.ArrayUtils;
-import com.fr.stable.CoreGraphHelper;
 import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
 import com.fr.stable.module.Module;
@@ -623,7 +621,7 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
         if (workBook instanceof WorkBookAdapter) {
             elem.setValue(new CellImagePainter(cellImage));
         } else {
-            elem.setValue(ImageWithSuffix.build(cellImage.getImage(),cellImage.getSuffix()));
+            elem.setValue(cellImage.getImage());
         }
     }
 

designer-realize/src/main/java/com/fr/grid/Grid.java

@@ -961,7 +961,6 @@ public class Grid extends BaseGridComponent {
             if (!ComparatorUtils.equals_exactly(oldValue, newValue)) {
                 if (newValue instanceof CellImage) {
                     CellImage cellImage = (CellImage) newValue;
-                    newValue = cellImage.getImage();
                     JTemplate<?, ?> currentEditingTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
                     currentEditingTemplate.setPictureElem(selectedFloatElement, cellImage);