更新内容

app/Http/Controllers/Controller.php

@@ -18,6 +18,29 @@ class Controller extends BaseController
         // 一次性查询所有文件夹
         $folders = SiteAlbumFolder::all();
         // 构建父子关系树
-        $this->foldersTree = SiteAlbumFolder::buildTree($folders);
+        $fid = isset($_GET['fid'])? $_GET['fid'] : 0;
+        $result = SiteAlbumFolder::buildTree($folders);
+        $result = $result->toArray();
+        foreach ($result as $key => $item) {
+            $checked = false;
+            foreach ($item['children'] as $child) {
+                if ($fid == $child['id']) {
+                    $checked = true;
+                }
+                foreach ($child['children'] as $subChild) {
+                    if ($fid == $subChild['id']) {
+                        $checked = true;
+                    }
+                }
+            }
+            if ($fid == $item['id']) {
+                $checked = true;
+            }
+            $result[$key]['checked'] = $checked;
+        }
+
+        //dd($result);
+        $this->foldersTree = $result;
+
     }
 }

public/static/css/main.css

@@ -464,7 +464,7 @@ a {
   left: 0;
   top: 0;
   height: 100%;
-  background-color: #8e9093;
+
   box-shadow: 0px 0px 15.3px 1.7px rgba(0, 0, 0, 0.34);
   z-index: 11;
   transition: 0.5s ease;
@@ -1177,13 +1177,21 @@ a {
 }
 
 .album-name {
-  font-size: 22px;
-  font-weight: 500;
-  margin-bottom: 5px;
+    font-size: 22px;
+    font-weight: 500;
+    margin-bottom: 5px;
+    white-space: nowrap; /* 防止文字换行 */
+    overflow: hidden; /* 隐藏超出部分 */
+    text-overflow: ellipsis; /* 超出部分显示为省略号 */
+    max-width: 100%; /* 设置最大宽度 */
 }
 .album-desc {
-  color: #c8c6c6;
-  margin-bottom: 20px;
+    color: #c8c6c6;
+    margin-bottom: 20px;
+    white-space: nowrap; /* 防止文字换行 */
+    overflow: hidden; /* 隐藏超出部分 */
+    text-overflow: ellipsis; /* 超出部分显示为省略号 */
+    max-width: 100%; /* 设置最大宽度 */
 }
 
 .grid-album::after {

public/static/js/script.js

@@ -337,9 +337,11 @@ $(document).ready(function() {
                     }
                     var model = response.data.model + ' 的';
                     var content = response.data.content;
+                    var user_name = response.data.user_name;
 
                     // 更新 timestamp 和 message
                     $('.update-log .update-time').text(created_at);
+                    $('.update-log .user_name').text(user_name);
                     $('.update-log .action').text(action);
                     $('.update-log .model').text(model);
                     $('.update-log .log-content').text(content);

resources/views/__sidebar.blade.php

@@ -10,7 +10,7 @@
                 <li class="menu-nav-item">
                     <a @if (empty($tree['children']) == false) href="javascript:void(0)" @else href="/gallery?fid={{ $tree['id'] }}" @endif>{{ $tree['title'] }}</a>
                     @if (isset($tree['children']))
-                    <ul class="menu-nav-son">
+                    <ul class="menu-nav-son" @if($tree['checked'] == true)style="display: block;"@endif>
                         @foreach ($tree['children'] as $child)
                         <li>
                             <a @if (empty($child['children']) == false) href="javascript:void(0)" @else href="/gallery?fid={{ $child['id'] }}" @endif>{{ $child['title'] }}</a>
@@ -29,7 +29,6 @@
                     @endif
                 </li>
                 @endforeach
-
             </ul>
 
             <div class="menu-contacts">

resources/views/gallery-detail.blade.php

@@ -33,7 +33,7 @@
             <div class="update-log" >
                 <a href="/update-log">
                     <div class="timestamp"><i class="fa fa-volume-up"></i> <span class="update-time">&nbsp;</span></div>
-                    <div class="message">  <span class="action">&nbsp;</span> <span class="model">&nbsp;</span>  <span class="highlight log-content">&nbsp;</span></div>
+                    <div class="message"><span class="user_name">&nbsp;</span> <span class="action">&nbsp;</span> <span class="model">&nbsp;</span>  <span class="highlight log-content">&nbsp;</span></div>
                 </a>
             </div>
         </div>

resources/views/gallery.blade.php

@@ -33,7 +33,7 @@
             <div class="update-log" >
                 <a href="/update-log">
                     <div class="timestamp"><i class="fa fa-volume-up"></i> <span class="update-time">&nbsp;</span></div>
-                    <div class="message">  <span class="action">&nbsp;</span> <span class="model">&nbsp;</span>  <span class="highlight log-content">&nbsp;</span></div>
+                    <div class="message"><span class="user_name">&nbsp;</span>   <span class="action">&nbsp;</span> <span class="model">&nbsp;</span>  <span class="highlight log-content">&nbsp;</span></div>
                 </a>
             </div>
         </div>
@@ -69,15 +69,14 @@
                                 <div class="album-thumb">
                                     <img src="{{ossUrl($album['cover'][0])}}?x-oss-process=image/resize,m_fill,w_380,h_380" data-src="{{ossUrl($album['cover'][0])}}?x-oss-process=image/resize,m_fill,w_380,h_380" class="" alt="Graceful Zebra">
                                 </div>
-                                <div class="album-name">{{$album['title']}}</div>
-                                <div class="album-desc">
+                                <div class="album-name" title="{{$album['title']}}">{{$album['title']}}</div>
+                                <div class="album-desc" title="型号：{{$album['model']}}">
                                     型号：{{$album['model']}}
                                 </div>
                             </a>
                         </div>
                         @endforeach
                     @endif
-
                 </div>
                 <!-- Album Animals END -->
             </div><!-- end container-inner -->

resources/views/update_log.blade.php

@@ -41,7 +41,7 @@
                         @foreach($log as $item)
                         <div class="log-line active">
                             <div class="timestamp"><i class="fa fa-volume-up"></i> {{$item['created_at']}}</div>
-                            <div class="message">@if($item['action'] == 'add')新增@else更新@endif了 {{$item['model']}} 的 <span class="highlight">{{$item['content']}}</span></div>
+                            <div class="message">{{$item['user_name']}}@if($item['action'] == 'add')新增@else更新@endif了 {{$item['model']}} 的 <span class="highlight">{{$item['content']}}</span></div>
                         </div>
                         @endforeach
                     </li>