From a11291ff18dfab9b2f9de4c2f7c613cd5795f51f Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@opencart.cn>
Date: Fri, 22 Jul 2022 11:49:41 +0800
Subject: [PATCH] add directories

---
 .../Controllers/FileManagerController.php     | 28 ++++++++++++-------
 beike/Admin/Routes/admin.php                  |  1 +
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/beike/Admin/Http/Controllers/FileManagerController.php b/beike/Admin/Http/Controllers/FileManagerController.php
index 0e8f4535..9fada1e3 100644
--- a/beike/Admin/Http/Controllers/FileManagerController.php
+++ b/beike/Admin/Http/Controllers/FileManagerController.php
@@ -9,25 +9,33 @@ class FileManagerController extends Controller
 {
     /**
      * 获取文件夹和文件列表
-     * @param Request $request
      * @return mixed
      * @throws \Exception
      */
-    public function index(Request $request)
+    public function index()
+    {
+        $data = (new FileManagerService)->getDirectories();
+        return view('admin::pages.file_manager.index', ['directories' => $data]);
+    }
+
+
+    /**
+     * 获取某个文件夹下面的文件列表
+     *
+     * @param Request $request
+     * @return array
+     * @throws \Exception
+     */
+    public function getFiles(Request $request): array
     {
         $baseFolder = $request->get('base_folder');
         $page = (int)$request->get('page');
-        $data = (new FileManagerService)->getFiles($baseFolder, $page);
-
-        if ($request->expectsJson()) {
-            return $data;
-        }
-
-        return view('admin::pages.file_manager.index', $data);
+        return (new FileManagerService)->getFiles($baseFolder, $page);
     }
 
+
     /**
-     * 获取文件夹和文件列表
+     * 获取文件夹列表
      * @param Request $request
      * @return mixed
      * @throws \Exception
diff --git a/beike/Admin/Routes/admin.php b/beike/Admin/Routes/admin.php
index 4798a6f3..b092648c 100644
--- a/beike/Admin/Routes/admin.php
+++ b/beike/Admin/Routes/admin.php
@@ -40,6 +40,7 @@ Route::prefix($adminName)
                 Route::resource('files', Controllers\FileController::class);
 
                 Route::get('file_manager', [Controllers\FileManagerController::class, 'index'])->name('file_manager.index');
+                Route::get('file_manager/files', [Controllers\FileManagerController::class, 'getFiles'])->name('file_manager.get_files');
                 Route::get('file_manager/directories', [Controllers\FileManagerController::class, 'getDirectories'])->name('file_manager.get_directories');
                 Route::post('file_manager/directories', [Controllers\FileManagerController::class, 'createDirectory'])->name('file_manager.create_directory');
                 Route::post('file_manager/upload', [Controllers\FileManagerController::class, 'uploadFiles'])->name('file_manager.upload');