Merge pull request #10 from jxlwqq/master

解决 Files are opend as binary data 的问题。 #7
laravel-admin-extensions · Apr 25, 2018 · a5af138 · a5af138
2 parents c492106 + c362162
commit a5af138
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/resources/views/list.blade.php b/resources/views/list.blade.php
@@ -318,7 +318,7 @@ function(){
                             {!! $item['preview'] !!}
 
                             <div class="file-info">
-                                <a href="{{ $item['link'] }}" class="file-name" title="{{ $item['name'] }}">
+                                <a @if(!$item['isDir'])target="_blank"@endif href="{{ $item['link'] }}" class="file-name" title="{{ $item['name'] }}">
                                     {{ $item['icon'] }} {{ basename($item['name']) }}
                                 </a>
                             <span class="file-size">
@@ -333,7 +333,7 @@ function(){
                                         <li><a href="#" class="file-rename" data-toggle="modal" data-target="#moveModal" data-name="{{ $item['name'] }}">Rename & Move</a></li>
                                         <li><a href="#" class="file-delete" data-path="{{ $item['name'] }}">Delete</a></li>
                                         @unless($item['isDir'])
-                                        <li><a href="{{ $item['download'] }}">Download</a></li>
+                                        <li><a target="_blank" href="{{ $item['download'] }}">Download</a></li>
                                         @endunless
                                         <li class="divider"></li>
                                         <li><a href="#" data-toggle="modal" data-target="#urlModal" data-url="{{ $item['url'] }}">Url</a></li>
@@ -419,4 +419,4 @@ function(){
             </form>
         </div>
     </div>
-</div>
+</div>
diff --git a/resources/views/table.blade.php b/resources/views/table.blade.php
@@ -336,7 +336,7 @@ function(){
                         <td>
                             {!! $item['preview'] !!}
 
-                            <a href="{{ $item['link'] }}" class="file-name" title="{{ $item['name'] }}">
+                            <a @if(!$item['isDir'])target="_blank"@endif href="{{ $item['link'] }}" class="file-name" title="{{ $item['name'] }}">
                             {{ $item['icon'] }} {{ basename($item['name']) }}
                             </a>
                         </td>
@@ -346,7 +346,7 @@ function(){
                                 <a class="btn btn-default file-rename" data-toggle="modal" data-target="#moveModal" data-name="{{ $item['name'] }}"><i class="fa fa-edit"></i></a>
                                 <a class="btn btn-default file-delete" data-path="{{ $item['name'] }}"><i class="fa fa-trash"></i></a>
                                 @unless($item['isDir'])
-                                <a href="{{ $item['download'] }}" class="btn btn-default"><i class="fa fa-download"></i></a>
+                                <a target="_blank" href="{{ $item['download'] }}" class="btn btn-default"><i class="fa fa-download"></i></a>
                                 @endunless
                                 <a class="btn btn-default" data-toggle="modal" data-target="#urlModal" data-url="{{ $item['url'] }}"><i class="fa fa-internet-explorer"></i></a>
                             </div>
@@ -434,4 +434,4 @@ function(){
             </form>
         </div>
     </div>
-</div>
+</div>