Merge branch 'dev' into doc_tree_type

app/Http/Controllers/API/FolderController.php

@@ -238,16 +238,20 @@ class FolderController extends Controller
             $objectId = $request->get("object_id");
         }
 
-        $folderObjectType = FolderObjectType::from($request->object_type);
+        $folderObjectType = FolderObjectType::from($objectType);
 
-        $folderObjectType->modelBuilderAllowed()->findOrFail($request->object_id);
+        $folderObjectType->modelBuilderAllowed()->findOrFail($objectId);
 
         $objectWhere = ['object_type' => $objectType, 'object_id' => $objectId,];
         $folders = Folder::query()
             ->where($objectWhere)
             ->when($folderId, fn($query) => $query->where("parent_id", $folderId))
             ->when(! $folderId, fn($query) => $query->where("parent_id", 0))
-            ->get(['id', 'name']);
+            ->get(['id', 'name'])->each(function ($folders)use ($folderId){
+                $folderCount=Folder::query()->where('parent_id',$folders->id)->count();
+                $filesCount=File::query()->where('folder_id',$folderId>0?$folders->id:$folderId)->where("is_latest_version", 1)->count();
+                $folders->itemCount=$folderCount+$filesCount;
+            });
 
 
         $files = File::query()->where($objectWhere)

app/Http/Controllers/API/LibraryController.php

@@ -112,7 +112,7 @@ class LibraryController extends Controller
             // 设置固定的type值
             $libraries->type = 'library';
             $libraries->uniId=uniqid();
-            $libraries->container_count=$libraries->container()->count();
+            $libraries->containerCount=$libraries->container()->count();
             });
 
         return $this->success([