diff --git a/beike/Admin/Http/Controllers/FileManagerController.php b/beike/Admin/Http/Controllers/FileManagerController.php index a22386dd..506b563a 100644 --- a/beike/Admin/Http/Controllers/FileManagerController.php +++ b/beike/Admin/Http/Controllers/FileManagerController.php @@ -31,7 +31,8 @@ class FileManagerController extends Controller { $baseFolder = $request->get('base_folder'); $page = (int)$request->get('page'); - return (new FileManagerService)->getFiles($baseFolder, $page); + $perPage = (int)$request->get('per_page'); + return (new FileManagerService)->getFiles($baseFolder, $page, $perPage); } diff --git a/beike/Admin/Services/FileManagerService.php b/beike/Admin/Services/FileManagerService.php index 052da2f9..d407d34c 100644 --- a/beike/Admin/Services/FileManagerService.php +++ b/beike/Admin/Services/FileManagerService.php @@ -57,7 +57,7 @@ class FileManagerService * @return array * @throws \Exception */ - public function getFiles($baseFolder, int $page = 1): array + public function getFiles($baseFolder, int $page = 1, int $perPage = 20): array { $currentBasePath = rtrim($this->fileBasePath . $baseFolder, '/'); $files = glob($currentBasePath . '/*'); @@ -75,7 +75,7 @@ class FileManagerService } $page = $page > 0 ? $page : 1; - $perPage = 20; + // $perPage = $perPage; $imageCollection = collect($images); $data = [ 'images' => $imageCollection->forPage($page, $perPage)->values()->toArray(), diff --git a/resources/beike/admin/views/pages/file_manager/index.blade.php b/resources/beike/admin/views/pages/file_manager/index.blade.php index 8defc1ab..ca2d3f4f 100644 --- a/resources/beike/admin/views/pages/file_manager/index.blade.php +++ b/resources/beike/admin/views/pages/file_manager/index.blade.php @@ -1,5 +1,6 @@ + @@ -18,36 +19,31 @@ beike filemanager +
- +
@{{ node.label }}
{{-- v-if="node.isCurrent" --}} -
+
- + - + - +
@@ -57,18 +53,25 @@
-
- 下载 - 删除 - 重命名 - 全选 +
+ 选择 + 下载 + 删除 + 重命名 + 全选
- 上传文件 + 上传文件
-
-
+
+
@{{ file.name }} @@ -80,455 +83,491 @@
- - - -
点击上传,或将图片拖到此处
-
-
-
-
-
@{{ index + 1 }}. @{{ image.name }}
-
@{{ image.status == 'complete' ? '完成' : '上传中' }}
-
- + + + +
点击上传,或将图片拖到此处
+
+
+
+
+
@{{ index + 1 }}. @{{ image.name }}
+
@{{ image.status == 'complete' ? '完成' : '上传中' }}
+
+
+