Merge pull request Kujiale-Mobile#348 from jackwangyubo/master

CPPAlien · web-flow · commit 43e43ca71272 · 2022-02-17T15:01:13.000+08:00
增加对微信云存储图片的支持
diff --git a/components/painter/lib/downloader.js b/components/painter/lib/downloader.js
@@ -176,8 +176,10 @@ function transformBase64File(base64data, lru) {
 
 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,7 @@ function isValidUrl(url) {
 }
 
 function isOnlineUrl(url) {
-  return /(ht|f)tp(s?):\/\/([^ \\/]*\.)+[^ \\/]*(:[0-9]+)?\/?/.test(url)
+  return /((ht|f)tp(s?)|cloud):\/\/([^ \\/]*\.)+[^ \\/]*(:[0-9]+)?\/?/.test(url)
 }
 
 function isDataUrl(url) {
