diff --git a/beike/Admin/Http/Controllers/FilemanagerController.php b/beike/Admin/Http/Controllers/FilemanagerController.php index f04ed924..5c3055da 100644 --- a/beike/Admin/Http/Controllers/FilemanagerController.php +++ b/beike/Admin/Http/Controllers/FilemanagerController.php @@ -10,7 +10,8 @@ class FileManagerController extends Controller public function index(Request $request) { $baseFolder = $request->get('base_folder'); - $data = (new FileManagerService)->getFiles($baseFolder); + $page = (int)$request->get('page'); + $data = (new FileManagerService)->getFiles($baseFolder, $page); if ($request->ajax()) { return $data; diff --git a/beike/Admin/Services/FileManagerService.php b/beike/Admin/Services/FileManagerService.php index 608757ca..22eaa9fc 100644 --- a/beike/Admin/Services/FileManagerService.php +++ b/beike/Admin/Services/FileManagerService.php @@ -26,9 +26,10 @@ class FileManagerService * 获取某个目录下的文件和文件夹 * * @param $baseFolder + * @param int $page * @return array */ - public function getFiles($baseFolder): array + public function getFiles($baseFolder, int $page = 1): array { $fileBasePath = $this->fileBasePath; if ($baseFolder) { @@ -53,9 +54,15 @@ class FileManagerService } } + $page = $page > 0 ? $page : 1; + $perPage = 20; + + $imageCollection = collect($images); $data = [ 'folders' => $folders, - 'images' => $images + 'images' => $imageCollection->forPage($page, $perPage)->values()->toArray(), + 'image_total' => $imageCollection->count(), + 'image_page' => $page, ]; return $data; }