From 8f19384582101ea61a8685d0ed5fb46d57c77915 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 12 Jul 2026 17:49:58 +0800 Subject: [PATCH] fix(homepage): align shell with zibll and restore post stream Move header-slider outside main, render fluid zones once, default the latest stream to plain posts by date, and cut dual-render/perf waste so published posts and hero/banner structure match the zibll contract. --- .../src/schema/sections/page-display/index.js | 10 +- .../css/frontend/header-components/base.css | 1 + footer.php | 10 +- header.php | 47 +++--- .../trait-aksrt-scripts-part-1b.php | 6 +- .../class-aksrt-settings-home-cms.php | 10 +- inc/helpers/aksrt-homepage.php | 155 ++++++++++++------ inc/helpers/aksrt-posts-renderer.php | 24 ++- inc/helpers/aksrt-template-tags.php | 29 ++++ .../parts/home-modules/module-banner.php | 20 ++- templates/parts/home-modules/module-hero.php | 14 +- 11 files changed, 223 insertions(+), 103 deletions(-) diff --git a/assets/admin/src/schema/sections/page-display/index.js b/assets/admin/src/schema/sections/page-display/index.js index ee095f94..0da1e5a1 100644 --- a/assets/admin/src/schema/sections/page-display/index.js +++ b/assets/admin/src/schema/sections/page-display/index.js @@ -931,13 +931,13 @@ export const pageDisplaySchemas = { icon: 'fas fa-home', description: '配置首页内容模型、主列表、分类 Tab、卡片样式与首页交互。实际编辑界面在 HomepageSettings.vue（customPage），此处补齐 page_display 的 schema 契约。', defaults: { - homepage_content_model: 'mixed', + homepage_content_model: 'post', homepage_tabs: [], homepage_card_style: 'default', - homepage_multi_thumb_enabled: true, + homepage_multi_thumb_enabled: false, homepage_multi_thumb_min_images: 3, homepage_sidebar_mini_enabled: true, - homepage_default_sort: 'modified', + homepage_default_sort: 'date', homepage_default_view: 'list', homepage_sort_ajax_enabled: true, homepage_sticky_tabs_enabled: true, @@ -961,7 +961,7 @@ export const pageDisplaySchemas = { key: 'homepage_content_model', label: '首页内容模型', type: 'radio', - default: 'mixed', + default: 'post', options: [ { label: '混合模式', value: 'mixed' }, { label: '纯文章', value: 'post' }, @@ -977,7 +977,7 @@ export const pageDisplaySchemas = { fields: [ { key: 'home_posts_list_s', label: '启用主列表', type: 'switch', default: true }, { key: 'index_list_title', label: '区块标题', type: 'input', default: '最新发布', dependsOn: { key: 'home_posts_list_s', value: true } }, - { key: 'home_list1_orderby_option.orderby', label: '默认排序', type: 'select', default: 'modified', dependsOn: { key: 'home_posts_list_s', value: true }, options: sortOptions }, + { key: 'home_list1_orderby_option.orderby', label: '默认排序', type: 'select', default: 'date', dependsOn: { key: 'home_posts_list_s', value: true }, options: sortOptions }, { key: 'home_list1_orderby_s', label: '启用排序栏', type: 'switch', default: true, dependsOn: { key: 'home_posts_list_s', value: true } }, { key: 'home_list_sort_dropdown', label: '排序栏下拉模式', type: 'switch', default: false, dependsOn: { key: 'home_list1_orderby_s', value: true } }, { key: 'home_list1_orderby_option', label: '可用排序选项', type: 'checkbox', default: ['modified', 'date', 'views', 'likes', 'comments'], dependsOn: { key: 'home_list1_orderby_s', value: true }, options: sortOptions }, diff --git a/assets/css/frontend/header-components/base.css b/assets/css/frontend/header-components/base.css index 1737d5fc..ce9807f7 100644 --- a/assets/css/frontend/header-components/base.css +++ b/assets/css/frontend/header-components/base.css @@ -195,6 +195,7 @@ /* ============================================================ * Container — 三层叠加的父容器 * ============================================================ */ +.header-slider-container, .header-components-container { position: relative; isolation: isolate; /* 创建独立堆叠上下文，内部 z-index 不外泄 */ diff --git a/footer.php b/footer.php index 4c38c4ea..0f6749c6 100644 --- a/footer.php +++ b/footer.php @@ -238,7 +238,15 @@ $render_link_url = function ($raw) { 0) : ?> 'count', 'order' => 'DESC', 'number' => $hot_cat_count, 'hide_empty' => true]); + $_hot_cache_key = 'aksrt_footer_hot_cats_' . (int) $hot_cat_count; + $_hot_cats = wp_cache_get($_hot_cache_key, 'aksrt'); + if (!is_array($_hot_cats)) { + $_hot_cats = get_categories(['orderby' => 'count', 'order' => 'DESC', 'number' => $hot_cat_count, 'hide_empty' => true]); + if (!is_array($_hot_cats)) { + $_hot_cats = []; + } + wp_cache_set($_hot_cache_key, $_hot_cats, 'aksrt', 12 * HOUR_IN_SECONDS); + } if (!empty($_hot_cats)) : ?>
diff --git a/header.php b/header.php index f440647f..ae728e0e 100644 --- a/header.php +++ b/header.php @@ -92,25 +92,9 @@ if (!empty($aksrt_bg_styles)) { - -
- -
- - - -
- -
- - - -
- -
- - can_submit()) ); + $aksrt_show_header_slide = function_exists('aksrt_header_slide_is_show') + ? aksrt_header_slide_is_show() + : false; + // Dual class contract: keep site-nav/* while aligning navbar/navbar-top with zibll. $aksrt_nav_classes = [ 'site-nav', + 'navbar', + 'navbar-top', 'site-nav--' . $aksrt_header_settings['nav_style'], $aksrt_header_settings['fixed'] ? 'site-nav--fixed' : 'site-nav--static', ]; @@ -203,14 +193,17 @@ if (!empty($aksrt_bg_styles)) { 'header-layout-' . $aksrt_header_settings['layout'], $aksrt_header_settings['fixed'] ? 'nav-fixed' : 'nav-static', ]; - if (!empty($aksrt_header_settings['scroll_down_hide'])) { + if ($aksrt_show_header_slide) { $aksrt_header_classes[] = 'show-slide'; } + if (!empty($aksrt_header_settings['scroll_down_hide']) && !empty($aksrt_header_settings['fixed'])) { + $aksrt_header_classes[] = 'scroll-down-hide'; + } ?>
- - - - + + + + + (+ mobile drawer), before page fluid/main. +if (function_exists('aksrt_header_slide')) { + aksrt_header_slide(); +} +?> diff --git a/inc/classes/scripts-traits/trait-aksrt-scripts-part-1b.php b/inc/classes/scripts-traits/trait-aksrt-scripts-part-1b.php index 27e330ee..d223bd33 100644 --- a/inc/classes/scripts-traits/trait-aksrt-scripts-part-1b.php +++ b/inc/classes/scripts-traits/trait-aksrt-scripts-part-1b.php @@ -644,8 +644,8 @@ trait AKSRT_Scripts_Part_1b { ); } - // CMS 首页模块系统：仅在首页 + cms 形态加载 - $is_cms_home = ($is_home_or_archive && $is_cms_mode) || $is_fixed_homepage; + // Legacy freeform CMS home modules: only for non-fixed CMS archive previews. + $is_cms_home = ($is_home_or_archive && $is_cms_mode) && !$is_fixed_homepage; // 管理员预览模式（?aksrt_preview=...）：无论站点风格都允许加载模块系统资源 $is_preview = is_user_logged_in() && current_user_can('manage_options') && isset($_GET['aksrt_preview']); @@ -665,6 +665,8 @@ trait AKSRT_Scripts_Part_1b { } if ($is_fixed_homepage) { + $enqueue_module('header-components'); // header-slider / hero + $enqueue_module('post-card'); $homepage_css_path = get_template_directory() . '/assets/css/frontend/homepage-fixed.css'; wp_enqueue_style( 'aksrt-homepage-fixed', diff --git a/inc/classes/settings/class-aksrt-settings-home-cms.php b/inc/classes/settings/class-aksrt-settings-home-cms.php index 3ae6ad9e..d5b22fe1 100644 --- a/inc/classes/settings/class-aksrt-settings-home-cms.php +++ b/inc/classes/settings/class-aksrt-settings-home-cms.php @@ -169,9 +169,9 @@ class AKSRT_Settings_Home_Cms { if (isset($s['home_list1_orderby_option']) && is_array($s['home_list1_orderby_option'])) { $orderby_option = $s['home_list1_orderby_option']; } - $default_sort = sanitize_key((string) ($orderby_option['orderby'] ?? $s['homepage_default_sort'] ?? 'modified')); + $default_sort = sanitize_key((string) ($orderby_option['orderby'] ?? $s['homepage_default_sort'] ?? 'date')); if (!in_array($default_sort, $allowed_sorts, true)) { - $default_sort = 'modified'; + $default_sort = 'date'; } $sort_options_raw = $orderby_option['options'] ?? $s['home_list_sort_options'] ?? []; if (!is_array($sort_options_raw)) { @@ -232,13 +232,13 @@ class AKSRT_Settings_Home_Cms { // AKSRT presentation extras. 'homepage_card_style' => isset($s['homepage_card_style']) ? sanitize_key((string) $s['homepage_card_style']) : 'default', - 'homepage_multi_thumb_enabled' => !isset($s['homepage_multi_thumb_enabled']) || !empty($s['homepage_multi_thumb_enabled']), + 'homepage_multi_thumb_enabled' => !empty($s['homepage_multi_thumb_enabled']), 'homepage_multi_thumb_min_images' => (int) ($s['homepage_multi_thumb_min_images'] ?? 3), 'homepage_sidebar_mini_enabled' => !isset($s['homepage_sidebar_mini_enabled']) || !empty($s['homepage_sidebar_mini_enabled']), 'homepage_default_view' => isset($s['homepage_default_view']) ? sanitize_key((string) $s['homepage_default_view']) : 'list', 'homepage_sort_ajax_enabled' => !isset($s['homepage_sort_ajax_enabled']) || !empty($s['homepage_sort_ajax_enabled']), 'homepage_sticky_tabs_enabled' => !isset($s['homepage_sticky_tabs_enabled']) || !empty($s['homepage_sticky_tabs_enabled']), - 'homepage_content_model' => isset($s['homepage_content_model']) && in_array($s['homepage_content_model'], ['post', 'mixed'], true) ? $s['homepage_content_model'] : 'mixed', + 'homepage_content_model' => isset($s['homepage_content_model']) && in_array($s['homepage_content_model'], ['post', 'mixed'], true) ? $s['homepage_content_model'] : 'post', 'home_list_sort_dropdown' => !empty($s['home_list_sort_dropdown']), 'homepage_tab_posts_per_page' => max(1, min(20, (int) ($s['homepage_tab_posts_per_page'] ?? 6))), 'homepage_tab_limit' => max(1, min(12, (int) ($s['homepage_tab_limit'] ?? 4))), @@ -296,7 +296,7 @@ class AKSRT_Settings_Home_Cms { public static function homepage_default_sort(): string { $settings = self::get_homepage_fixed_settings(); - return $settings['home_list1_orderby_option']['orderby'] ?? 'modified'; + return $settings['home_list1_orderby_option']['orderby'] ?? 'date'; } public static function homepage_default_view(): string { diff --git a/inc/helpers/aksrt-homepage.php b/inc/helpers/aksrt-homepage.php index 4f244a2d..50f51027 100644 --- a/inc/helpers/aksrt-homepage.php +++ b/inc/helpers/aksrt-homepage.php @@ -38,21 +38,18 @@ if (!function_exists('aksrt_homepage_get_post_types')) { * Homepage latest feed post types. * * Respects the homepage_content_model setting: - * - 'post': standard posts only - * - 'mixed': posts + resource CPTs (default for existing sites) + * - 'post': standard posts only (default) + * - 'mixed': posts + resource CPTs (explicit opt-in) * * @return string[] */ function aksrt_homepage_get_post_types(): array { + // Default: plain posts only (zibll main-query feel). Mixed/resource is opt-in. $content_model = class_exists('AKSRT_Settings') ? AKSRT_Settings::homepage_content_model() - : 'mixed'; + : 'post'; - if ($content_model === 'post') { - return ['post']; - } - - if (function_exists('aksrt_resource_post_types')) { + if ($content_model === 'mixed' && function_exists('aksrt_resource_post_types')) { return array_values(array_unique(aksrt_resource_post_types())); } @@ -206,7 +203,7 @@ if (!function_exists('aksrt_homepage_get_sort_mode')) { : ['modified', 'date', 'views', 'likes', 'comments', 'favorites', 'downloads', 'rand']; $default_sort = class_exists('AKSRT_Settings') ? AKSRT_Settings::homepage_default_sort() - : 'modified'; + : 'date'; $override_sort = get_query_var('aksrt_homepage_sort_override'); $sort = is_string($override_sort) && $override_sort !== '' ? sanitize_key($override_sort) @@ -253,30 +250,44 @@ if (!function_exists('aksrt_homepage_apply_sort_args')) { function aksrt_homepage_apply_sort_args(array $args): array { $sort_mode = aksrt_homepage_get_sort_mode(); + // Meta sorts: keep posts without the meta key via OR NOT EXISTS so lists never collapse empty. + $apply_meta_sort = static function (array $args, string $meta_key): array { + $args['meta_key'] = $meta_key; + $args['orderby'] = [ + 'meta_value_num' => 'DESC', + 'date' => 'DESC', + ]; + $args['meta_query'] = [ + 'relation' => 'OR', + [ + 'key' => $meta_key, + 'compare' => 'EXISTS', + ], + [ + 'key' => $meta_key, + 'compare' => 'NOT EXISTS', + ], + ]; + return $args; + }; + switch ($sort_mode) { - case 'date': - $args['orderby'] = 'date'; + case 'modified': + $args['orderby'] = 'modified'; $args['order'] = 'DESC'; break; case 'downloads': - $args['meta_key'] = '_aksrt_res_download_count'; - $args['orderby'] = 'meta_value_num'; - $args['order'] = 'DESC'; + $args = $apply_meta_sort($args, '_aksrt_res_download_count'); break; case 'views': - $args['meta_key'] = 'aksrt_post_views'; - $args['orderby'] = 'meta_value_num'; - $args['order'] = 'DESC'; + // Canonical public views key (align hotspot consumers later). + $args = $apply_meta_sort($args, 'aksrt_post_views'); break; case 'likes': - $args['meta_key'] = '_aksrt_like_count'; - $args['orderby'] = 'meta_value_num'; - $args['order'] = 'DESC'; + $args = $apply_meta_sort($args, '_aksrt_like_count'); break; case 'favorites': - $args['meta_key'] = '_aksrt_favorite_count'; - $args['orderby'] = 'meta_value_num'; - $args['order'] = 'DESC'; + $args = $apply_meta_sort($args, '_aksrt_favorite_count'); break; case 'comments': $args['orderby'] = 'comment_count'; @@ -286,9 +297,9 @@ if (!function_exists('aksrt_homepage_apply_sort_args')) { $args['orderby'] = 'rand'; unset($args['order']); break; - case 'modified': + case 'date': default: - $args['orderby'] = 'modified'; + $args['orderby'] = 'date'; $args['order'] = 'DESC'; break; } @@ -400,11 +411,12 @@ if (!function_exists('aksrt_homepage_get_latest_query')) { $query_args = [ 'post_type' => aksrt_homepage_get_post_types(), 'post_status' => 'publish', - 'posts_per_page' => (int) get_option('posts_per_page'), + 'posts_per_page' => max(1, (int) get_option('posts_per_page')), 'paged' => aksrt_homepage_get_current_page(), 'ignore_sticky_posts' => false, 'orderby' => 'date', 'order' => 'DESC', + 'no_found_rows' => false, ]; $exclude_ids = class_exists('AKSRT_Settings') @@ -758,7 +770,8 @@ if (!function_exists('aksrt_homepage_render_posts_grid')) { $query = $query instanceof WP_Query ? $query : aksrt_homepage_get_latest_query(); if (function_exists('aksrt_render_post_list')) { - aksrt_render_post_list($query, ['mode' => 'list', 'context' => 'home'], true); + // Panel already provides posts-row.ajaxpager; avoid nested wrapper. + aksrt_render_post_list($query, ['mode' => 'list', 'context' => 'home', 'skip_wrapper' => true], true); } else { if (!$query->have_posts()) { echo '

' . esc_html__('暂无文章', 'aksrt') . '

'; @@ -798,9 +811,51 @@ if (!function_exists('aksrt_homepage_render_section')) { } } +if (!function_exists('aksrt_header_slide_is_show')) { + /** + * Whether the header multi-function slider should render (zibll header-slider contract). + */ + function aksrt_header_slide_is_show(): bool { + if (is_admin()) { + return false; + } + + // Match zibll: only first page of the posts index / front page. + if (!(is_front_page() || is_home())) { + return false; + } + + if (function_exists('aksrt_homepage_get_current_page') && aksrt_homepage_get_current_page() > 1) { + return false; + } + + return function_exists('aksrt_homepage_module_hero_enabled') + ? aksrt_homepage_module_hero_enabled() + : true; + } +} + +if (!function_exists('aksrt_header_slide')) { + /** + * Render header slider after the site header (outside main). + */ + function aksrt_header_slide(): void { + if (!aksrt_header_slide_is_show()) { + return; + } + + // Reuse existing hero partial as the slider implementation. + get_template_part('templates/parts/home-modules/module', 'hero'); + } +} + if (!function_exists('aksrt_homepage_render_layout')) { /** * Render the fixed homepage layout (Zibll latest-first content stream). + * + * Order (zibll-aligned): + * fluid top → main.container → top content → banner → tabs/list → bottom content → sidebar + * → fluid bottom. Hero/header-slider is rendered from header.php, not here. */ function aksrt_homepage_render_layout(): void { $current_page = aksrt_homepage_get_current_page(); @@ -808,25 +863,19 @@ if (!function_exists('aksrt_homepage_render_layout')) { $tab_configs = $show_tabs ? aksrt_homepage_get_tab_configs() : []; $latest_contract = aksrt_homepage_get_latest_panel_contract(); $has_sidebar = aksrt_homepage_has_sidebar(); - $hero_on = $show_tabs && aksrt_homepage_module_hero_enabled(); $banner_on = $show_tabs && aksrt_homepage_module_banner_enabled(); $main_list_enabled = !class_exists('AKSRT_Settings') || AKSRT_Settings::home_posts_list_enabled(); $list_title = class_exists('AKSRT_Settings') ? AKSRT_Settings::home_list_title() : __('最新发布', 'aksrt'); + + // Fluid zones live outside
, once only (removed from header.php). + aksrt_homepage_render_widget_zone( + ['all_top_fluid', 'home_top_fluid'], + 'fluid-widget-wrap aksrt-homepage__fluid-zone aksrt-homepage__fluid-zone--top' + ); ?> -
- - +
@@ -845,7 +894,7 @@ if (!function_exists('aksrt_homepage_render_layout')) {
-
    +
+ +
+
+

+ + + +
+
- -
' - . '' . esc_attr($title) . ''; + . '' . esc_attr($title) . ''; } else { $img_html = '' . esc_attr($title) . ''; } @@ -542,7 +542,7 @@ if (!function_exists('aksrt_renderer_mult_thumb')) { $html .= ''; if (!empty($lazy['enabled'])) { $html .= '' - . ''; + . ''; } else { $html .= ''; } @@ -850,7 +850,7 @@ if (!function_exists('aksrt_renderer_mini')) { if ($cfg['show_thumb'] && !empty($data['has_img'])) { $lazy = $data['lazy']; $thumb_img = !empty($lazy['enabled']) && !empty($data['has_real_img']) - ? '' . esc_attr($data['title']) . '' + ? '' . esc_attr($data['title']) . '' : '' . esc_attr($data['title']) . ''; $thumb_html = '' . $thumb_img . ''; @@ -935,13 +935,17 @@ if (!function_exists('aksrt_render_post_list')) { } $data_view = in_array($cfg['mode'], ['card', 'grid-cms'], true) ? 'card' : $cfg['mode']; + // Homepage panel already provides .posts-row.ajaxpager — allow callers to skip nesting. + $skip_wrapper = !empty($config['skip_wrapper']); $html = ''; if ($query instanceof WP_Query) { if (!$query->have_posts()) { $html = '

' . esc_html__('暂无文章', 'aksrt') . '

'; } else { - $html .= '
'; + if (!$skip_wrapper) { + $html .= '
'; + } $number = $cfg['number_offset']; while ($query->have_posts()) { $query->the_post(); @@ -952,19 +956,25 @@ if (!function_exists('aksrt_render_post_list')) { } $html .= aksrt_render_post($cfg); } - $html .= '
'; + if (!$skip_wrapper) { + $html .= '
'; + } } wp_reset_postdata(); } else { if (!have_posts()) { $html = '

' . esc_html__('暂无文章', 'aksrt') . '

'; } else { - $html .= '
'; + if (!$skip_wrapper) { + $html .= '
'; + } while (have_posts()) { the_post(); $html .= aksrt_render_post($cfg); } - $html .= '
'; + if (!$skip_wrapper) { + $html .= '
'; + } } } diff --git a/inc/helpers/aksrt-template-tags.php b/inc/helpers/aksrt-template-tags.php index 0e1025b5..434a9edd 100644 --- a/inc/helpers/aksrt-template-tags.php +++ b/inc/helpers/aksrt-template-tags.php @@ -116,6 +116,12 @@ if (!function_exists('aksrt_get_banners')): */ function aksrt_get_banners($limit = 8, $kind = 'hero') { $kind = in_array($kind, array('hero', 'banner'), true) ? $kind : 'hero'; + $limit = max(1, min(20, (int) $limit)); + $cache_key = 'aksrt_banners_' . $kind . '_' . $limit; + $cached = wp_cache_get($cache_key, 'aksrt'); + if (is_array($cached)) { + return $cached; + } $args = array( 'post_type' => 'aksrt_banner', @@ -123,6 +129,7 @@ function aksrt_get_banners($limit = 8, $kind = 'hero') { 'post_status' => 'publish', 'orderby' => 'menu_order', 'order' => 'ASC', + 'no_found_rows' => true, 'meta_query' => 'hero' === $kind ? array( 'relation' => 'OR', @@ -179,6 +186,7 @@ function aksrt_get_banners($limit = 8, $kind = 'hero') { wp_reset_postdata(); } + wp_cache_set($cache_key, $banners, 'aksrt', 15 * MINUTE_IN_SECONDS); return $banners; } endif; @@ -1515,3 +1523,24 @@ function aksrt_user_can(string $cap, int $user_id = 0, ?int $context = null): bo return AKSRT_Settings::user_can($cap, $user_id, $context); } endif; + + +if (!function_exists('aksrt_flush_banner_cache')) : +/** + * Invalidate banner CPT object-cache keys used by aksrt_get_banners(). + */ +function aksrt_flush_banner_cache($post_id = 0) { + if ($post_id && get_post_type($post_id) && get_post_type($post_id) !== 'aksrt_banner') { + return; + } + // Group flush is not available on all object caches; delete common keys. + foreach (array('hero', 'banner') as $kind) { + for ($n = 1; $n <= 20; $n++) { + wp_cache_delete('aksrt_banners_' . $kind . '_' . $n, 'aksrt'); + } + } +} +add_action('save_post_aksrt_banner', 'aksrt_flush_banner_cache'); +add_action('deleted_post', 'aksrt_flush_banner_cache'); +add_action('trashed_post', 'aksrt_flush_banner_cache'); +endif; diff --git a/templates/parts/home-modules/module-banner.php b/templates/parts/home-modules/module-banner.php index 2a94a2c5..1f0d1727 100644 --- a/templates/parts/home-modules/module-banner.php +++ b/templates/parts/home-modules/module-banner.php @@ -21,7 +21,19 @@ if (class_exists('AKSRT_Settings') && !AKSRT_Settings::homepage_module_banner_en } $banners = function_exists('aksrt_get_banners') ? aksrt_get_banners(8, 'banner') : []; -if (empty($banners)) return; +if (empty($banners)) { + if (current_user_can('manage_options')) { + echo '
'; + echo '

' . esc_html__('No Banner slides found. Add banner slides in admin.', 'aksrt') . '

'; + if (function_exists('aksrt_render_admin_quick_link')) { + echo '
'; + aksrt_render_admin_quick_link('page-display/header-components', __('Header / Banner settings', 'aksrt')); + echo '
'; + } + echo '
'; + } + return; +} $cfg = get_query_var('aksrt_module_config', []); if (!is_array($cfg)) $cfg = []; @@ -41,9 +53,9 @@ $swiper_config = [ 'spaceBetween' => ($slider_cfg['space_between'] ?? 0), ]; ?> -
-