optimize

liaochong · Dec 15, 2023 · b189e20 · b189e20
1 parent f0551f4
commit b189e20
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/main/java/com/github/liaochong/myexcel/core/ExcelColumnMapping.java b/src/main/java/com/github/liaochong/myexcel/core/ExcelColumnMapping.java
@@ -137,11 +137,16 @@ public static ExcelColumnMapping mapping(ExcelColumn excelColumn) {
  result.promptContainer = promptContainer;
  }
  com.github.liaochong.myexcel.core.annotation.Image image = excelColumn.image();
+ result.image = new Image();
  if (image.scaleX() > 0 && image.scaleY() > 0) {
- Image pic = new Image();
- pic.setScaleX(image.scaleX());
- pic.setScaleY(image.scaleY());
- result.image = pic;
+ result.image.setScaleX(image.scaleX());
+ result.image.setScaleY(image.scaleY());
+ }
+ if ((image.marginTop() > 0)) {
+ result.image.setMarginTop(image.marginTop());
+ }
+ if ((image.marginLeft() > 0)) {
+ result.image.setMarginLeft(image.marginLeft());
  }
  return result;
  }

diff --git a/src/main/java/com/github/liaochong/myexcel/core/annotation/Image.java b/src/main/java/com/github/liaochong/myexcel/core/annotation/Image.java
@@ -18,4 +18,8 @@
  double scaleX() default -1d;
 
  double scaleY() default -1d;
+
+ int marginTop() default -1;
+
+ int marginLeft() default -1;
 }