图片翻页
This commit is contained in:
parent
996b2491de
commit
4ae9035673
|
|
@ -10,7 +10,8 @@ class FileManagerController extends Controller
|
||||||
public function index(Request $request)
|
public function index(Request $request)
|
||||||
{
|
{
|
||||||
$baseFolder = $request->get('base_folder');
|
$baseFolder = $request->get('base_folder');
|
||||||
$data = (new FileManagerService)->getFiles($baseFolder);
|
$page = (int)$request->get('page');
|
||||||
|
$data = (new FileManagerService)->getFiles($baseFolder, $page);
|
||||||
|
|
||||||
if ($request->ajax()) {
|
if ($request->ajax()) {
|
||||||
return $data;
|
return $data;
|
||||||
|
|
|
||||||
|
|
@ -26,9 +26,10 @@ class FileManagerService
|
||||||
* 获取某个目录下的文件和文件夹
|
* 获取某个目录下的文件和文件夹
|
||||||
*
|
*
|
||||||
* @param $baseFolder
|
* @param $baseFolder
|
||||||
|
* @param int $page
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
public function getFiles($baseFolder): array
|
public function getFiles($baseFolder, int $page = 1): array
|
||||||
{
|
{
|
||||||
$fileBasePath = $this->fileBasePath;
|
$fileBasePath = $this->fileBasePath;
|
||||||
if ($baseFolder) {
|
if ($baseFolder) {
|
||||||
|
|
@ -53,9 +54,15 @@ class FileManagerService
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$page = $page > 0 ? $page : 1;
|
||||||
|
$perPage = 20;
|
||||||
|
|
||||||
|
$imageCollection = collect($images);
|
||||||
$data = [
|
$data = [
|
||||||
'folders' => $folders,
|
'folders' => $folders,
|
||||||
'images' => $images
|
'images' => $imageCollection->forPage($page, $perPage)->values()->toArray(),
|
||||||
|
'image_total' => $imageCollection->count(),
|
||||||
|
'image_page' => $page,
|
||||||
];
|
];
|
||||||
return $data;
|
return $data;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue