fix(header): wire multi-function page-type enable like zibll

Connect header_components_show_on through aksrt_header_slide_is_show with zibll page-type matching, drop the homepage-only gate, align admin options, apply nav color, enqueue by is_show, remove dead float-btn schema, and consume footer_tabbar_single extend mode on post singles.
2026-07-15 17:12:51 +08:00
parent 3e3a4631f0
commit bfb64211ee
12 changed files with 445 additions and 285 deletions
@@ -78,13 +78,16 @@ class AKSRT_Admin_Schema_Page_Display {
                            ['key' => 'header_components_cards_enabled', 'label' => '启用图标卡片', 'type' => 'switch', 'default' => false],
                            ['key' => 'header_components_show_on', 'label' => '按页面类型启用', 'type' => 'checkbox', 'default' => ['home'], 'options' => [
                                ['label' => '首页', 'value' => 'home'],
-                                ['label' => '文章', 'value' => 'single'],
-                                ['label' => '页面', 'value' => 'page'],
-                                ['label' => '分类', 'value' => 'category'],
-                                ['label' => '标签', 'value' => 'tag'],
-                                ['label' => '搜索', 'value' => 'search'],
-                                ['label' => '归档', 'value' => 'archive'],
-                                ['label' => '专题', 'value' => 'special'],
+                                ['label' => '专题页', 'value' => 'topics'],
+                                ['label' => '分类页', 'value' => 'category'],
+                                ['label' => '标签页', 'value' => 'tag'],
+                                ['label' => '用户页', 'value' => 'author'],
+                                ['label' => '文章页', 'value' => 'single'],
+                                ['label' => '搜索页', 'value' => 'search'],
+                                ['label' => '[论坛]首页', 'value' => 'forum_home'],
+                                ['label' => '[论坛]板块页面', 'value' => 'forum_plate'],
+                                ['label' => '[论坛]帖子页面', 'value' => 'forum_post'],
+                                ['label' => '其它页面', 'value' => 'page'],
                            ]],
                            ['key' => 'header_components_device_visibility', 'label' => '设备显示规则', 'type' => 'radio', 'default' => '', 'options' => [
                                ['label' => '全部', 'value' => ''],
@@ -494,37 +497,6 @@ class AKSRT_Admin_Schema_Page_Display {
                        ]],
                    ],
                ],
-                'float-btn' => [
-                    'key'        => 'float-btn',
-                    'title'      => '悬浮按钮',
-                    'version'    => '1.1.0',
-                    'option_key' => 'aksrt_settings',
-                    'groups'     => [
-                        ['key' => 'basic', 'title' => '悬浮按钮设置', 'fields' => [
-                            ['key' => 'float_btn_style', 'label' => '按钮风格', 'type' => 'radio', 'default' => 'round', 'options' => [
-                                ['label' => '圆形', 'value' => 'round'],
-                                ['label' => '方形', 'value' => 'square'],
-                            ]],
-                            ['key' => 'float_btn_position', 'label' => '按钮位置', 'type' => 'radio', 'default' => 'bottom', 'options' => [
-                                ['label' => '底部', 'value' => 'bottom'],
-                                ['label' => '居中', 'value' => 'center'],
-                            ]],
-                            ['key' => 'float_btn_scroll_hide', 'label' => '滚动时隐藏', 'type' => 'switch', 'default' => false],
-                            ['key' => 'float_btn_scroll_down_hide', 'label' => '下滑时隐藏', 'type' => 'switch', 'default' => true],
-                            ['key' => 'float_btn_max', 'label' => '最大显示数', 'type' => 'number', 'default' => 5, 'min' => 1, 'max' => 10],
-                            ['key' => 'float_btn_size', 'label' => '按钮尺寸', 'type' => 'number', 'default' => 44, 'min' => 32, 'max' => 64],
-                            ['key' => 'float_btn_spacing', 'label' => '按钮间距', 'type' => 'number', 'default' => 10, 'min' => 4, 'max' => 24],
-                            ['key' => 'float_btn_shadow', 'label' => '显示阴影', 'type' => 'switch', 'default' => true],
-                            ['key' => 'float_btn_animation', 'label' => '悬停动画', 'type' => 'switch', 'default' => true],
-                            ['key' => 'float_btn_opacity', 'label' => '按钮透明度', 'type' => 'number', 'default' => 100, 'min' => 30, 'max' => 100],
-                            ['key' => 'float_btn_active_color', 'label' => '激活颜色', 'type' => 'color', 'default' => ''],
-                            ['key' => 'float_btn_bg_color', 'label' => '背景颜色', 'type' => 'color', 'default' => ''],
-                            ['key' => 'float_btn_pc_s', 'label' => 'PC端显示', 'type' => 'switch', 'default' => true],
-                            ['key' => 'float_btn_m_s', 'label' => '移动端显示', 'type' => 'switch', 'default' => true],
-                            ['key' => 'float_btn_filter_css', 'label' => '过滤CSS', 'type' => 'textarea', 'default' => ''],
-                        ]],
-                    ],
-                ],
            ],
        ];
    }
