feat(shop): product list widget AJAX pager 1:1 with zibll

Expose REST /shop/frontend/widgets/products, shared query_payload,
ajax-list load-more markup, and product widget styles.

src/AKSRT/Admin/ShopController.php

@@ -379,6 +379,13 @@ class ShopController extends ControllerBase {
             'permission_callback' => '__return_true',
         ]);
 
+        // Product list widget AJAX (zibll ajax_widget_ui product lists).
+        register_rest_route(self::API_NAMESPACE, '/shop/frontend/widgets/products', [
+            'methods'             => 'GET',
+            'callback'            => [$this, 'get_frontend_widget_products'],
+            'permission_callback' => '__return_true',
+        ]);
+
         register_rest_route(self::API_NAMESPACE, '/shop/frontend/revenue', [
             'methods'             => 'GET',
             'callback'            => [$this, 'get_frontend_revenue'],

src/AKSRT/Admin/ShopControllerFrontendFlowOperations.php

@@ -509,6 +509,40 @@ trait ShopControllerFrontendFlowOperations {
         ]);
     }
 
+    /**
+     * GET /shop/frontend/widgets/products — product list widget AJAX pager.
+     */
+    public function get_frontend_widget_products(\WP_REST_Request $request): \WP_REST_Response {
+        if (!class_exists('\AKSRT\Widgets\WidgetProductList')) {
+            return $this->error('商品组件不可用', 500);
+        }
+
+        $instance = [
+            'per_page'     => max(1, min(50, (int) ($request->get_param('per_page') ?? 8))),
+            'orderby'      => sanitize_key((string) ($request->get_param('orderby') ?? 'date')),
+            'order'        => sanitize_key((string) ($request->get_param('order') ?? 'DESC')),
+            'cat_ids'      => sanitize_text_field((string) ($request->get_param('cat_ids') ?? '')),
+            'tag_ids'      => sanitize_text_field((string) ($request->get_param('tag_ids') ?? '')),
+            'discount_ids' => sanitize_text_field((string) ($request->get_param('discount_ids') ?? '')),
+            'exclude_cat'  => !empty($request->get_param('exclude_cat')) ? 1 : 0,
+            'style'        => sanitize_key((string) ($request->get_param('style') ?? 'default')),
+            'paginate'     => sanitize_key((string) ($request->get_param('paginate') ?? 'ajax')),
+        ];
+        $page = max(1, (int) ($request->get_param('page') ?? $request->get_param('paged') ?? 1));
+        $payload = \AKSRT\Widgets\WidgetProductList::query_payload($instance, $page);
+
+        return $this->success([
+            'data' => [
+                'html'          => (string) ($payload['html'] ?? ''),
+                'paginate_html' => (string) ($payload['paginate_html'] ?? ''),
+                'has_more'      => !empty($payload['has_more']),
+                'page'          => (int) ($payload['page'] ?? $page),
+                'max_pages'     => (int) ($payload['max_pages'] ?? 1),
+                'total'         => (int) ($payload['total'] ?? 0),
+            ],
+        ]);
+    }
+
     /**
      * Render cat filter bar HTML for AJAX header replace.
      */

src/AKSRT/Widgets/WidgetProductList.php

@@ -8,22 +8,10 @@ namespace AKSRT\Widgets;
 defined('ABSPATH') || exit;
 
 /**
- * Shop product widgets (§6.9)
+ * Shop product list widget — zibll `zib_shop_widget_ui_product_lists` lite.
- *
- * - WidgetProductList: product list widget (filter/sort/paginate/AJAX)
- * - WidgetProductOneline: horizontal swiper product widget
- * - WidgetProductTab: multi-tab product list widget
- *
- * @package AKSRT
- */
-
-defined('ABSPATH') || exit;
-
-/**
- * Product list widget — equivalent to zibll `zib_shop_widget_ui_product_lists`.
  *
  * Supports: include/exclude category, discount, tag; sort order; list style;
- * AJAX pagination; per-page count.
+ * AJAX load-more (via rest widget list endpoint); per-page count.
  */
 class WidgetProductList extends \WP_Widget {
 
@@ -35,32 +23,40 @@ class WidgetProductList extends \WP_Widget {
 		);
 	}
 
