#250 Add image offset support

Author: hueifeng

docs/8. Import and export Excel as pictures.md

@@ -16,6 +16,8 @@ This chapter of the tutorial explains how to use Magicodes.IE.Excel to import an
 + **Height**： Height(Default 15)
 + **Width**：Width(Default 50)
 + **Alt**：Replace text when image does not exist
++ **YOffset**：垂直偏移（可进行移动图片）
++ **XOffset**：水平偏移（可进行移动图片）
 
 ### ImportImageFieldAttribute
 

docs/8.Excel图片导入导出.md

@@ -16,6 +16,9 @@
 + **Height**： 高度(默认15)
 + **Width**：宽度(默认50)
 + **Alt**：图片不存在时替换文本
++ **YOffset**：垂直偏移（可进行移动图片）
++ **XOffset**：水平偏移（可进行移动图片）
+
 
 ### ImportImageFieldAttribute
 

src/Magicodes.ExporterAndImporter.Core/Fields/ExportImageFieldAttribute.cs

@@ -21,6 +21,17 @@ public class ExportImageFieldAttribute : Attribute
         ///     图片不存在时的替代文本
         /// </summary>
         public string Alt { get; set; }
+
+        /// <summary>
+        /// 垂直偏移
+        /// </summary>
+        public int YOffset { get; set; } = 0;
+
+        /// <summary>
+        /// 水平偏移
+        /// </summary>
+        public int XOffset { get; set; } = 0;
+
         /// <summary>
         /// </summary>
         /// <param name="height"></param>

src/Magicodes.ExporterAndImporter.Excel/Utility/ExportHelper.cs

@@ -3,6 +3,7 @@
 using Magicodes.ExporterAndImporter.Core.Filters;
 using Magicodes.ExporterAndImporter.Core.Models;
 using OfficeOpenXml;
+using OfficeOpenXml.Drawing;
 using OfficeOpenXml.Style;
 using OfficeOpenXml.Table;
 using System;
@@ -756,7 +757,13 @@ protected void AddPictures(int rowCount)
                                 else
                                 {
                                     var pic = CurrentExcelWorksheet.Drawings.AddPicture(Guid.NewGuid().ToString(), bitmap);
-                                    pic.SetPosition(rowIndex + (ExcelExporterSettings.HeaderRowIndex > 1 ? ExcelExporterSettings.HeaderRowIndex : 0), ExporterHeaderList[colIndex].ExportImageFieldAttribute.Height / 5, colIndex - ignoreCount, 0);
+                                    AddImage((rowIndex + (ExcelExporterSettings.HeaderRowIndex > 1 ? ExcelExporterSettings.HeaderRowIndex : 0)),
+                                        colIndex - ignoreCount, pic, ExporterHeaderList[colIndex].ExportImageFieldAttribute.YOffset, ExporterHeaderList[colIndex].ExportImageFieldAttribute.XOffset);
+
+                                    //pic.SetPosition
+                                    //    (rowIndex + (ExcelExporterSettings.HeaderRowIndex > 1 ? ExcelExporterSettings.HeaderRowIndex : 0),
+                                    //    ExporterHeaderList[colIndex].ExportImageFieldAttribute.Height / 5, colIndex - ignoreCount, 0);
+
                                     CurrentExcelWorksheet.Row(rowIndex + 1).Height = ExporterHeaderList[colIndex].ExportImageFieldAttribute.Height;
                                     //pic.SetSize(ExporterHeaderList[colIndex].ExportImageFieldAttribute.Width * 7, ExporterHeaderList[colIndex].ExportImageFieldAttribute.Height);
                                     pic.SetSize(ExporterHeaderList[colIndex].ExportImageFieldAttribute.Width * 7, ExporterHeaderList[colIndex].ExportImageFieldAttribute.Height);
@@ -785,6 +792,24 @@ protected void AddPictures(int rowCount)
             }
         }
 
+        private void AddImage(int rowIndex, int colIndex, ExcelPicture picture, int yOffset, int xOffset)
+        {
+            if (picture != null)
+            {
+                picture.From.Column = colIndex;
+                picture.From.Row = rowIndex;
+                //调整对齐
+                picture.From.ColumnOff = Pixel2MTU(xOffset);
+                picture.From.RowOff = Pixel2MTU(yOffset);
+            }
+        }
+
+        private int Pixel2MTU(int pixels)
+        {
+            int mtus = pixels * 9525;
+            return mtus;
+        }
+
 
         /// <summary>
         /// 

src/Magicodes.ExporterAndImporter.Tests/Models/Export/ExportTestDataWithPricture.cs

@@ -14,7 +14,7 @@ public class ExportTestDataWithPicture
         [ExporterHeader(DisplayName = "忽略", IsIgnore = true)]
         public string Text3 { get; set; }
 
-        [ExportImageField(Width = 20, Height = 120)]
+        [ExportImageField(Width = 20, Height = 120, YOffset = 15)]
         [ExporterHeader(DisplayName = "图1")]
         public string Img1 { get; set; }
         [ExporterHeader(DisplayName = "数值", Format = "#,##0")]