feat(widgets): number paginate + main/tab query depth

Add shared aksrt_get_ajax_number_paginate, MainPosts topics/pay_type/
favorites filters and number pager, TabPosts style/paginate/skeleton
payload, REST wiring, product number AJAX parity.

assets/js/widget-set.js

@@ -25,11 +25,15 @@
         var orderby = tab.getAttribute('data-orderby') || 'date';
         var cat = tab.getAttribute('data-cat') || '0';
         var tabCount = tab.getAttribute('data-tab-count') || '0';
+        var style = widget.getAttribute('data-style') || 'mini';
+        var paginate = widget.getAttribute('data-paginate') || 'none';
         var qs = new URLSearchParams({
           count: defaultCount,
           orderby: orderby,
           cat: cat,
           tab_count: tabCount,
+          style: style,
+          paginate: paginate,
         });
         var url = rest + (rest.indexOf('?') > -1 ? '&' : '?') + qs.toString();
         panel.classList.add('is-ajax-loading');
@@ -42,7 +46,8 @@
           .then(function (j) {
             var d = (j && j.data) || j || {};
             var html = d.html || '';
-            panel.innerHTML = html || '<p class="widget-empty">暂无文章</p>';
+            var pag = d.paginate_html || d.paginateHtml || '';
+            panel.innerHTML = (html || '<p class="widget-empty">暂无文章</p>') + (pag || '');
             panel.setAttribute('data-loaded', '1');
             panel.classList.remove('is-ajax-loading');
           })

inc/helpers/aksrt-ajax-list.php

@@ -109,3 +109,83 @@ if (!function_exists('aksrt_get_remote_modal_link')) {
 		return '<' . $tag . $attrs . '>' . esc_html($text) . '</' . $tag . '>';
 	}
 }
+
+if (!function_exists('aksrt_get_ajax_number_paginate')) {
+	/**
+	 * Numbered AJAX pager (zibll zib_get_ajax_number_paginate subset).
+	 *
+	 * Links use class next-page ajax-next + ajax-replace so ajax-list.js
+	 * replaces .ajax-item rows inside the nearest .ajaxpager.
+	 *
+	 * @param int    $count_all Total items.
+	 * @param int    $page      Current page (1-based).
+	 * @param int    $per_page  Per page.
+	 * @param string $ajax_url  Base REST/URL (page query key replaced).
+	 * @param string $pag_class Wrapper class.
+	 * @param string $next_class Link base class.
+	 * @param string $query_key Page query arg (default page).
+	 */
+	function aksrt_get_ajax_number_paginate(
+		int $count_all,
+		int $page = 1,
+		int $per_page = 10,
+		string $ajax_url = '',
+		string $pag_class = 'ajax-pag',
+		string $next_class = 'next-page ajax-next',
+		string $query_key = 'page'
+	): string {
+		$page     = max(1, $page);
+		$per_page = max(1, $per_page);
+		$total_pages = (int) ceil(max(0, $count_all) / $per_page);
+		if ($total_pages < 2 || $count_all <= 0) {
+			return '<div class="' . esc_attr($pag_class) . ' hide"><div class="' . esc_attr($next_class) . '"><a href="#"></a></div></div>';
+		}
+
+		$base = $ajax_url !== '' ? $ajax_url : '#';
+		// Ensure %#% placeholder for page numbers.
+		if (strpos($base, '%#%') === false) {
+			$base = add_query_arg($query_key, '%#%', $base);
+		}
+
+		$end_size = 1;
+		$mid_size = 2;
+		$links    = [];
+		$dots     = false;
+
+		// Prev.
+		if ($page > 1) {
+			$url = esc_url(str_replace('%#%', (string) ($page - 1), $base));
+			$links[] = '<a class="' . esc_attr($next_class) . ' prev page-numbers" ajax-replace="true" href="' . $url . '"><i class="fa fa-angle-left em12" aria-hidden="true"></i></a>';
+		}
+
+		for ($n = 1; $n <= $total_pages; $n++) {
+			$in_window = $n <= $end_size
+				|| $n > $total_pages - $end_size
+				|| ($n >= $page - $mid_size && $n <= $page + $mid_size);
+			if (!$in_window) {
+				if ($dots) {
+					continue;
+				}
+				$links[] = '<span class="page-numbers dots">&hellip;</span>';
+				$dots = true;
+				continue;
+			}
+			$dots = false;
+			if ($n === $page) {
+				$links[] = '<span class="page-numbers current">' . (int) $n . '</span>';
+			} else {
+				$url = esc_url(str_replace('%#%', (string) $n, $base));
+				$links[] = '<a class="' . esc_attr($next_class) . ' page-numbers" ajax-replace="true" href="' . $url . '">' . (int) $n . '</a>';
+			}
+		}
+
+		// Next.
+		if ($page < $total_pages) {
+			$url = esc_url(str_replace('%#%', (string) ($page + 1), $base));
+			$links[] = '<a class="' . esc_attr($next_class) . ' next page-numbers" ajax-replace="true" href="' . $url . '"><i class="fa fa-angle-right em12" aria-hidden="true"></i></a>';
+		}
+
+		return '<div class="pagenav ' . esc_attr($pag_class) . '">' . implode('', $links) . '</div>';
+	}
+}
+

