From 4ae9035673a60ca67086f8b8ab4827ccb36dd4a6 Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@opencart.cn>
Date: Tue, 12 Jul 2022 16:39:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E7=BF=BB=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Http/Controllers/FilemanagerController.php  |  3 ++-
 beike/Admin/Services/FileManagerService.php           | 11 +++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

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;
     }