From 09d585a2f965d125a4dd8505e06c0b758e5121d4 Mon Sep 17 00:00:00 2001
From: unknown <https://git-online.zhco.com/reid-zhco/li-questionnaire.git>
Date: Thu, 18 Jul 2024 17:33:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/ResourceController.php    |  4 ++--
 app/controller/ResourceDirController.php | 29 +++++++++++++++++++++++------
 app/model/ResourceDir.php                | 22 ----------------------
 route/app.php                            |  6 +++++-
 4 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/app/controller/ResourceController.php b/app/controller/ResourceController.php
index 83e0408..e243f1d 100644
--- a/app/controller/ResourceController.php
+++ b/app/controller/ResourceController.php
@@ -97,9 +97,9 @@ class ResourceController
   /**
    * 资源 分享
    */
-  public function share()
+  public function share($id)
   {
-    //todo
+    dd($id);
   }
 
   /**
diff --git a/app/controller/ResourceDirController.php b/app/controller/ResourceDirController.php
index 349da6e..8fdb48f 100644
--- a/app/controller/ResourceDirController.php
+++ b/app/controller/ResourceDirController.php
@@ -16,18 +16,35 @@ use think\Request;
 class ResourceDirController
 {
   /**
-   * 文件夹 首页
+   * 文件夹 列表页
    */
-  public function index(ResourceDir $resource_dir)
+  public function index(ResourceDir $resource_dir, Request $request, $id = 0)
   {
-    $resource_dir_list =  $resource_dir::where('type', 2)->where('parent_id', 0)->field('id, name')->select()->toArray();
-    //还需要第一个文件夹下所有内容
-    $resource_list = $resource_dir->getResourceDirAndResource($resource_dir_list[0]['id']);
+    //左侧顶级文件夹列表
+    $top_resource_dir =  $resource_dir::where('type', 2)->where('parent_id', 0)->field('id, name')->select()->toArray();
+    //选中的文件夹 默认顶级第一个
+    $select_dir_id = $id ?: $top_resource_dir[0]['id'];
+    //选中的文件夹基础信息
+    $resource_dir_info = $resource_dir::find($select_dir_id);
+    //选中文件夹下所有内容
+    $resource_list = $resource_dir->getResourceDirAndResource($select_dir_id);
+
+    $ret = [
+      'top_resource_dir' => $top_resource_dir,
+      'resource_dir_info' => $resource_dir_info,
+      'resource_list' => $resource_list
+    ];
 
-    $ret = ['resource_dir_list' => $resource_dir_list, 'resource_list' => $resource_list];
     return jsonReturn(0, Lang::get('成功'), $ret);
   }
 
+  public function detail($id)
+  {
+    dd($id);
+    $param = input('get.');
+    dd($param);
+  }
+
   /**
    * 创建文件夹 
    */
diff --git a/app/model/ResourceDir.php b/app/model/ResourceDir.php
index cbed422..9f3013e 100644
--- a/app/model/ResourceDir.php
+++ b/app/model/ResourceDir.php
@@ -81,26 +81,4 @@ class ResourceDir extends Model
     // 反转路径数组，使顶级文件夹在前
     return implode(',', array_reverse($path));
   }
-
-
-
-  // /**
-  //  * @param $folderId 文件夹id
-  //  * @return array
-  //  * 递归获取一个文件夹下所有ids
-  //  */
-  // public function getFolderIds($folderId)
-  // {
-  //   $folderIds = [];
-  //   // 获取直接子文件夹
-  //   $sub_folders = Resource::where('parent_id', $folderId)
-  //     ->where('type', 2)
-  //     ->select();
-  //   foreach ($sub_folders as $subfolder) {
-  //     $folderIds[] = $subfolder['id'];
-  //     $folderIds = array_merge($folderIds, $this->getFolderIds($subfolder['id']));
-  //   }
-
-  //   return $folderIds;
-  // }
 }
diff --git a/route/app.php b/route/app.php
index 3d7d5f2..d708878 100644
--- a/route/app.php
+++ b/route/app.php
@@ -16,6 +16,7 @@ Route::get('think', function () {
 
 Route::get('hello/:name', 'index/hello');
 
+//资源
 Route::group('resource', function () {
     Route::get('/index', 'index');
     Route::post('/save', 'save');
@@ -26,8 +27,11 @@ Route::group('resource', function () {
     Route::post('/copy_to', 'copyTo');
 })->prefix('resource/');
 
+//文件夹
 Route::group('resourceDir', function () {
-    Route::get('/index', 'index');
+    Route::get('/index/[:id]', 'index');
+    // Route::get('/detail/:id', 'detail');
+
     Route::post('/save', 'save'); //新建文件夹 子文件夹
     Route::post('/rename', 'rename');
 })->prefix('resourceDir/');