src/AKSRT/Core/WidgetAjax.php

@@ -61,11 +61,13 @@ class WidgetAjax {
 			'orderby'     => sanitize_key((string) ($request->get_param('orderby') ?? 'date')),
 			'cat'         => max(0, (int) ($request->get_param('cat') ?? 0)),
 			'limit_day'   => max(0, (int) ($request->get_param('limit_day') ?? 0)),
+			'topics'      => sanitize_text_field((string) ($request->get_param('topics') ?? '')),
+			'pay_type'    => sanitize_key((string) ($request->get_param('pay_type') ?? '')),
 			'style'       => sanitize_key((string) ($request->get_param('style') ?? 'list')),
 			'show_thumb'  => $request->get_param('show_thumb') === null ? 1 : (int) $request->get_param('show_thumb'),
 			'show_meta'   => $request->get_param('show_meta') === null ? 1 : (int) $request->get_param('show_meta'),
 			'show_number' => (int) ($request->get_param('show_number') ?? 0),
-			'paginate'    => sanitize_key((string) ($request->get_param('paginate') ?? 'ajax')),
+			'paginate'    => in_array(sanitize_key((string) ($request->get_param('paginate') ?? 'ajax')), ['none','ajax','number'], true) ? sanitize_key((string) ($request->get_param('paginate') ?? 'ajax')) : 'ajax',
 		];
 		$page = max(1, (int) ($request->get_param('page') ?? $request->get_param('paged') ?? 1));
 		return $this->payload(\AKSRT\Widgets\WidgetMainPosts::query_payload($instance, $page), $page);
@@ -76,6 +78,15 @@ class WidgetAjax {
 			return $this->fail();
 		}
 		$default_count = max(1, min(20, (int) ($request->get_param('count') ?? 5)));
