增加对微信云存储图片的支持

jack.wyb · jack.wyb · commit 098688ca624e · 2021-07-05T20:52:37.000+08:00
diff --git a/components/painter/lib/downloader.js b/components/painter/lib/downloader.js
@@ -174,10 +174,13 @@ function transformBase64File(base64data, lru) {
   });  
 }
 
+//支持微信云文件fileID
 function downloadFile(url, lru) {
   return new Promise((resolve, reject) => {
-    wx.downloadFile({
+    const downloader = url.startsWith('cloud://')?wx.cloud.downloadFile:wx.downloadFile
+    downloader({
       url: url,
+      fileID: url,
       success: function (res) {
         if (res.statusCode !== 200) {
           console.error(`downloadFile ${url} failed res.statusCode is not 200`);
diff --git a/components/painter/lib/util.js b/components/painter/lib/util.js
@@ -4,7 +4,9 @@ function isValidUrl(url) {
 }
 
 function isOnlineUrl(url) {
-  return /(ht|f)tp(s?):\/\/([^ \\/]*\.)+[^ \\/]*(:[0-9]+)?\/?/.test(url)
+  // 支持微信云文件的fileId（cloud://开头）
+  // return /(ht|f)tp(s?):\/\/([^ \\/]*\.)+[^ \\/]*(:[0-9]+)?\/?/.test(url)
+  return /((ht|f)tp(s?)|cloud):\/\/([^ \\/]*\.)+[^ \\/]*(:[0-9]+)?\/?/.test(url)
 }
 
 function isDataUrl(url) {
