Merge branch '1.x-stable' of github.com:NSFI/ppfish-components into 1…

….x-stable
NSFI · Aug 11, 2022 · b628a8b · b628a8b
2 parents 1af8ce5 + f737927
commit b628a8b
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/source/components/PicturePreview/index.tsx b/source/components/PicturePreview/index.tsx
@@ -563,8 +563,12 @@ class PicturePreview extends Component<PicturePreviewProps, PicturePreviewState>
         dLink.click();
       });
     };
-    // 在URL后添加随机数以避免浏览器缓存，使crossOrigin生效
-    img.src = this.imgEl.src + '?' + +new Date();
+    // 在URL后添加随机数以避免浏览器缓存，使crossOrigin生效(拼接前判断 src 中是否已有 ?)
+    if (this.imgEl.src && this.imgEl.src.indexOf('?') < 0) {
+      img.src = this.imgEl.src + '?' + +new Date();
+    } else {
+      img.src = this.imgEl.src + '&' + +new Date();
+    }
   };
 
   handleFullChange = e => {