新增：博客分类支持二级分类，博客列表页面支持二级分类筛选

Author: modstart

module/Blog/Admin/Controller/BlogCategoryController.php

@@ -42,6 +42,6 @@ protected function crud(AdminCRUDBuilder $builder)
             })
             ->title('博客分类')
             ->asTree()
-            ->treeMaxLevel(1);
+            ->treeMaxLevel(2);
     }
 }

module/Blog/Api/Controller/BlogController.php

@@ -103,10 +103,12 @@ public function paginate()
             }
         }
 
-
         $category = null;
+        $childCategories = [];
+        $categoryChain = BlogCategoryUtil::categoryChainWithItems($categoryId);
         if ($categoryId > 0) {
             $category = \MBlog::getCategory($categoryId);
+            $childCategories = \MBlog::listChildCategories($categoryId);
             BizException::throwsIfEmpty('分类不存在', $category);
             $pageTitle = $category['title'];
             $pageKeywords = $category['keywords'];
@@ -119,6 +121,8 @@ public function paginate()
             'page' => $page,
             'pageSize' => $pageSize,
             'category' => $category,
+            'childCategories' => $childCategories,
+            'categoryChain' => $categoryChain,
             'keywords' => $keywords,
             'markKeywords' => $markKeywords,
             'records' => $paginateData['records'],

module/Blog/Core/MBlog.php

@@ -573,6 +573,32 @@ public static function getCategory($categoryId)
         return BlogCategoryUtil::get($categoryId);
     }
 