@@ -177,15 +177,19 @@ trait AKSRT_Scripts_Part_1b {

        // CMS 形态判定（可能在博客流页面也需要 grid-cms 卡片样式）
        $is_cms_mode = function_exists('aksrt_is_cms_mode') ? aksrt_is_cms_mode() : false;
-        // 首页/归档/搜索：卡片 + 顶部多功能组件 + 侧栏
+        // 首页/归档/搜索：卡片 + 侧栏
        if ($is_home_or_archive) {
-            $enqueue_module('header-components');
            $enqueue_module('post-card');
            $enqueue_module('widgets');
            $enqueue_module('sidebar');
            $enqueue_module('breadcrumb');
        }

+        // 顶部多功能组件：按 page-type 启用结果入队（对齐 zibll，不绑死首页）
+        if (function_exists('aksrt_header_slide_is_show') && aksrt_header_slide_is_show()) {
+            $enqueue_module('header-components');
+        }
+
        // 单篇文章：所有 single 相关样式
        if ($is_single_post) {
            $enqueue_module('single-post');
@@ -51,7 +51,24 @@ trait AKSRT_Settings_Display_Page_Groups {
     */
    public static function get_header_components_settings(): array {
        $s = self::get_all();
+        $allowed_page_types = [
+            'home',
+            'topics',
+            'category',
+            'tag',
+            'author',
+            'single',
+            'search',
+            'forum_home',
+            'forum_plate',
+            'forum_post',
+            'page',
+        ];
        $show_on = isset($s['header_components_show_on']) ? (array) $s['header_components_show_on'] : ['home'];
+        $show_on = array_values(array_intersect(
+            array_map('sanitize_key', $show_on),
+            $allowed_page_types
+        ));
        $show_type = $s['header_components_device_visibility'] ?? '';
        if (!in_array($show_type, ['', 'only_pc', 'only_sm'], true)) {
            $show_type = '';
@@ -60,7 +77,7 @@ trait AKSRT_Settings_Display_Page_Groups {
            'search_enabled'  => self::header_components_search_enabled(),
            'search_config'   => self::get_header_components_search_config(),
            'cards_enabled'   => self::header_components_cards_enabled(),
-            'show_on_pages'   => array_values(array_filter(array_map('sanitize_key', $show_on))),
+            'show_on_pages'   => $show_on,
            'show_type'       => $show_type,
            'filter_blur'     => isset($s['header_components_filter_blur_devices']) ? array_values(array_intersect(array_map('sanitize_key', (array) $s['header_components_filter_blur_devices']), ['pc', 'mobile'])) : [],
            'card_show'       => isset($s['header_components_card_show_devices']) ? array_values(array_intersect(array_map('sanitize_key', (array) $s['header_components_card_show_devices']), ['pc', 'mobile'])) : ['pc', 'mobile'],