|
@@ -7,9 +7,9 @@ use Illuminate\Support\Facades\Storage;
|
|
|
|
|
|
class Downloadable extends AbstractDisplayer
|
|
|
{
|
|
|
- public function display($server = '')
|
|
|
+ public function display($server = '', $disk = null)
|
|
|
{
|
|
|
- return collect(Helper::array($this->value))->filter()->map(function ($value) use ($server) {
|
|
|
+ return collect(Helper::array($this->value))->filter()->map(function ($value) use ($server, $disk) {
|
|
|
if (empty($value)) {
|
|
|
return '';
|
|
|
}
|
|
@@ -19,7 +19,7 @@ class Downloadable extends AbstractDisplayer
|
|
|
} elseif ($server) {
|
|
|
$src = rtrim($server, '/') . '/' . ltrim($value, '/');
|
|
|
} else {
|
|
|
- $src = Storage::disk(config('admin.upload.disk'))->url($value);
|
|
|
+ $src = Storage::disk($disk ?: config('admin.upload.disk'))->url($value);
|
|
|
}
|
|
|
|
|
|
$name = basename($value);
|