moshaorui 1 month ago
parent
commit
06ea4f6d56

+ 4 - 0
app/Admin/Controllers/SiteAlbumController.php

@@ -191,6 +191,10 @@ JS
     {
         $thisObj = $this;
         return Form::make(new SiteAlbum(), function (Form $form) use ($thisObj) {
+            if ($form->isEditing()) {
+                $form->title("编辑 | " . $form->model()->title);
+            }
+
             $form->width(9, 1);
             $form->disableViewButton();
             $form->disableViewCheck();

+ 6 - 1
app/Admin/Repositories/SiteAlbum.php

@@ -15,7 +15,7 @@ class SiteAlbum extends EloquentRepository
     protected $eloquentClass = Model::class;
 
 
-    public static function siteAlbumPaginate($filter = [],$perPage = 15,$page = 1)
+    public static function siteAlbumPaginate($filter = [],$sort = [],$perPage = 15,$page = 1)
     {
         $siteAlbum = new Model();
         $filterModel = isset($filter['model'])? $filter['model'] : '';
@@ -31,6 +31,11 @@ class SiteAlbum extends EloquentRepository
 
             $siteAlbum = $siteAlbum->whereIn('folder_id', $albumFolder);
         }
+        if (empty($sort)) {
+            $siteAlbum = $siteAlbum->orderBy('id', 'desc');
+        } else {
+            $siteAlbum = $siteAlbum->orderBy($sort[0], $sort[1]);
+        }
 
         $result = $siteAlbum->paginate(
             $perPage, $columns = ['*'], $pageName = 'page', $page

+ 2 - 2
app/Admin/Services/RpcService.php

@@ -47,9 +47,9 @@ class RpcService
      * @param int $page 页码
      * @param int $perPage 每页数量
      */
-    public function siteAlbumPaginate($filter = [],$perPage = 15,$page = 1): string
+    public function siteAlbumPaginate($filter = [],$sort = [],$perPage = 15,$page = 1): string
     {
-        $result = SiteAlbum::siteAlbumPaginate($filter,$perPage,$page);
+        $result = SiteAlbum::siteAlbumPaginate($filter,$sort,$perPage,$page);
         $result = $result->toArray();
         return $this->responseSuccess( $result);
     }

+ 1 - 1
app/Console/Commands/SyncAlbumContent.php

@@ -76,7 +76,7 @@ class SyncAlbumContent extends Command
                         'folder_id' => $siteAlbumFolder->id,
                         'order' => 0, // 你可以根据需要设置排序
                         'title' => $albumContent->model,
-                        'title_en' => "",
+                        'title_en' => $albumContent->model,
                         'model' => $albumContent->model,
                         'parameters' => null, // 你可以根据需要设置参数
                         'cover' => $cover,