+    /**
+     * @Util 获取子分类信息
+     * @param $parentCategoryId int 分类ID
+     * @return array 数组
+     * @returnExample
+     * [
+     *   {
+     *     "id": 1, // 分类ID
+     *     "created_at": "2022-05-27 14:51:09",
+     *     "updated_at": "2022-09-21 14:55:33",
+     *     "pid": 0,
+     *     "sort": 1,
+     *     "title": "分类名称",
+     *     "blogCount": 1,
+     *     "cover": "https://example.com/xxx.jpg",
+     *     "keywords": "分类关键词",
+     *     "description": "分类描述"
+     *   },
+     *   // ...
+     * ]
+     */
+    public static function listChildCategories($parentCategoryId)
+    {
+        return BlogCategoryUtil::listChildCategories($parentCategoryId);
+    }
+
     /**
      * @Util 获取所有博客标签信息
      * @param $limit int 限制数量，0为不限制

module/Blog/Docs/release.md

@@ -1,3 +1,9 @@
+## 3.5.0
+
+- 新增：博客分类支持二级分类，博客列表页面支持二级分类筛选
+
+---
+
 ## 3.4.0 搜索中心重建，首页SEO标题、描述可独立设置
 
 - 新增：搜索中心内容索引重建统一入口，安装 SuperSearch 模块

module/Blog/Util/BlogCategoryUtil.php

@@ -19,7 +19,7 @@ public static function clearCache()
     public static function all()
     {
         return Cache::rememberForever('BlogCategories', function () {
-            $records = ModelUtil::all('blog_category', [], ['*'], ['sort', 'desc']);
+            $records = ModelUtil::all('blog_category', [], ['*'], ['sort', 'asc']);
             AssetsUtil::recordsFixFullOrDefault($records, 'cover', 'asset/image/none.png');
             foreach ($records as $k => $v) {
                 $records[$k]['_url'] = UrlUtil::category($v);
@@ -34,6 +34,12 @@ public static function categoryTree()
         return TreeUtil::nodesToTree($nodes);
     }
 
+    public static function categoryChainWithItems($categoryId)
+    {
+        $records = self::all();
+        return TreeUtil::nodesChainWithItems($records, $categoryId);
+    }
+
     public static function get($id)
     {
         foreach (self::all() as $one) {
@@ -44,6 +50,15 @@ public static function get($id)
         return null;
     }
 
+    public static function listChildCategories($categoryId)
+    {
+        $records = self::all();
+        $records = array_filter($records, function ($item) use ($categoryId) {
+            return $item['pid'] == $categoryId;
+        });
+        return array_values($records);
+    }
+
     public static function childrenIds($categoryId)
     {
         if ($categoryId <= 0) {

module/Blog/Util/UrlUtil.php

@@ -8,9 +8,17 @@ class UrlUtil
 {
     public static function category($category)
     {
-        return modstart_web_url('blogs', [
-            'categoryId' => $category['id'],
-        ]);
+        if (is_array($category)) {
+            return modstart_web_url('blogs', [
+                'categoryId' => $category['id'],
+            ]);
+        }
+        if ($category > 0) {
+            return modstart_web_url('blogs', [
+                'categoryId' => $category,
+            ]);
+        }
+        return modstart_web_url('blogs');
     }
 
     public static function blog($blog)

module/Blog/View/pc/blog/inc/categories.blade.php

@@ -9,8 +9,8 @@
                 @foreach(\MBlog::categoryTree() as $t)
                     <div class="col-6">
                         <a href="{{modstart_web_url('blogs',['categoryId'=>$t['id']])}}"
-                           class="hover:tw-shadow tw-block ub-content-block tw-rounded tw-leading-10 tw-mb-3 tw-px-2 tw-truncate @if(!empty($category)&&$category['id']==$t['id']) ub-bg-primary @endif">
-                            <i class="iconfont icon-angle-right ub-text-muted"></i>
+                           class="hover:tw -shadow btn btn-block btn-round tw-mb-3 tw-px-2 tw-truncate @if(!empty($category)&&$category['id']==$t['id']) btn-primary @endif">
+                            <i class="iconfont icon-angle-right"></i>
                             {{$t['title']}}
                             （{{$t['blogCount']?$t['blogCount']:0}}）
                         </a>

module/Blog/View/pc/blog/list.blade.php

@@ -32,20 +32,25 @@
                         </div>
                     </div>
                 @endif
-                @if($category)
-                    <div class="ub-content-box margin-bottom">
-                        <div class="tw-p-3">
-                            <i class="iconfont icon-category"></i>
-                            <a href="{{modstart_web_url('blogs')}}" class="tw-text-lg tw-text-gray-400">
-                                全部
-                            </a>
-                            <i class="iconfont icon-angle-right ub-text-muted"></i>
-                            <a href="{{modstart_web_url('blogs',['categoryId'=>$category])}}" class="tw-text-lg tw-text-gray-800">
-                                {{$category['title']}}
-                            </a>
-                        </div>
+                <div class="ub-content-box margin-bottom">
+                    <div class="tw-px-3 tw-pt-3">
+                        @foreach($categoryChain as $catIndex=>$catItem)
+                            <div class="margin-bottom">
+                                <a href="?{{\ModStart\Core\Input\Request::mergeQueries(['categoryId'=>$catItem['pid']?$catItem['pid']:null])}}"
+                                   class="btn btn-round @if($catItem['id']<=0) btn-primary @endif">
+                                    全部
+                                </a>
+                                @foreach($catItem['_items'] as $item)
+                                    <a href="?{{\ModStart\Core\Input\Request::mergeQueries(['categoryId'=>$item['id']?$item['id']:null])}}"
+                                       class="btn btn-round @if($catItem['id']==$item['id']) btn-primary @endif"
+                                    >
+                                        {{$item['title']}}
+                                    </a>
+                                @endforeach
+                            </div>
+                        @endforeach
                     </div>
-                @endif
+                </div>
                 <div class="ub-content-box margin-bottom">
                     <div class="tw-p-3">
 

module/Blog/config.json

@@ -17,7 +17,7 @@
     "tags": [
         "博客"
     ],
-    "version": "3.4.0",
+    "version": "3.5.0",
     "author": "ModStart",
     "description": "提供一个基础的博客系统",
     "suggest": [

module/Vendor/Command/ScheduleRunAllCommand.php

@@ -40,7 +40,7 @@ function () use ($dir) {
             $start = TimeUtil::millitime();
             $command = "$php {$project['pathname']}/artisan schedule:run";
             Log::info("Vendor.ScheduleRunAllCommand.Run - {$command}");
-            $result = ShellUtil::run($command, false);
+            $result = ShellUtil::runInNewProcess($command, false);
             $result = str_replace([
                 "\r"
             ], "", $result);