Browse Source

打开文件夹和展开文件夹树,需返回当前容器,容器库信息调整

kely 4 months ago
parent
commit
5b02d055ae
1 changed files with 23 additions and 4 deletions
  1. 23 4
      app/Http/Controllers/API/FolderController.php

+ 23 - 4
app/Http/Controllers/API/FolderController.php

@@ -28,7 +28,7 @@ class FolderController extends Controller
     {
         $folderObjectType = FolderObjectType::from($objectType);
 
-        $object=$folderObjectType->modelBuilderAllowed()->findOrFail($objectId);
+        $object=$folderObjectType->modelBuilderAllowed()->with(['library'])->findOrFail($objectId);
 
         $folders = Folder::query()
             ->where([
@@ -51,10 +51,19 @@ class FolderController extends Controller
                 $folders->uniId=$folders->type.'_'.$folders->id;
             });
 
+        $container=[
+            'id'=>$object->id,
+            'name'=>$object->name,
+            'naming_rule_id'=>$object->naming_rule_id,
+            'naming_rules'=>$object->naming_rules,
+            'object_type'=>$object->library->type,
+            'asset_id'=>$object->library->asset_id,
+            'project_id'=>$object->library->project_id,
+        ];
 
         return $this->success([
             //'data' => make_tree($folders->toArray(), \request("parent_id", 0)),
-            'object'=>$object->get(['id','name','naming_rule_id','naming_rules']),
+            'object'=> $container,
             'data' => $folders
         ]);
     }
@@ -253,7 +262,7 @@ class FolderController extends Controller
 
         $folderObjectType = FolderObjectType::from($objectType);
 
-        $object=$folderObjectType->modelBuilderAllowed()->findOrFail($objectId);
+        $object=$folderObjectType->modelBuilderAllowed()->with(['library'])->findOrFail($objectId);
 
 
         $objectWhere = ['object_type' => $objectType, 'object_id' => $objectId,];
@@ -302,9 +311,19 @@ class FolderController extends Controller
             $file->display_id=$folderCount++;
         });
 
+        $container=[
+            'id'=>$object->id,
+            'name'=>$object->name,
+            'naming_rule_id'=>$object->naming_rule_id,
+            'naming_rules'=>$object->naming_rules,
+            'object_type'=>$object->library->type,
+            'asset_id'=>$object->library->asset_id,
+            'project_id'=>$object->library->project_id,
+        ];
+
 
         return $this->success([
-            'object'=>$object->get(['id','name','naming_rule_id','naming_rules']),
+            'object'=>$container,
             'data' => [
                 'folders' => $folders,
                 'files' => FileByObjectResource::collection($files),