Merge pull request #2701 from qskane/master

z-song · web-flow · commit cbade344c482 · 2018-10-29T14:46:51.000+08:00
Fix base64 image can not display
diff --git a/src/Grid/Displayers/Image.php b/src/Grid/Displayers/Image.php
@@ -14,7 +14,7 @@ public function display($server = '', $width = 200, $height = 200)
         }
 
         return collect((array) $this->value)->filter()->map(function ($path) use ($server, $width, $height) {
-            if (url()->isValidUrl($path)) {
+            if (url()->isValidUrl($path) || strpos($path, 'data:image') === 0) {
                 $src = $path;
             } elseif ($server) {
                 $src = rtrim($server, '/').'/'.ltrim($path, '/');

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public function display($server = '', $width = 200, $height = 200)`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`return collect((array) $this->value)->filter()->map(function ($path) use ($server, $width, $height) {`
`17`		`- if (url()->isValidUrl($path)) {`
	`17`	`+ if (url()->isValidUrl($path) \|\| strpos($path, 'data:image') === 0) {`
`18`	`18`	`$src = $path;`
`19`	`19`	`} elseif ($server) {`
`20`	`20`	`$src = rtrim($server, '/').'/'.ltrim($path, '/');`