From 4b57f95208490a9749ce1316f0e281173844aa2d Mon Sep 17 00:00:00 2001
From: cdswyda <cdswyda@gmail.com>
Date: Wed, 10 Nov 2021 15:59:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E5=9C=A8=E8=A3=81=E5=89=AA=E7=AD=89=E6=83=85=E5=86=B5=E4=B8=8B?=
 =?UTF-8?q?=E7=9A=84=E5=8A=A0=E8=BD=BD=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/handler.js   |  7 +++++--
 src/controllers/imageCtrl.js | 19 ++++++++++++++-----
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/controllers/handler.js b/src/controllers/handler.js
index ae345a4..73c011d 100644
--- a/src/controllers/handler.js
+++ b/src/controllers/handler.js
@@ -3168,17 +3168,20 @@ export default function luckysheetHandler() {
                         "left": left,
                         "top": top
                     });
+
+                    let imageUrlHandle = Store.toJsonOptions && Store.toJsonOptions['imageUrlHandle'];
+                    let imgSrc = typeof imageUrlHandle === 'function' ? imageUrlHandle(imgItem.src) : imgItem.src;
         
                     $("#luckysheet-modal-dialog-cropping .cropping-mask").css({
                         "width": imgItem.default.width,
                         "height": imgItem.default.height,
-                        "background-image": "url(" + imgItem.src + ")",
+                        "background-image": "url(" + imgSrc + ")",
                         "left": -offsetLeft,
                         "top": -offsetTop
                     })
         
                     $("#luckysheet-modal-dialog-cropping .cropping-content").css({
-                        "background-image": "url(" + imgItem.src + ")",
+                        "background-image": "url(" + imgSrc + ")",
                         "background-size": imgItem.default.width + "px " + imgItem.default.height + "px",
                         "background-position": -offsetLeft + "px " + -offsetTop + "px"
                     })
diff --git a/src/controllers/imageCtrl.js b/src/controllers/imageCtrl.js
index 7e5ddde..3120654 100644
--- a/src/controllers/imageCtrl.js
+++ b/src/controllers/imageCtrl.js
@@ -97,7 +97,8 @@ const imageCtrl = {
 
             _this.addImgItem(img);
         }
-        image.src = src;
+        let imageUrlHandle = Store.toJsonOptions && Store.toJsonOptions['imageUrlHandle'];
+        image.src = typeof imageUrlHandle === 'function' ? imageUrlHandle(src) : src;
     },
     generateRandomId: function(prefix) {
         if(prefix == null){
@@ -773,16 +774,19 @@ const imageCtrl = {
             "position": position
         });
 
+        let imageUrlHandle = Store.toJsonOptions && Store.toJsonOptions['imageUrlHandle'];
+        let imgSrc = typeof imageUrlHandle === 'function' ? imageUrlHandle(item.src) : item.src;
+
         $("#luckysheet-modal-dialog-cropping .cropping-mask").css({
             "width": item.default.width,
             "height": item.default.height,
-            "background-image": "url(" + item.src + ")",
+            "background-image": "url(" + imgSrc + ")",
             "left": -item.crop.offsetLeft,
             "top": -item.crop.offsetTop
         })
 
         $("#luckysheet-modal-dialog-cropping .cropping-content").css({
-            "background-image": "url(" + item.src + ")",
+            "background-image": "url(" + imgSrc + ")",
             "background-size": item.default.width + "px " + item.default.height + "px",
             "background-position": -item.crop.offsetLeft + "px " + -item.crop.offsetTop + "px"
         })
@@ -820,9 +824,11 @@ const imageCtrl = {
             "top": top,
             "position": position
         });
+        let imageUrlHandle = Store.toJsonOptions && Store.toJsonOptions['imageUrlHandle'];
+        let imgSrc = typeof imageUrlHandle === 'function' ? imageUrlHandle(item.src) : item.src;
 
         $("#luckysheet-modal-dialog-activeImage .luckysheet-modal-dialog-content").css({
-            "background-image": "url(" + item.src + ")",
+            "background-image": "url(" + imgSrc + ")",
             "background-size": item.default.width + "px " + item.default.height + "px",
             "background-position": -item.crop.offsetLeft + "px " + -item.crop.offsetTop + "px"
         })
@@ -868,8 +874,11 @@ const imageCtrl = {
             "position": position
         });
 
+        let imageUrlHandle = Store.toJsonOptions && Store.toJsonOptions['imageUrlHandle'];
+        let imgSrc = typeof imageUrlHandle === 'function' ? imageUrlHandle(imgItem.src) : imgItem.src;
+
         $("#luckysheet-modal-dialog-activeImage .luckysheet-modal-dialog-content").css({
-            "background-image": "url(" + imgItem.src + ")",
+            "background-image": "url(" + imgSrc + ")",
             "background-size": imgItem.default.width + "px " + imgItem.default.height + "px",
             "background-position": -imgItem.crop.offsetLeft + "px " + -imgItem.crop.offsetTop + "px"
         })