+		$style = sanitize_key((string) ($request->get_param('style') ?? 'mini'));
+		if (!in_array($style, ['list', 'card', 'mini'], true)) {
+			$style = 'mini';
+		}
+		$paginate = sanitize_key((string) ($request->get_param('paginate') ?? 'none'));
+		if (!in_array($paginate, ['none', 'ajax', 'number'], true)) {
+			$paginate = 'none';
+		}
+		$page = max(1, (int) ($request->get_param('page') ?? 1));
 		$tab = [
 			'title'       => '',
 			'category_id' => max(0, (int) ($request->get_param('cat') ?? $request->get_param('category_id') ?? 0)),
@@ -83,15 +94,31 @@ class WidgetAjax {
 			'count'       => max(0, min(20, (int) ($request->get_param('tab_count') ?? 0))),
 			'enabled'     => true,
 		];
-		$html = \AKSRT\Widgets\TabPostsWidget::render_tab_html($tab, $default_count);
+		$opts = [
+			'style'       => $style,
+			'paginate'    => $paginate,
+			'show_thumb'  => $request->get_param('show_thumb') === null ? 1 : (int) $request->get_param('show_thumb'),
+			'show_meta'   => $request->get_param('show_meta') === null ? 1 : (int) $request->get_param('show_meta'),
+			'show_number' => (int) ($request->get_param('show_number') ?? 0),
+		];
+		$payload = \AKSRT\Widgets\TabPostsWidget::render_tab_payload($tab, $default_count, $opts, $page);
+		$html = (string) ($payload['html'] ?? '');
 		if ($html === '') {
 			$html = function_exists('aksrt_get_ajax_null')
 				? aksrt_get_ajax_null(__('暂无文章', 'aksrt'))
 				: '<p class="widget-empty ajax-item">' . esc_html__('暂无文章', 'aksrt') . '</p>';
 		} else {
-			$html = '<div class="widget-tab-posts__list widget-tab-posts__list--mini aksrt-main-posts style-mini">' . $html . '</div>';
+			$html = '<div class="widget-tab-posts__list widget-tab-posts__list--' . esc_attr($style) . ' aksrt-main-posts style-' . esc_attr($style) . '">' . $html . '</div>';
 		}
-		return new \WP_REST_Response(['success' => true, 'html' => $html], 200);
+		return new \WP_REST_Response([
+			'success'       => true,
+			'html'          => $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),
+		], 200);
 	}
 
 	public function rest_paid_posts(\WP_REST_Request $request) {
@@ -181,6 +208,8 @@ class WidgetAjax {
 			'orderby'   => sanitize_key((string) ($request->get_param('orderby') ?? 'date')),
 			'cat'       => max(0, (int) ($request->get_param('cat') ?? 0)),
 			'limit_day' => max(0, (int) ($request->get_param('limit_day') ?? 0)),
+			'topics'    => sanitize_text_field((string) ($request->get_param('topics') ?? '')),
+			'pay_type'  => sanitize_key((string) ($request->get_param('pay_type') ?? '')),
 		];
 		$html = \AKSRT\Widgets\WidgetOnelinePosts::render_html($instance);
 		return new \WP_REST_Response(['success' => true, 'html' => $html], 200);
@@ -193,7 +222,7 @@ class WidgetAjax {
 		$instance = [
 			'count'       => max(1, min(20, (int) ($request->get_param('count') ?? 5))),
 			'show_avatar' => $request->get_param('show_avatar') === null ? 1 : (int) $request->get_param('show_avatar'),
-			'outpost'     => max(0, (int) ($request->get_param('outpost') ?? 0)),
+			'outpost'     => sanitize_text_field((string) ($request->get_param('outpost') ?? '')),
 			'outer'       => sanitize_text_field((string) ($request->get_param('outer') ?? '')),
 		];
 		$html = \AKSRT\Widgets\RecentCommentsWidget::render_html($instance);

src/AKSRT/Widgets/TabPostsWidget.php

@@ -93,30 +93,72 @@ class TabPostsWidget extends \WP_Widget {
 	 * @param int   $default_count
 	 * @return array
 	 */
-	public static function tab_to_main_instance(array $tab, int $default_count): array {
+	public static function tab_to_main_instance(array $tab, int $default_count, array $opts = []): array {
 		$count = !empty($tab['count']) ? (int) $tab['count'] : $default_count;
+		$style = sanitize_key((string) ($opts['style'] ?? $tab['style'] ?? 'mini'));
+		if (!in_array($style, ['list', 'card', 'mini'], true)) {
+			$style = 'mini';
+		}
+		$paginate = sanitize_key((string) ($opts['paginate'] ?? $tab['paginate'] ?? 'none'));
+		if (!in_array($paginate, ['none', 'ajax', 'number'], true)) {
+			$paginate = 'none';
+		}
 		return [
-			'count'      => max(1, min(30, $count)),
+			'count'       => max(1, min(30, $count)),
-			'orderby'    => sanitize_key((string) ($tab['orderby'] ?? 'date')),
+			'orderby'     => sanitize_key((string) ($tab['orderby'] ?? 'date')),
-			'cat'        => absint($tab['category_id'] ?? 0),
+			'cat'         => absint($tab['category_id'] ?? 0),
-			'style'      => 'mini',
+			'style'       => $style,
-			'show_thumb' => 1,
+			'show_thumb'  => !isset($opts['show_thumb']) ? 1 : (int) $opts['show_thumb'],
-			'show_meta'  => 1,
+			'show_meta'   => !isset($opts['show_meta']) ? 1 : (int) $opts['show_meta'],
-			'show_number'=> 0,
+			'show_number' => !empty($opts['show_number']) ? 1 : 0,
-			'paginate'   => 'none',
+			'paginate'    => $paginate,
 		];
 	}
 
 	/**
 	 * REST helper: render one tab list HTML.
+	 *
+	 * @param array<string,mixed> $opts
 	 */
-	public static function render_tab_html(array $tab, int $default_count): string {
+	public static function render_tab_html(array $tab, int $default_count, array $opts = []): string {
-		$inst = self::tab_to_main_instance($tab, $default_count);
+		$payload = self::render_tab_payload($tab, $default_count, $opts, 1);
+		return (string) ($payload['html'] ?? '');
+	}
+
+	/**
+	 * Full tab payload (html + pager) for REST/ajax.
+	 *
+	 * @param array<string,mixed> $opts
+	 * @return array{html:string,paginate_html:string,has_more:bool,page:int,max_pages:int,total:int}
+	 */
+	public static function render_tab_payload(array $tab, int $default_count, array $opts = [], int $page = 1): array {
+		$inst = self::tab_to_main_instance($tab, $default_count, $opts);
 		if (class_exists('\AKSRT\Widgets\WidgetMainPosts')) {
-			$payload = WidgetMainPosts::query_payload($inst, 1);
+			return WidgetMainPosts::query_payload($inst, $page);
-			return (string) ($payload['html'] ?? '');
 		}
-		return '';
+		return [
+			'html'          => '',
+			'paginate_html' => '',
+			'has_more'      => false,
+			'page'          => 1,
+			'max_pages'     => 1,
+			'total'         => 0,
+		];
+	}
+
+	/** Skeleton rows for lazy tab panels. */
+	public static function skeleton_html(int $count = 5, string $style = 'mini'): string {
+		$count = max(1, min(12, $count));
+		ob_start();
+		echo '<div class="widget-tab-posts__skeleton posts-mini-lists style-' . esc_attr($style) . '">';
+		for ($i = 0; $i < $count; $i++) {
+			echo '<div class="posts-mini placeholder-row">';
+			echo '<div class="placeholder radius thumb-placeholder"></div>';
+			echo '<div class="flex1"><div class="placeholder k1"></div><div class="placeholder s1 mt6"></div></div>';
+			echo '</div>';
+		}
+		echo '</div>';
+		return (string) ob_get_clean();
 	}
 
 	public function widget($args, $instance): void {
@@ -124,6 +166,14 @@ class TabPostsWidget extends \WP_Widget {
 
 		$title = apply_filters('widget_title', (string) ($instance['title'] ?? ''), $instance, $this->id_base);
 		$count = absint($instance['count'] ?? 5);
+		$style = sanitize_key((string) ($instance['style'] ?? 'mini'));
+		if (!in_array($style, ['list', 'card', 'mini'], true)) {
+			$style = 'mini';
+		}
+		$paginate = sanitize_key((string) ($instance['paginate'] ?? 'none'));
+		if (!in_array($paginate, ['none', 'ajax', 'number'], true)) {
+			$paginate = 'none';
+		}
 		$tabs  = $this->normalize_tabs($instance['tabs'] ?? 'latest,comments,random');
 		$tabs  = array_values(array_filter($tabs, static fn($t) => !empty($t['enabled'])));
 		if (!$tabs) {
@@ -147,7 +197,9 @@ class TabPostsWidget extends \WP_Widget {
 		<div class="widget-tab-posts" id="<?php echo esc_attr($widget_id); ?>-tabs"
 			data-aksrt-tab-posts
 			data-rest="<?php echo esc_url($rest); ?>"
-			data-count="<?php echo esc_attr((string) $count); ?>">
+			data-count="<?php echo esc_attr((string) $count); ?>"
+				data-style="<?php echo esc_attr($style); ?>"
+				data-paginate="<?php echo esc_attr($paginate); ?>">
 			<ul class="widget-tab-posts__nav" role="tablist">
 				<?php $first = true; foreach ($tabs as $i => $tab) :
 					$tab_key = 'tab-' . $i;
@@ -175,24 +227,20 @@ class TabPostsWidget extends \WP_Widget {
 					data-loaded="<?php echo $first ? '1' : '0'; ?>"
 					role="tabpanel"<?php echo $first ? '' : ' hidden'; ?>>
 					<?php if ($first) :
-						$html = self::render_tab_html($tab, $count);
+							$opts = ['style' => $style, 'paginate' => $paginate];
-						if ($html !== '') {
+							$payload = self::render_tab_payload($tab, $count, $opts, 1);
-							echo '<div class="widget-tab-posts__list widget-tab-posts__list--mini aksrt-main-posts style-mini">' . $html . '</div>'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+							$html = (string) ($payload['html'] ?? '');
-						} else {
+							if ($html !== '') {
-							// Fallback to old mini list path.
+								echo '<div class="widget-tab-posts__list widget-tab-posts__list--' . esc_attr($style) . ' aksrt-main-posts style-' . esc_attr($style) . '">' . $html . '</div>'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-							$q = new \WP_Query(WidgetMainPosts::build_query_args(self::tab_to_main_instance($tab, $count), 1));
+								if (!empty($payload['paginate_html'])) {
-							if ($q->have_posts() && $use_shared) {
+									echo $payload['paginate_html']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-								echo '<div class="widget-tab-posts__list widget-tab-posts__list--mini">';
+								}
-								aksrt_render_mini_list($q, ['context' => 'sidebar', 'show_thumb' => true, 'show_meta' => true], true);
-								echo '</div>';
 							} else {
 								echo function_exists('aksrt_get_widget_null') ? aksrt_get_widget_null(__('暂无文章', 'aksrt')) : '<p class="widget-empty">' . esc_html__('暂无文章', 'aksrt') . '</p>'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 							}
-							wp_reset_postdata();
+						else : ?>
-						}
+							<div class="post_ajax_loader" data-aksrt-ajax-loader><?php echo self::skeleton_html($count, $style); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?></div>
-					else : ?>
+						<?php endif; ?>
-						<div class="post_ajax_loader" data-aksrt-ajax-loader></div>
-					<?php endif; ?>
 				</div>
 			<?php $first = false; endforeach; ?>
 		</div>
@@ -223,6 +271,24 @@ class TabPostsWidget extends \WP_Widget {
 			<label for="<?php echo esc_attr($this->get_field_id('count')); ?>"><?php esc_html_e('默认每个 Tab 显示数量:', 'aksrt'); ?></label>
 			<input class="tiny-text" id="<?php echo esc_attr($this->get_field_id('count')); ?>" name="<?php echo esc_attr($this->get_field_name('count')); ?>" type="number" min="1" max="20" value="<?php echo (int) $count; ?>">
 		</p>
+			<p>
+				<label><?php esc_html_e('列表样式', 'aksrt'); ?>
+					<select name="<?php echo esc_attr($this->get_field_name('style')); ?>">
+						<option value="mini" <?php selected(($instance['style'] ?? 'mini'), 'mini'); ?>><?php esc_html_e('迷你', 'aksrt'); ?></option>
+						<option value="list" <?php selected(($instance['style'] ?? ''), 'list'); ?>><?php esc_html_e('列表', 'aksrt'); ?></option>
+						<option value="card" <?php selected(($instance['style'] ?? ''), 'card'); ?>><?php esc_html_e('卡片', 'aksrt'); ?></option>
+					</select>
+				</label>
+			</p>
+			<p>
+				<label><?php esc_html_e('分页', 'aksrt'); ?>
+					<select name="<?php echo esc_attr($this->get_field_name('paginate')); ?>">
+						<option value="none" <?php selected(($instance['paginate'] ?? 'none'), 'none'); ?>><?php esc_html_e('无', 'aksrt'); ?></option>
+						<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>
+					</select>
+				</label>
+			</p>
 		<hr style="margin:12px 0;">
 		<p style="font-weight:600;margin-bottom:8px;"><?php esc_html_e('Tab 配置', 'aksrt'); ?></p>
 		<?php
@@ -262,9 +328,19 @@ class TabPostsWidget extends \WP_Widget {
 	}
 
 	public function update($new_instance, $old_instance): array {
+		$style = sanitize_key((string) ($new_instance['style'] ?? 'mini'));
+		if (!in_array($style, ['list', 'card', 'mini'], true)) {
+			$style = 'mini';
+		}
+		$paginate = sanitize_key((string) ($new_instance['paginate'] ?? 'none'));
+		if (!in_array($paginate, ['none', 'ajax', 'number'], true)) {
+			$paginate = 'none';
+		}
 		$result = [
-			'title' => sanitize_text_field((string) ($new_instance['title'] ?? '')),
+			'title'    => sanitize_text_field((string) ($new_instance['title'] ?? '')),
-			'count' => max(1, min(20, (int) ($new_instance['count'] ?? 5))),
+			'count'    => max(1, min(20, (int) ($new_instance['count'] ?? 5))),
+			'style'    => $style,
+			'paginate' => $paginate,
 		];
 		$tabs = [];
 		if (isset($new_instance['tabs']) && is_array($new_instance['tabs'])) {

src/AKSRT/Widgets/WidgetMainPosts.php

@@ -61,6 +61,16 @@ class WidgetMainPosts extends \WP_Widget {
 				$query['orderby']  = 'meta_value_num';
 				$query['order']    = 'DESC';
 				break;
+			case 'favorites':
+				$query['meta_key'] = '_aksrt_favorite_count';
+				$query['orderby']  = 'meta_value_num';
+				$query['order']    = 'DESC';
+				break;
+			case 'downloads':
+				$query['meta_key'] = '_aksrt_res_download_count';
+				$query['orderby']  = 'meta_value_num';
+				$query['order']    = 'DESC';
+				break;
 			case 'rand':
 				$query['orderby'] = 'rand';
 				break;
@@ -72,6 +82,60 @@ class WidgetMainPosts extends \WP_Widget {
 				$query['orderby'] = 'date';
 				$query['order']   = 'DESC';
 		}
+
+		// Topics taxonomy (CSV term IDs).
+		$topics_raw = trim((string) ($instance['topics'] ?? ''));
+		if ($topics_raw !== '' && taxonomy_exists('topics')) {
+			$topic_ids = array_values(array_filter(array_map('intval', preg_split('/[,，\s]+/', $topics_raw) ?: [])));
+			if ($topic_ids) {
+				$query['tax_query'] = [
+					[
+						'taxonomy' => 'topics',
+						'field'    => 'term_id',
+						'terms'    => $topic_ids,
+					],
+				];
+			}
+		}
+
+		// Pay type filter (reading/download/gallery/video/vip or any paid).
+		$pay_type = sanitize_key((string) ($instance['pay_type'] ?? ''));
+		if ($pay_type !== '' && $pay_type !== '0' && $pay_type !== 'no') {
+			$mq = isset($query['meta_query']) && is_array($query['meta_query']) ? $query['meta_query'] : [];
+			if ($pay_type === 'any' || $pay_type === 'paid') {
+				$mq[] = [
+					'relation' => 'OR',
+					[
+						'key'     => '_aksrt_pay_price',
+						'value'   => 0,
+						'compare' => '>',
+						'type'    => 'NUMERIC',
+					],
+					[
+						'key'     => '_aksrt_pay_type',
+						'value'   => ['reading', 'download', 'gallery', 'video', 'vip'],
+						'compare' => 'IN',
+					],
+					[
+						'key'     => '_aksrt_visibility',
+						'value'   => ['pay', 'credits'],
+						'compare' => 'IN',
+					],
+				];
+			} else {
+				$mq[] = [
+					'key'   => '_aksrt_pay_type',
+					'value' => $pay_type,
+				];
+			}
+			if ($mq) {
+				if (count($mq) > 1) {
+					$mq['relation'] = 'AND';
+				}
+				$query['meta_query'] = $mq;
+			}
+		}
+
 		return $query;
 	}
 
@@ -179,23 +243,32 @@ class WidgetMainPosts extends \WP_Widget {
 		$max_pages = max(1, (int) $q->max_num_pages);
 		$total = (int) $q->found_posts;
 		$has_more = $page < $max_pages;
+		$base_qs = array_filter([
+			'count'       => $count,
+			'orderby'     => sanitize_key((string) ($instance['orderby'] ?? 'date')),
+			'cat'         => (int) ($instance['cat'] ?? 0),
+			'limit_day'   => (int) ($instance['limit_day'] ?? 0),
+			'topics'      => (string) ($instance['topics'] ?? ''),
+			'pay_type'    => sanitize_key((string) ($instance['pay_type'] ?? '')),
+			'style'       => sanitize_key((string) ($instance['style'] ?? 'list')),
+			'show_thumb'  => !isset($instance['show_thumb']) || !empty($instance['show_thumb']) ? 1 : 0,
+			'show_meta'   => !isset($instance['show_meta']) || !empty($instance['show_meta']) ? 1 : 0,
+			'show_number' => !empty($instance['show_number']) ? 1 : 0,
+			'paginate'    => $paginate,
+		], static function ($v) {
+			return $v !== '' && $v !== null;
+		});
+		$rest_base = add_query_arg($base_qs, rest_url('aksrt/v1/widgets/posts'));
 		$paginate_html = '';
 		if ($paginate === 'ajax' && $has_more) {
-			$next = add_query_arg(array_filter([
+			$next = add_query_arg(['page' => $page + 1], $rest_base);
-				'page'        => $page + 1,
-				'count'       => $count,
-				'orderby'     => sanitize_key((string) ($instance['orderby'] ?? 'date')),
-				'cat'         => (int) ($instance['cat'] ?? 0),
-				'limit_day'   => (int) ($instance['limit_day'] ?? 0),
-				'style'       => sanitize_key((string) ($instance['style'] ?? 'list')),
-				'show_thumb'  => !isset($instance['show_thumb']) || !empty($instance['show_thumb']) ? 1 : 0,
-				'show_meta'   => !isset($instance['show_meta']) || !empty($instance['show_meta']) ? 1 : 0,
-				'show_number' => !empty($instance['show_number']) ? 1 : 0,
-				'paginate'    => 'ajax',
-			]), rest_url('aksrt/v1/widgets/posts'));
 			$paginate_html = function_exists('aksrt_get_ajax_next_paginate')
 				? aksrt_get_ajax_next_paginate($total, $page, $count, $next)
 				: '<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 = function_exists('aksrt_get_ajax_number_paginate')
+				? aksrt_get_ajax_number_paginate($total, $page, $count, $rest_base)
+				: '<div class="ajax-pag hide"><div class="next-page ajax-next"><a href="#"></a></div></div>';
 		} else {
 			$paginate_html = '<div class="ajax-pag hide"><div class="next-page ajax-next"><a href="#"></a></div></div>';
 		}
@@ -230,7 +303,11 @@ class WidgetMainPosts extends \WP_Widget {
 		}
 
 		$rest = rest_url('aksrt/v1/widgets/posts');
-		echo '<div class="aksrt-main-posts style-' . esc_attr($style) . ' ajaxpager" data-aksrt-ajaxpager data-aksrt-ajax-url="' . esc_url($rest) . '">';
+		$wrap_cls = 'aksrt-main-posts style-' . $style . ' ajaxpager';
+		if ($style === 'mini') {
+			$wrap_cls .= ' zib-widget posts-mini-lists';
+		}
+		echo '<div class="' . esc_attr($wrap_cls) . '" data-aksrt-ajaxpager data-aksrt-ajax-url="' . esc_url($rest) . '">';
 		echo $payload['html']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 		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>';
@@ -268,6 +345,8 @@ class WidgetMainPosts extends \WP_Widget {
 					<option value="views" <?php selected(($instance['orderby'] ?? ''), 'views'); ?>><?php esc_html_e('浏览', 'aksrt'); ?></option>
 					<option value="comments" <?php selected(($instance['orderby'] ?? ''), 'comments'); ?>><?php esc_html_e('评论', 'aksrt'); ?></option>
 					<option value="likes" <?php selected(($instance['orderby'] ?? ''), 'likes'); ?>><?php esc_html_e('点赞', 'aksrt'); ?></option>
+					<option value=\"favorites\" <?php selected(($instance['orderby'] ?? ''), 'favorites'); ?>><?php esc_html_e('收藏', 'aksrt'); ?></option>
+					<option value=\"downloads\" <?php selected(($instance['orderby'] ?? ''), 'downloads'); ?>><?php esc_html_e('下载', 'aksrt'); ?></option>
 					<option value="rand" <?php selected(($instance['orderby'] ?? ''), 'rand'); ?>><?php esc_html_e('随机', 'aksrt'); ?></option>
 				</select>
 			</label>
@@ -287,6 +366,25 @@ class WidgetMainPosts extends \WP_Widget {
 				<select name="<?php echo esc_attr($this->get_field_name('paginate')); ?>">
 					<option value="none" <?php selected(($instance['paginate'] ?? 'none'), 'none'); ?>><?php esc_html_e('无', 'aksrt'); ?></option>
 					<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>
+				</select>
+			</label>
+		</p>
+		<p>
+			<label><?php esc_html_e('专题 topics ID（逗号）', 'aksrt'); ?>
+				<input class="widefat" type="text" name="<?php echo esc_attr($this->get_field_name('topics')); ?>" value="<?php echo esc_attr((string) ($instance['topics'] ?? '')); ?>">
+			</label>
+		</p>
+		<p>
+			<label><?php esc_html_e('付费类型', 'aksrt'); ?>
+				<select name="<?php echo esc_attr($this->get_field_name('pay_type')); ?>">
+					<option value="" <?php selected(($instance['pay_type'] ?? ''), ''); ?>><?php esc_html_e('不限', 'aksrt'); ?></option>
+					<option value="paid" <?php selected(($instance['pay_type'] ?? ''), 'paid'); ?>><?php esc_html_e('任意付费', 'aksrt'); ?></option>
+					<option value="reading" <?php selected(($instance['pay_type'] ?? ''), 'reading'); ?>><?php esc_html_e('付费阅读', 'aksrt'); ?></option>
+					<option value="download" <?php selected(($instance['pay_type'] ?? ''), 'download'); ?>><?php esc_html_e('付费下载', 'aksrt'); ?></option>
+					<option value="gallery" <?php selected(($instance['pay_type'] ?? ''), 'gallery'); ?>><?php esc_html_e('付费图库', 'aksrt'); ?></option>
+					<option value="video" <?php selected(($instance['pay_type'] ?? ''), 'video'); ?>><?php esc_html_e('付费视频', 'aksrt'); ?></option>
+					<option value="vip" <?php selected(($instance['pay_type'] ?? ''), 'vip'); ?>><?php esc_html_e('会员专属', 'aksrt'); ?></option>
 				</select>
 			</label>
 		</p>
@@ -304,9 +402,13 @@ class WidgetMainPosts extends \WP_Widget {
 			$style = 'list';
 		}
 		$orderby = sanitize_key((string) ($new_instance['orderby'] ?? 'date'));
-		if (!in_array($orderby, ['date', 'modified', 'views', 'comments', 'likes', 'rand'], true)) {
+		if (!in_array($orderby, ['date', 'modified', 'views', 'comments', 'likes', 'favorites', 'downloads', 'rand'], true)) {
 			$orderby = 'date';
 		}
+		$paginate = sanitize_key((string) ($new_instance['paginate'] ?? 'none'));
+		if (!in_array($paginate, ['none', 'ajax', 'number'], true)) {
+			$paginate = 'none';
+		}
 		return [
 			'title'       => sanitize_text_field((string) ($new_instance['title'] ?? '')),
 			'count'       => max(1, min(30, (int) ($new_instance['count'] ?? 6))),
@@ -314,7 +416,9 @@ class WidgetMainPosts extends \WP_Widget {
 			'orderby'     => $orderby,
 			'cat'         => max(0, (int) ($new_instance['cat'] ?? 0)),
 			'limit_day'   => max(0, (int) ($new_instance['limit_day'] ?? 0)),
-			'paginate'    => sanitize_key((string) ($new_instance['paginate'] ?? 'none')) === 'ajax' ? 'ajax' : 'none',
+			'topics'      => sanitize_text_field((string) ($new_instance['topics'] ?? '')),
+			'pay_type'    => sanitize_key((string) ($new_instance['pay_type'] ?? '')),
+			'paginate'    => $paginate,
 			'show_thumb'  => !empty($new_instance['show_thumb']) ? 1 : 0,
 			'show_meta'   => !empty($new_instance['show_meta']) ? 1 : 0,
 			'show_number' => !empty($new_instance['show_number']) ? 1 : 0,

src/AKSRT/Widgets/WidgetProductList.php

@@ -189,14 +189,32 @@ class WidgetProductList extends \WP_Widget {
 				$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([
+			$num_base = add_query_arg(
-				'base'      => add_query_arg('aksrt_product_page', '%#%'),
+				array_filter([
-				'format'    => '',
+					'per_page'     => max(1, (int) ($instance['per_page'] ?? 8)),
-				'current'   => $page,
+					'orderby'      => sanitize_key((string) ($instance['orderby'] ?? 'date')),
-				'total'     => $max_pages,
+					'order'        => sanitize_key((string) ($instance['order'] ?? 'DESC')),
-				'prev_text' => '&laquo;',
+					'cat_ids'      => (string) ($instance['cat_ids'] ?? ''),
-				'next_text' => '&raquo;',
+					'tag_ids'      => (string) ($instance['tag_ids'] ?? ''),
-			]) . '</div>';
+					'discount_ids' => (string) ($instance['discount_ids'] ?? ''),
+					'exclude_cat'  => !empty($instance['exclude_cat']) ? 1 : 0,
+					'style'        => sanitize_key((string) ($instance['style'] ?? 'default')),
+					'paginate'     => 'number',
+				], static function ($v) {
+					return $v !== '' && $v !== null;
+				}),
+				rest_url('aksrt/v1/shop/frontend/widgets/products')
+			);
+			$paginate_html = function_exists('aksrt_get_ajax_number_paginate')
+				? aksrt_get_ajax_number_paginate($total, $page, max(1, (int) ($instance['per_page'] ?? 8)), $num_base)
+				: '<div class="aksrt-product-widget__pagination">' . paginate_links([
+					'base'      => add_query_arg('aksrt_product_page', '%#%'),
+					'format'    => '',
+					'current'   => $page,
+					'total'     => $max_pages,
+					'prev_text' => '&laquo;',
+					'next_text' => '&raquo;',
+				]) . '</div>';
 		} else {
 			$paginate_html = '<div class="ajax-pag hide"><div class="next-page ajax-next"><a href="#"></a></div></div>';
 		}