feat: 博客标签数量侧边栏显示数量限制可设置

Author: modstart

env.example

@@ -1,6 +1,7 @@
 APP_ENV=beta
 APP_DEBUG=true
-APP_KEY=4LmYVxyQ0twIjPtNguwEgxDN68oEhBYH
+APP_KEY=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ENCRYPT_KEY=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 
 DB_HOST=localhost
 DB_PORT=3306

module/Blog/Admin/Controller/ConfigController.php

@@ -37,6 +37,7 @@ public function index(AdminConfigBuilder $builder)
                     })
                     ->defaultValue(BlogDarkModeType::AUTO);
             });
+        $builder->number('Blog_PanelTagLimit', '侧边栏标签数量')->help('0为不限制')->defaultValue(0);
         $builder->formClass('wide');
         return $builder->perform();
     }

module/Blog/Core/MBlog.php

@@ -563,16 +563,21 @@ public static function getCategory($categoryId)
 
     /**
      * @Util 获取所有博客标签信息
+     * @param $limit int 限制数量，0为不限制
      * @return array 数组，标签→数量映射
      * @returnExample
      * {
      *   "标签1": 1,
      *   "标签2": 2
      * }
      */
-    public static function tags()
+    public static function tags($limit = 0)
     {
-        return BlogTagUtil::all();
+        $records = BlogTagUtil::all();
+        if ($limit > 0) {
+            $records = array_slice($records, 0, $limit);
+        }
+        return $records;
     }
 
     /**

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

@@ -1,11 +1,18 @@
 <div class="ub-content-box margin-bottom">
     <div class="tw-p-3">
-        <div class="tw-text-lg">
-            <i class="iconfont icon-tag"></i>
-            标签
+        <div class="tw-flex">
+            <div class="tw-text-lg tw-flex-grow">
+                <i class="iconfont icon-tag"></i>
+                标签
+            </div>
+            <div>
+                <a href="{{modstart_web_url('blog/tags')}}" class="ub-text-muted">
+                    全部
+                </a>
+            </div>
         </div>
         <div class="tw-mt-4 tw-flex tw-flex-wrap">
-            @foreach(MBlog::tags() as $t=>$c)
+            @foreach(MBlog::tags(modstart_config('Blog_PanelTagLimit',0)) as $t=>$c)
                 <a href="{{modstart_web_url('blogs',['keywords'=>$t])}}"
                    class="hover:tw-shadow ub-content-block tw-block tw-leading-5 tw-mb-2 tw-mr-2 tw-px-2 tw-py-1 tw-rounded-3xl @if(!empty($keywords)&&$keywords==$t) ub-bg-primary @endif">
                     {{$t}}

module/Vendor/Web/Controller/InstallController.php

@@ -110,13 +110,15 @@ public function prepare()
         // 替换.env文件
         $envContent = file_get_contents(base_path('env.example'));
 
+        $envContent = preg_replace("/APP_DEBUG=(.*?)\\n/", "APP_DEBUG=false\n", $envContent);
         $envContent = preg_replace("/DB_HOST=(.*?)\\n/", "DB_HOST=" . $dbHost . "\n", $envContent);
         $envContent = preg_replace("/DB_PORT=(.*?)\\n/", "DB_PORT=" . $dbPort . "\n", $envContent);
         $envContent = preg_replace("/DB_DATABASE=(.*?)\\n/", "DB_DATABASE=" . $dbDatabase . "\n", $envContent);
         $envContent = preg_replace("/DB_USERNAME=(.*?)\\n/", "DB_USERNAME=" . $dbUsername . "\n", $envContent);
         $envContent = preg_replace("/DB_PASSWORD=(.*?)\\n/", "DB_PASSWORD=" . $dbPassword . "\n", $envContent);
         $envContent = preg_replace("/DB_PREFIX=(.*?)\\n/", "DB_PREFIX=" . $dbPrefix . "\n", $envContent);
         $envContent = preg_replace("/APP_KEY=(.*?)\\n/", "APP_KEY=" . RandomUtil::string(32) . "\n", $envContent);
+        $envContent = preg_replace("/ENCRYPT_KEY=(.*?)\\n/", "ENCRYPT_KEY=" . RandomUtil::string(32) . "\n", $envContent);
         if (!empty($installConfig['envs'])) {
             foreach ($installConfig['envs'] as $envField) {
                 $envContent = preg_replace(

public/asset/common/admin.js

@@ -232,4 +232,5 @@
     'Examples' => '例子',
     'Under Development' => '开发中',
     'Price' => '价格',
+    '%s is default, please change it' => '%s 为默认值，请修改',
 ];

public/asset/common/editor.js

@@ -1,3 +1,4 @@
+window._rootWindow = MS.util.getRootWindow();
 window._pageTabManager = {
     closeFromTab: function () {
         if (window == parent.window) {
@@ -16,6 +17,25 @@ window._pageTabManager = {
         var tabPageId = window.frameElement.getAttribute("data-tab-page")
         window.parent._pageTabManager.updateTitle(tabPageId, title)
     },
+    activeUrl: function (url) {
+        var $menu = _rootWindow.$('.ub-panel-frame .left .menu');
+        var normalUrl = _rootWindow._pageTabManager.normalTabUrl(url);
+        $menu.find('a').each(function (i, o) {
+            var url = $(o).attr('href');
+            if (url === 'javascript:;') {
+                return;
+            }
+            if (_rootWindow._pageTabManager.normalTabUrl(url) === normalUrl) {
+                $(o).parents('.children').prev().addClass('open');
+                $menu.find('.menu-item').removeClass('active');
+                $(o).closest('.menu-item').addClass('active');
+                try {
+                    o.scrollIntoView({block: 'center', behavior: 'smooth'});
+                } catch (e) {
+                }
+            }
+        });
+    }
 };
 
 $(window).on('load', function () {
@@ -52,6 +72,13 @@ $(window).on('load', function () {
         });
     }
 
+    // 后台Logo
+    var $logo = $frame.find('.left .logo');
+    $logo.on('click', function () {
+        $($menu.find('a')[0]).click();
+        return false;
+    });
+
     // 后台菜单搜索
     var $menu = $frame.find('.left .menu');
     var markText = function (str, indexs) {
@@ -291,6 +318,8 @@ $(window).on('load', function () {
                 }
 
                 this.updateMainPage()
+
+
             },
             open: function (url, title, option) {
                 option = Object.assign({
@@ -372,16 +401,15 @@ $(window).on('load', function () {
             if (!title) {
                 title = $(this).text();
             }
-            if (window.parent !== window) {
-                window.parent._pageTabManager.open(url, title)
-            } else {
-                tabManager.open(url, title)
-            }
+            _rootWindow._pageTabManager.open(url, title, {
+                focus: function () {
+                    tabManager.activeUrl(url);
+                }
+            });
             return false;
         });
         window._pageTabManager = tabManager
     } else {
-        // console.log('page-tabs-disabled')
         $adminTabRefresh.remove();
     }
 

public/asset/common/photoswipe.js

@@ -69,14 +69,14 @@
                     <div class="action">
                         <a v-if="permission['Delete']"
                            href="javascript:;" :title="L('Delete')"
-                           :class="{active:listChecked.length>0}"
+                           :class="{active:activeFileOperate}"
                            @click="doFileDelete">
                             <i class="iconfont icon-trash"></i>
                             {{ L('Delete') }}
                         </a>
                         <a v-if="permission['Add/Edit']"
                            href="javascript:;" :title="L('Edit')"
-                           :class="{active:listChecked.length>0}"
+                           :class="{active:activeFileOperate}"
                            @click="doFileEdit">
                             <i class="iconfont icon-sign"></i>
                             {{ L('Edit') }}
@@ -284,20 +284,22 @@ export default {
     watch: {
         categoryFilter(val) {
             this.$refs.$categoryTreeAll.filter(val)
-        }
+        },
     },
     computed: {
         apiUrl() {
             return this.url + '/' + this.category
         },
         listChecked() {
-            return this.records.filter(o => o.checked
-            )
+            return this.records.filter(o => o.checked)
         },
         listCheckedIds() {
             return this.listChecked.map(o => o.id
             )
-        }
+        },
+        activeFileOperate() {
+            return this.listChecked.length > 0 && this.listChecked.filter(f => f.id > 0).length === this.listChecked.length
+        },
     },
     mounted() {
         if ('flat' === this.mode) {
@@ -340,6 +342,9 @@ export default {
             Dialog.tipError(this.L('Select %d item(s) at most', this.max))
         },
         doFileEdit() {
+            if (!this.activeFileOperate) {
+                return
+            }
             this.fileEdit.categoryId = this.currentCategoryId
             this.fileVisible = true
         },
@@ -362,13 +367,12 @@ export default {
             })
         },
         doFileDelete() {
-            const ids = this.listCheckedIds;
-            if (ids.length === 0) {
+            if (!this.activeFileOperate || !this.listCheckedIds.length) {
                 return;
             }
             Dialog.confirm(this.L('Confirm Delete ?'), () => {
                 Dialog.loadingOn()
-                this.$api.post(this.apiUrl, JsonUtil.extend({id: ids.join(',')}, {action: 'fileDelete'}), res => {
+                this.$api.post(this.apiUrl, JsonUtil.extend({id: this.listCheckedIds.join(',')}, {action: 'fileDelete'}), res => {
                     Dialog.loadingOff()
                     Dialog.tipSuccess(this.L('Delete Success'))
                     this.doList(1)