-    public function widget($args, $instance): void {
+	/**
-        $title   = apply_filters('widget_title', $instance['title'] ?? '');
+	 * Build WP_Query args from instance + page.
+	 *
+	 * @param array $instance
+	 * @param int   $paged
+	 * @return array
+	 */
+	public static function build_query_args(array $instance, int $paged = 1): array {
 		$per_page = max(1, min(50, (int) ($instance['per_page'] ?? 8)));
 		$orderby  = sanitize_key($instance['orderby'] ?? 'date');
-        $order    = in_array(strtoupper($instance['order'] ?? ''), ['ASC', 'DESC'], true) ? strtoupper($instance['order']) : 'DESC';
+		$order    = in_array(strtoupper((string) ($instance['order'] ?? '')), ['ASC', 'DESC'], true)
-        $cat_ids  = array_filter(array_map('intval', explode(',', (string) ($instance['cat_ids'] ?? ''))));
+			? strtoupper((string) $instance['order'])
-        $tag_ids  = array_filter(array_map('intval', explode(',', (string) ($instance['tag_ids'] ?? ''))));
+			: 'DESC';
-        $discount_ids = array_filter(array_map('intval', explode(',', (string) ($instance['discount_ids'] ?? ''))));
+		$cat_ids  = array_values(array_filter(array_map('intval', explode(',', (string) ($instance['cat_ids'] ?? '')))));
+		$tag_ids  = array_values(array_filter(array_map('intval', explode(',', (string) ($instance['tag_ids'] ?? '')))));
+		$discount_ids = array_values(array_filter(array_map('intval', explode(',', (string) ($instance['discount_ids'] ?? '')))));
 		$exclude_cat  = !empty($instance['exclude_cat']);
-        $style    = sanitize_key($instance['style'] ?? 'default');
-        $paged    = max(1, (int) ($_GET['aksrt_product_page'] ?? 1));
 
 		$query_args = [
 			'post_type'           => 'aksrt_product',
 			'post_status'         => 'publish',
 			'posts_per_page'      => $per_page,
-            'paged'          => $paged,
+			'paged'               => max(1, $paged),
-            'orderby'        => $orderby === 'sales' ? 'meta_value_num' : $orderby,
+			'orderby'             => $orderby === 'sales' ? 'meta_value_num' : ($orderby === 'views' ? 'meta_value_num' : $orderby),
 			'order'               => $order,
+			'ignore_sticky_posts' => true,
 		];
 
 		if ($orderby === 'sales') {
 			$query_args['meta_key'] = '_aksrt_sales';
+		} elseif ($orderby === 'views') {
+			$query_args['meta_key'] = 'aksrt_post_views';
 		}
 
-        // Taxonomy filters
 		$tax_query = [];
 		if (!empty($cat_ids)) {
 			$tax_query[] = [
@@ -87,29 +83,35 @@ class WidgetProductList extends \WP_Widget {
 		if (!empty($tax_query)) {
 			$query_args['tax_query'] = $tax_query;
 		}
-
+		return $query_args;
-        $products = new \WP_Query($query_args);
-
-        echo $args['before_widget'];
-        if ($title) {
-            echo $args['before_title'] . esc_html($title) . $args['after_title'];
 	}
 
-        $style_class = 'aksrt-product-widget--' . $style;
+	/**
-        echo '<div class="aksrt-product-widget ' . esc_attr($style_class) . '" data-aksrt-product-widget>';
+	 * Render product cards HTML for a query.
-
+	 */
-        if ($products->have_posts()) {
+	public static function render_items_html(\WP_Query $products, string $style = 'default'): string {
-            echo '<div class="aksrt-product-widget__grid">';
+		if (!$products->have_posts()) {
+			return '';
+		}
+		ob_start();
 		while ($products->have_posts()) {
 			$products->the_post();
 			$pid  = get_the_ID();
 			$card = class_exists('\AKSRT\Shop\Shop')
 				? \AKSRT\Shop\Shop::get_instance()->build_product_card_view($pid)
 				: [];
+			if (function_exists('get_template_part') && !empty($card['id'])) {
+				get_template_part('templates/parts/shop/product', 'card', [
+					'product'    => $card,
+					'show_sales' => true,
+				]);
+				continue;
+			}
+			// Fallback mini card.
 			$price = (float) ($card['price'] ?? 0);
-                $image = $card['image'] ?? '';
+			$image = (string) ($card['image'] ?? '');
-                echo '<div class="aksrt-product-widget__item">';
+			echo '<div class="aksrt-product-widget__item ajax-item">';
-                if ($image) {
+			if ($image !== '') {
 				echo '<a href="' . esc_url(get_permalink($pid)) . '" class="aksrt-product-widget__thumb">';
 				echo '<img src="' . esc_url($image) . '" alt="' . esc_attr(get_the_title($pid)) . '" loading="lazy">';
 				echo '</a>';
@@ -119,33 +121,124 @@ class WidgetProductList extends \WP_Widget {
 			echo '<div class="aksrt-product-widget__meta">';
 			echo '<span class="aksrt-product-widget__price">&yen;' . esc_html(number_format_i18n($price, 2)) . '</span>';
 			if (!empty($card['sales'])) {
-                    echo '<span class="aksrt-product-widget__sales">' . esc_html($card['sales']) . __(' 已售', 'aksrt') . '</span>';
+				echo '<span class="aksrt-product-widget__sales">' . esc_html((string) $card['sales']) . esc_html__(' 已售', 'aksrt') . '</span>';
 			}
 			echo '</div></div></div>';
 		}
-            echo '</div>';
+		wp_reset_postdata();
+		return (string) ob_get_clean();
+	}
 
-            // Pagination
+	/**
-            if ($products->max_num_pages > 1) {
+	 * Shared payload for REST widget list.
-                echo '<div class="aksrt-product-widget__pagination">';
+	 *
-                echo paginate_links([
+	 * @param array $instance
+	 * @param int   $page
+	 * @return array{html:string,paginate_html:string,has_more:bool,page:int,max_pages:int,total:int}
+	 */
+	public static function query_payload(array $instance, int $page = 1): array {
+		$page    = max(1, $page);
+		$args    = self::build_query_args($instance, $page);
+		$style   = sanitize_key((string) ($instance['style'] ?? 'default'));
+		$paginate = sanitize_key((string) ($instance['paginate'] ?? 'ajax'));
+		$products = new \WP_Query($args);
+		$html     = self::render_items_html($products, $style);
+		if ($html === '' && $page === 1) {
+			$html = function_exists('aksrt_get_ajax_null')
+				? aksrt_get_ajax_null(__('暂无商品', 'aksrt'))
+				: '<p class="aksrt-product-widget__empty ajax-item">' . esc_html__('暂无商品', 'aksrt') . '</p>';
+		}
+		$max_pages = max(1, (int) $products->max_num_pages);
+		$total     = (int) $products->found_posts;
+		$has_more  = $page < $max_pages;
+		$paginate_html = '';
+		if ($paginate === 'ajax' && $has_more) {
+			$next = add_query_arg(
+				array_filter([
+					'page'         => $page + 1,
+					'per_page'     => max(1, (int) ($instance['per_page'] ?? 8)),
+					'orderby'      => sanitize_key((string) ($instance['orderby'] ?? 'date')),
+					'order'        => sanitize_key((string) ($instance['order'] ?? 'DESC')),
+					'cat_ids'      => (string) ($instance['cat_ids'] ?? ''),
+					'tag_ids'      => (string) ($instance['tag_ids'] ?? ''),
+					'discount_ids' => (string) ($instance['discount_ids'] ?? ''),
+					'exclude_cat'  => !empty($instance['exclude_cat']) ? 1 : 0,
+					'style'        => sanitize_key((string) ($instance['style'] ?? 'default')),
+					'paginate'     => 'ajax',
+				], static function ($v) {
+					return $v !== '' && $v !== null;
+				}),
+				rest_url('aksrt/v1/shop/frontend/widgets/products')
+			);
+			if (function_exists('aksrt_get_ajax_next_paginate')) {
+				$paginate_html = aksrt_get_ajax_next_paginate(
+					$total,
+					$page,
+					max(1, (int) ($instance['per_page'] ?? 8)),
+					$next
+				);
+			} else {
+				$paginate_html = '<div class="text-center theme-pagination ajax-pag"><div class="next-page ajax-next"><a href="' . esc_url($next) . '">' . esc_html__('加载更多', 'aksrt') . '</a></div></div>';
+			}
+		} elseif ($paginate === 'number' && $max_pages > 1) {
+			$paginate_html = '<div class="aksrt-product-widget__pagination">' . paginate_links([
 				'base'      => add_query_arg('aksrt_product_page', '%#%'),
 				'format'    => '',
-                    'current' => $paged,
+				'current'   => $page,
-                    'total'   => $products->max_num_pages,
+				'total'     => $max_pages,
 				'prev_text' => '&laquo;',
 				'next_text' => '&raquo;',
-                ]);
+			]) . '</div>';
-                echo '</div>';
-            }
 		} else {
-            echo '<p class="aksrt-product-widget__empty">' . esc_html__('暂无商品', 'aksrt') . '</p>';
+			$paginate_html = '<div class="ajax-pag hide"><div class="next-page ajax-next"><a href="#"></a></div></div>';
 		}
 
-        echo '</div>';
+		return [
-        echo $args['after_widget'];
+			'html'          => $html,
+			'paginate_html' => $paginate_html,
+			'has_more'      => $has_more,
+			'page'          => $page,
+			'max_pages'     => $max_pages,
+			'total'         => $total,
+		];
+	}
 
-        wp_reset_postdata();
+	public function widget($args, $instance): void {
+		$title    = apply_filters('widget_title', (string) ($instance['title'] ?? ''), $instance, $this->id_base);
+		$style    = sanitize_key((string) ($instance['style'] ?? 'default'));
+		$paginate = sanitize_key((string) ($instance['paginate'] ?? 'ajax'));
+		$page     = max(1, (int) ($_GET['aksrt_product_page'] ?? 1)); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+
+		$cfg = [
+			'per_page'     => max(1, min(50, (int) ($instance['per_page'] ?? 8))),
+			'orderby'      => sanitize_key((string) ($instance['orderby'] ?? 'date')),
+			'order'        => in_array(strtoupper((string) ($instance['order'] ?? '')), ['ASC', 'DESC'], true) ? strtoupper((string) $instance['order']) : 'DESC',
+			'cat_ids'      => (string) ($instance['cat_ids'] ?? ''),
+			'tag_ids'      => (string) ($instance['tag_ids'] ?? ''),
+			'discount_ids' => (string) ($instance['discount_ids'] ?? ''),
+			'exclude_cat'  => !empty($instance['exclude_cat']) ? 1 : 0,
+			'style'        => $style,
+			'paginate'     => $paginate,
+		];
+
+		$payload = self::query_payload($instance, $page);
+		$ajax_url = rest_url('aksrt/v1/shop/frontend/widgets/products');
+
+		echo $args['before_widget']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+		if ($title !== '') {
+			echo $args['before_title'] . esc_html($title) . $args['after_title']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+		}
+
+		$style_class = 'aksrt-product-widget--' . $style;
+		echo '<div class="aksrt-product-widget ' . esc_attr($style_class) . '" data-aksrt-product-widget data-aksrt-product-config="' . esc_attr(wp_json_encode($cfg)) . '">';
+		// Items sit directly under .ajaxpager so ajax-list inject/append works (zibll product-lists-row).
+		echo '<div class="ajaxpager aksrt-product-widget__grid product-lists-row" data-aksrt-ajaxpager data-aksrt-ajax-url="' . esc_url($ajax_url) . '">';
+		echo $payload['html']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped — cards escaped upstream
+		echo $payload['paginate_html']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+		echo '<div class="post_ajax_loader" data-aksrt-ajax-loader data-aksrt-ajax-loader-hide hidden></div>';
+		echo '</div></div>';
+
+		echo $args['after_widget']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 	}
 
 	public function form($instance): void {
@@ -159,12 +252,13 @@ class WidgetProductList extends \WP_Widget {
 			'discount_ids' => '',
 			'exclude_cat'  => false,
 			'style'        => 'default',
+			'paginate'     => 'ajax',
 		];
 		$instance = wp_parse_args($instance, $defaults);
 		?>
 		<p>
 			<label for="<?php echo esc_attr($this->get_field_id('title')); ?>"><?php esc_html_e('标题:', 'aksrt'); ?></label>
-            <input class="widefat" type="text" id="<?php echo esc_attr($this->get_field_id('title')); ?>" name="<?php echo esc_attr($this->get_field_name('title')); ?>" value="<?php echo esc_attr($instance['title']); ?>">
+			<input class="widefat" type="text" id="<?php echo esc_attr($this->get_field_id('title')); ?>" name="<?php echo esc_attr($this->get_field_name('title')); ?>" value="<?php echo esc_attr((string) $instance['title']); ?>">
 		</p>
 		<p>
 			<label for="<?php echo esc_attr($this->get_field_id('per_page')); ?>"><?php esc_html_e('每页数量:', 'aksrt'); ?></label>
@@ -175,6 +269,7 @@ class WidgetProductList extends \WP_Widget {
 			<select class="widefat" id="<?php echo esc_attr($this->get_field_id('orderby')); ?>" name="<?php echo esc_attr($this->get_field_name('orderby')); ?>">
 				<option value="date" <?php selected($instance['orderby'], 'date'); ?>><?php esc_html_e('最新', 'aksrt'); ?></option>
 				<option value="sales" <?php selected($instance['orderby'], 'sales'); ?>><?php esc_html_e('销量', 'aksrt'); ?></option>
+				<option value="views" <?php selected($instance['orderby'], 'views'); ?>><?php esc_html_e('热度', 'aksrt'); ?></option>
 				<option value="title" <?php selected($instance['orderby'], 'title'); ?>><?php esc_html_e('标题', 'aksrt'); ?></option>
 				<option value="rand" <?php selected($instance['orderby'], 'rand'); ?>><?php esc_html_e('随机', 'aksrt'); ?></option>
 			</select>
@@ -188,21 +283,21 @@ class WidgetProductList extends \WP_Widget {
 		</p>
 		<p>
 			<label for="<?php echo esc_attr($this->get_field_id('cat_ids')); ?>"><?php esc_html_e('分类ID(逗号分隔):', 'aksrt'); ?></label>
-            <input class="widefat" type="text" id="<?php echo esc_attr($this->get_field_id('cat_ids')); ?>" name="<?php echo esc_attr($this->get_field_name('cat_ids')); ?>" value="<?php echo esc_attr($instance['cat_ids']); ?>">
+			<input class="widefat" type="text" id="<?php echo esc_attr($this->get_field_id('cat_ids')); ?>" name="<?php echo esc_attr($this->get_field_name('cat_ids')); ?>" value="<?php echo esc_attr((string) $instance['cat_ids']); ?>">
 		</p>
 		<p>
 			<label>
-                <input type="checkbox" name="<?php echo esc_attr($this->get_field_name('exclude_cat')); ?>" value="1" <?php checked($instance['exclude_cat']); ?>>
+				<input type="checkbox" name="<?php echo esc_attr($this->get_field_name('exclude_cat')); ?>" value="1" <?php checked(!empty($instance['exclude_cat'])); ?>>
 				<?php esc_html_e('排除上述分类', 'aksrt'); ?>
 			</label>
 		</p>
 		<p>
 			<label for="<?php echo esc_attr($this->get_field_id('tag_ids')); ?>"><?php esc_html_e('标签ID(逗号分隔):', 'aksrt'); ?></label>
-            <input class="widefat" type="text" id="<?php echo esc_attr($this->get_field_id('tag_ids')); ?>" name="<?php echo esc_attr($this->get_field_name('tag_ids')); ?>" value="<?php echo esc_attr($instance['tag_ids']); ?>">
+			<input class="widefat" type="text" id="<?php echo esc_attr($this->get_field_id('tag_ids')); ?>" name="<?php echo esc_attr($this->get_field_name('tag_ids')); ?>" value="<?php echo esc_attr((string) $instance['tag_ids']); ?>">
 		</p>
 		<p>
 			<label for="<?php echo esc_attr($this->get_field_id('discount_ids')); ?>"><?php esc_html_e('优惠活动ID(逗号分隔):', 'aksrt'); ?></label>
-            <input class="widefat" type="text" id="<?php echo esc_attr($this->get_field_id('discount_ids')); ?>" name="<?php echo esc_attr($this->get_field_name('discount_ids')); ?>" value="<?php echo esc_attr($instance['discount_ids']); ?>">
+			<input class="widefat" type="text" id="<?php echo esc_attr($this->get_field_id('discount_ids')); ?>" name="<?php echo esc_attr($this->get_field_name('discount_ids')); ?>" value="<?php echo esc_attr((string) $instance['discount_ids']); ?>">
 		</p>
 		<p>
 			<label for="<?php echo esc_attr($this->get_field_id('style')); ?>"><?php esc_html_e('列表样式:', 'aksrt'); ?></label>
@@ -211,6 +306,15 @@ class WidgetProductList extends \WP_Widget {
 				<option value="card" <?php selected($instance['style'], 'card'); ?>><?php esc_html_e('卡片', 'aksrt'); ?></option>
 				<option value="list" <?php selected($instance['style'], 'list'); ?>><?php esc_html_e('列表', 'aksrt'); ?></option>
 				<option value="mini" <?php selected($instance['style'], 'mini'); ?>><?php esc_html_e('迷你', 'aksrt'); ?></option>
+				<option value="oneline" <?php selected($instance['style'], 'oneline'); ?>><?php esc_html_e('横滑', 'aksrt'); ?></option>
+			</select>
+		</p>
+		<p>
+			<label for="<?php echo esc_attr($this->get_field_id('paginate')); ?>"><?php esc_html_e('分页:', 'aksrt'); ?></label>
+			<select class="widefat" id="<?php echo esc_attr($this->get_field_id('paginate')); ?>" name="<?php echo esc_attr($this->get_field_name('paginate')); ?>">
+				<option value="ajax" <?php selected($instance['paginate'], 'ajax'); ?>><?php esc_html_e('AJAX 加载更多', 'aksrt'); ?></option>
+				<option value="number" <?php selected($instance['paginate'], 'number'); ?>><?php esc_html_e('数字分页', 'aksrt'); ?></option>
+				<option value="none" <?php selected($instance['paginate'], 'none'); ?>><?php esc_html_e('无', 'aksrt'); ?></option>
 			</select>
 		</p>
 		<?php
@@ -218,15 +322,16 @@ class WidgetProductList extends \WP_Widget {
 
 	public function update($new_instance, $old_instance): array {
 		return [
-            'title'        => sanitize_text_field($new_instance['title'] ?? ''),
+			'title'        => sanitize_text_field((string) ($new_instance['title'] ?? '')),
 			'per_page'     => max(1, min(50, (int) ($new_instance['per_page'] ?? 8))),
-            'orderby'      => sanitize_key($new_instance['orderby'] ?? 'date'),
+			'orderby'      => sanitize_key((string) ($new_instance['orderby'] ?? 'date')),
-            'order'        => in_array(strtoupper($new_instance['order'] ?? ''), ['ASC', 'DESC'], true) ? strtoupper($new_instance['order']) : 'DESC',
+			'order'        => in_array(strtoupper((string) ($new_instance['order'] ?? '')), ['ASC', 'DESC'], true) ? strtoupper((string) $new_instance['order']) : 'DESC',
-            'cat_ids'      => sanitize_text_field($new_instance['cat_ids'] ?? ''),
+			'cat_ids'      => sanitize_text_field((string) ($new_instance['cat_ids'] ?? '')),
-            'tag_ids'      => sanitize_text_field($new_instance['tag_ids'] ?? ''),
+			'tag_ids'      => sanitize_text_field((string) ($new_instance['tag_ids'] ?? '')),
-            'discount_ids' => sanitize_text_field($new_instance['discount_ids'] ?? ''),
+			'discount_ids' => sanitize_text_field((string) ($new_instance['discount_ids'] ?? '')),
-            'exclude_cat'  => !empty($new_instance['exclude_cat']),
+			'exclude_cat'  => !empty($new_instance['exclude_cat']) ? 1 : 0,
-            'style'        => sanitize_key($new_instance['style'] ?? 'default'),
+			'style'        => sanitize_key((string) ($new_instance['style'] ?? 'default')),
+			'paginate'     => sanitize_key((string) ($new_instance['paginate'] ?? 'ajax')),
 		];
 	}
 }