image fix

export_exel.go

@@ -117,38 +117,6 @@ func exportXLSX(mList []Matrix) (res []byte, err error) {
 		}
 		///////////////////////////////////
 
-		// setup images
-		for _, image := range matrix.Images {
-			if c, err = excelize.CoordinatesToCellName(image.x+1, image.y+1); err != nil {
-				return
-			}
-			format := ""
-			if image.format != nil {
-				format = string(image.format.JSON())
-			}
-			log.Println(image.ext)
-			if image.ext != "" {
-				var fl *os.File
-				if fl, err = os.Open(image.path); err != nil {
-					return
-				}
-				defer fl.Close()
-				var src []byte
-				if src, err = ioutil.ReadFile(image.path); err != nil {
-					return
-				}
-				log.Println("!!!!!!!!!!!!!!!!!!!!!!!!!")
-				if err = f.AddPictureFromBytes(sName, c, format, image.name, image.ext, src); err != nil {
-					return
-				}
-			} else {
-				if err = f.AddPicture(sName, c, image.path, format); err != nil {
-					return
-				}
-			}
-		}
-		///////////////////////////////////
-
 		// setup columns width
 		for _, cWidth := range matrix.ColumnsWidth {
 			if c, err = excelize.ColumnNumberToName(cWidth.x + 1); err != nil {
@@ -189,6 +157,38 @@ func exportXLSX(mList []Matrix) (res []byte, err error) {
 			f.AddDataValidation(sName, r)
 		}
 		///////////////////////////////////
+
+		// setup images
+		for _, image := range matrix.Images {
+			if c, err = excelize.CoordinatesToCellName(image.x+1, image.y+1); err != nil {
+				return
+			}
+			format := ""
+			if image.format != nil {
+				format = string(image.format.JSON())
+			}
+			log.Println(image.ext)
+			if image.ext != "" {
+				var fl *os.File
+				if fl, err = os.Open(image.path); err != nil {
+					return
+				}
+				defer fl.Close()
+				var src []byte
+				if src, err = ioutil.ReadFile(image.path); err != nil {
+					return
+				}
+				log.Println("!!!!!!!!!!!!!!!!!!!!!!!!!")
+				if err = f.AddPictureFromBytes(sName, c, format, image.name, image.ext, src); err != nil {
+					return
+				}
+			} else {
+				if err = f.AddPicture(sName, c, image.path, format); err != nil {
+					return
+				}
+			}
+		}
+		///////////////////////////////////
 	}
 
 	//r := excelize.NewDataValidation(true)

z_image.json

@@ -6,15 +6,7 @@
                 "x": 0,
                 "y": 0,
                 "format": { 
-                    "print_obj": true,
-                    "positioning": "absolute",
-                    "autofit": false,
-                    "lock_aspect_ratio": true,
-                    "x_scale": 1,
-                    "y_scale": 1,
-                    "x_offset": 1,
-                    "y_offset": 1
-
+                    "print_obj": true
                 },
                 "path": "image_copy",
                 "ext": ".jpg",

z_source.json

@@ -7,14 +7,7 @@
                 "y": 0,
                 "format": { 
                     "print_obj": true,
-                    "positioning": "absolute",
-                    "autofit": false,
-                    "lock_aspect_ratio": true,
-                    "x_scale": 1,
-                    "y_scale": 1,
-                    "x_offset": 1,
-                    "y_offset": 1
-
+                    "autofit": true
                 },
                 "path": "image_copy",
                 "ext": ".jpg",
@@ -117,9 +110,17 @@
                     ]
                 }
             },
-            "merges": [],
+            "merges": [
+                {
+                    "y": 0,
+                    "x": 0,
+                    "dx": 10,
+                    "dy": 5
+                }
+            ],
             "columns_width": [
                 {
+                    "y": 1,
                     "x": 0,
                     "dx": 3,
                     "width": 10
@@ -167,6 +168,7 @@
             ],
             "rows": [
                 {
+                    "y": 7,
                     "height": 40,
                     "cells": [
                         {