修改文章对应目录章节下无文章的章节名称显示问题

Textloding · Textloding · commit f828bf6a1f26 · 2024-07-02T10:50:29.000+08:00
diff --git a/README.md b/README.md
@@ -104,13 +104,17 @@ php artisan export:documents-seed
 ## 待解决已知问题
 1.BUG问题
  -  Dcatadmin内置的Markdown编辑器会因为文档过长造成保存后无法再次编辑文章的问题
+
 2.体验优化问题
  - 
+
 3.逻辑问题
- - 后台有空目录(目录下没有文章)前台不展示
+ - 
+
 4.Dcatadmin文档问题
  - 版本日志更新图片没有本地化
  - 文章具体内容内部链接跳转仍是learnku站点
 
 ## 待实现功能问题
+
 1.版本管理开放开关按钮问题
diff --git a/app/Http/Controllers/ArticleController.php b/app/Http/Controllers/ArticleController.php
@@ -33,12 +33,17 @@ public function show(Request $request, $document_slug, $version_number, $article
             ->where('version_id', $version->id)
             ->where('id', $article_id)
             ->firstOrFail();
+        $chapters = $document->has_chapters
+            ? Chapter::with(['articles' => function($query) use ($version) {
+                $query->where('version_id', $version->id)->orderBy('order');
+            }])->where('version_id', $version->id)->orderBy('order')->get()
+            : [];
 
         $articles = $document->has_chapters
             ? $version->articles()->with('chapter')->orderBy('chapter_id')->orderBy('order')->get()->groupBy('chapter_id')
             : $version->articles()->orderBy('order')->get();
 
-        return view('documents.articles.show', compact('document', 'version', 'article', 'articles'));
+        return view('documents.articles.show', compact('document', 'version', 'article', 'chapters', 'articles'));
     }
 
     public function findArticleIdBySlug($document_slug, $version_number, $chapter_id, $article_slug)
diff --git a/resources/views/documents/articles/show.blade.php b/resources/views/documents/articles/show.blade.php
@@ -321,17 +321,17 @@
 <div class="sidebar">
     <h5>目录</h5>
     @if($document->has_chapters)
-        @foreach($articles as $chapterId => $chapterArticles)
+        @foreach($chapters as $chapter)
             <div class="chapter">
-                <div class="chapter-title" data-toggle="collapse" data-target="#chapter-{{ $chapterId }}">
+                <div class="chapter-title" data-toggle="collapse" data-target="#chapter-{{ $chapter->id }}">
                     <span class="toggle-icon">&#9656;</span>
-                    {{ $chapterArticles->first()->chapter->title ?? '未命名章节' }}
+                    {{ $chapter->title ?? '未命名章节' }}
                 </div>
-                <div class="collapse" id="chapter-{{ $chapterId }}">
-                    @if ($chapterArticles->isEmpty())
+                <div class="collapse" id="chapter-{{ $chapter->id }}">
+                    @if ($chapter->articles->isEmpty())
                         <div class="article-title">暂无文章</div>
                     @else
-                        @foreach($chapterArticles as $articleItem)
+                        @foreach($chapter->articles as $articleItem)
                             <div class="article-title">
                                 <a href="{{ route('articles.show', ['document_slug' => $document->slug, 'version' => $version->version_number, 'article_slug' => $articleItem->slug, 'article_id' => $articleItem->id]) }}">{{ $articleItem->title }}</a>
                             </div>
