Merge branch 'fix-base64-svg' into dev

src/core/view/components/canvas/index.vue

@@ -344,7 +344,7 @@ export default {
             if (window.plus && src.indexOf('http://') !== 0 && src.indexOf('https://') !==
                                 0) {
               loadFile(src)
-            } else if (/^data:[a-z-]+\/[a-z-]+;base64,/.test(src)) {
+            } else if (/^data:.*,.*/.test(src)) {
               sefl._images[src].src = src
             } else {
               loadUrl(src)

src/platforms/app-plus/helpers/get-real-path.js

 import getRealRoute from 'uni-helpers/get-real-route'
 
 const SCHEME_RE = /^([a-z-]+:)?\/\//i
-const BASE64_RE = /^data:[a-z-]+\/[a-z-]+;base64,/
+const DATA_RE = /^data:.*,.*/
 
 function addBase (filePath) {
   return filePath
@@ -16,7 +16,7 @@ export default function getRealPath (filePath) {
     }
   }
   // 网络资源或base64
-  if (SCHEME_RE.test(filePath) || BASE64_RE.test(filePath) || filePath.indexOf('blob:') === 0) {
+  if (SCHEME_RE.test(filePath) || DATA_RE.test(filePath) || filePath.indexOf('blob:') === 0) {
     return filePath
   }
 

src/platforms/app-plus/service/api/util.js

@@ -44,7 +44,7 @@ const _handleLocalPath = filePath => {
 
 export function getRealPath (filePath) {
   const SCHEME_RE = /^([a-z-]+:)?\/\//i
-  const BASE64_RE = /^data:[a-z-]+\/[a-z-]+;base64,/
+  const DATA_RE = /^data:.*,.*/
 
   // 无协议的情况补全 https
   if (filePath.indexOf('//') === 0) {
@@ -52,7 +52,7 @@ export function getRealPath (filePath) {
   }
 
   // 网络资源或base64
-  if (SCHEME_RE.test(filePath) || BASE64_RE.test(filePath)) {
+  if (SCHEME_RE.test(filePath) || DATA_RE.test(filePath)) {
     return filePath
   }
 

src/platforms/h5/helpers/get-real-path.js

 import getRealRoute from 'uni-helpers/get-real-route'
 
 const SCHEME_RE = /^([a-z-]+:)?\/\//i
-const BASE64_RE = /^data:[a-z-]+\/[a-z-]+;base64,/
+const DATA_RE = /^data:.*,.*/
 
 function addBase (filePath) {
   if (__uniConfig.router.base) {
@@ -19,7 +19,7 @@ export default function getRealPath (filePath) {
     }
   }
   // 网络资源或base64
-  if (SCHEME_RE.test(filePath) || BASE64_RE.test(filePath) || filePath.indexOf('blob:') === 0) {
+  if (SCHEME_RE.test(filePath) || DATA_RE.test(filePath) || filePath.indexOf('blob:') === 0) {
     return filePath
   }