Merge pull request 'Worktree ux depth batch43 45' (#243) from worktree-ux-depth-batch43-45 into main

Reviewed-on: CYL/wordpress-theme-aksrt#243

assets/css/frontend/widget-batch5.css

@@ -2533,3 +2533,22 @@ a.main-color > .icon-cover-card:hover,
 .aksrt-plate-info .count-mates .em14 { font-weight: 700; line-height: 1.2; }
 .aksrt-fi[data-aksrt-feature-intro] .aksrt-fi__panel { display: none; }
 .aksrt-fi[data-aksrt-feature-intro] .aksrt-fi__panel.is-active { display: block; }
+
+
+/* batch43-45 residual */
+.aksrt-product-widget__item--mini {
+  gap: 10px; padding: 8px 0;
+  border-bottom: 1px solid var(--color-line, rgba(0,0,0,.06));
+}
+.aksrt-product-widget__item--mini:last-child { border-bottom: 0; }
+.aksrt-product-widget__thumb.mini {
+  flex: 0 0 56px; width: 56px; height: 56px; border-radius: 8px; overflow: hidden;
+  background: var(--surface-2, #f3f4f6); display: block;
+}
+.aksrt-product-widget__thumb.mini img { width: 100%; height: 100%; object-fit: cover; display: block; }
+.aksrt-paid-posts.style-card { display: grid; grid-template-columns: repeat(auto-fill, minmax(160px, 1fr)); gap: 12px; }
+.aksrt-paid-posts.style-list .aksrt-paid-posts__item { margin-bottom: 10px; }
+.aksrt-paid-posts__price.badge {
+  display: inline-block; margin-top: 4px; padding: 1px 6px; border-radius: 4px;
+  background: rgba(240,68,148,.1); color: var(--theme-color, #f04494); font-size: 12px;
+}

src/AKSRT/Core/WidgetAjax.php

@@ -134,6 +134,7 @@ 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)),
+			'style'     => sanitize_key((string) ($request->get_param('style') ?? 'mini')),
 			'paginate'  => $paginate,
 		];
 		$page = max(1, (int) ($request->get_param('page') ?? $request->get_param('paged') ?? 1));

src/AKSRT/Widgets/CategoryBlockWidget.php

@@ -337,7 +337,7 @@ class CategoryBlockWidget extends \WP_Widget {
 			$context
 		);
 		$paginate = sanitize_key((string) ($instance['paginate'] ?? 'none'));
-		if (!in_array($paginate, ['ajax', 'none'], true)) {
+		if (!in_array($paginate, ['ajax', 'none', 'number'], true)) {
 			$paginate = 'none';
 		}
 
@@ -367,21 +367,26 @@ class CategoryBlockWidget extends \WP_Widget {
 
 		$max_pages = max(1, (int) $query->max_num_pages);
 		$total     = (int) $query->found_posts;
-		$has_more  = $paginate === 'ajax' && $page < $max_pages;
+		$has_more  = in_array($paginate, ['ajax', 'number'], true) && $page < $max_pages;
+		$base_qs = [
+			'count'    => $count,
+			'cat'      => $category_id,
+			'columns'  => $columns,
+			'layout'   => $layout,
+			'context'  => $context,
+			'paginate' => $paginate,
+		];
+		$rest_base = add_query_arg($base_qs, rest_url('aksrt/v1/widgets/category-block'));
 		$paginate_html = '';
 		if ($paginate === 'ajax' && $has_more) {
-			$next = add_query_arg([
+			$next = add_query_arg(['page' => $page + 1], $rest_base);
-				'page'     => $page + 1,
-				'count'    => $count,
-				'cat'      => $category_id,
-				'columns'  => $columns,
-				'layout'   => $layout,
-				'context'  => $context,
-				'paginate' => 'ajax',
-			], rest_url('aksrt/v1/widgets/category-block'));
 			$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>';
 		}
@@ -397,7 +402,7 @@ class CategoryBlockWidget extends \WP_Widget {
 		$title       = $title !== '' ? $title : (($term && ! is_wp_error($term)) ? $term->name : __('精选分类', 'aksrt'));
 		$show_more   = ! empty($instance['show_more']);
 		$paginate    = sanitize_key((string) ($instance['paginate'] ?? 'none'));
-		if (!in_array($paginate, ['ajax', 'none'], true)) {
+		if (!in_array($paginate, ['ajax', 'none', 'number'], true)) {
 			$paginate = 'none';
 		}
 		$instance['paginate'] = $paginate;
@@ -475,6 +480,7 @@ class CategoryBlockWidget 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>
@@ -490,7 +496,7 @@ class CategoryBlockWidget extends \WP_Widget {
 			'columns'     => max(1, min(4, absint($new_instance['columns'] ?? 3))),
 			'layout'      => aksrt_home_widget_resolve_layout($new_instance['layout'] ?? 'card', 'card'),
 			'show_more'   => ! empty($new_instance['show_more']) ? 1 : 0,
-			'paginate'    => sanitize_key((string) ($new_instance['paginate'] ?? 'none')) === 'ajax' ? 'ajax' : 'none',
+			'paginate'    => in_array(sanitize_key((string) ($new_instance['paginate'] ?? 'none')), ['none', 'ajax', 'number'], true) ? sanitize_key((string) ($new_instance['paginate'] ?? 'none')) : 'none',
 		];
 	}
 

src/AKSRT/Widgets/WidgetForumBoardList.php

@@ -140,10 +140,7 @@ class WidgetForumBoardList extends \WP_Widget {
 
 		echo $args['before_widget']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 		echo $args['before_title'] . esc_html($title) . $args['after_title']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-		$rest = rest_url('aksrt/v1/widgets/forum-boards');
-		echo '<div class="ajaxpager" data-aksrt-ajaxpager data-aksrt-ajax-url="' . esc_url($rest) . '">';
 		echo $html; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-		echo '</div>';
 		echo $args['after_widget']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 	}
 

src/AKSRT/Widgets/WidgetForumPlateLists.php

@@ -151,9 +151,7 @@ class WidgetForumPlateLists extends \WP_Widget {
 			echo $args['before_title'] . esc_html($title) . $args['after_title']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 		}
 
-		// IAS-like: first paint is SSR; optional remote refresh via rest for customize.
+		echo '<div class="widget-plate-lists mb20">';
-		$rest = rest_url('aksrt/v1/forum/frontend/widgets/plates');
-		echo '<div class="widget-plate-lists ajaxpager mb20" data-aksrt-ajaxpager data-aksrt-ajax-url="' . esc_url($rest) . '">';
 		echo $payload['html']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 		echo '</div>';
 

src/AKSRT/Widgets/WidgetForumRecentTopics.php

@@ -79,6 +79,7 @@ class WidgetForumRecentTopics extends \WP_Widget {
 			<label><?php esc_html_e('分页', 'aksrt'); ?>
 				<select name="<?php echo esc_attr($this->get_field_name('paginate')); ?>">
 					<option value="ajax" <?php selected(($instance['paginate'] ?? 'ajax'), '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>
 			</label>
@@ -96,7 +97,7 @@ class WidgetForumRecentTopics extends \WP_Widget {
 			'count'    => max(1, min(20, (int) ($new_instance['count'] ?? 5))),
 			'plate'    => max(0, (int) ($new_instance['plate'] ?? 0)),
 			'style'    => $style,
-			'paginate' => sanitize_key((string) ($new_instance['paginate'] ?? 'ajax')) === 'none' ? 'none' : 'ajax',
+			'paginate' => in_array(sanitize_key((string) ($new_instance['paginate'] ?? 'ajax')), ['none', 'ajax', 'number'], true) ? sanitize_key((string) ($new_instance['paginate'] ?? 'ajax')) : 'ajax',
 		];
 	}
 }

src/AKSRT/Widgets/WidgetForumTopicTerms.php

@@ -105,9 +105,7 @@ class WidgetForumTopicTerms extends \WP_Widget {
 		if ($title !== '') {
 			echo $args['before_title'] . esc_html($title) . $args['after_title']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 		}
-		// IAS-style wrap for remote refresh.
+			echo '<div class="zib-widget padding-6 aksrt-ftag-wrap">';
-		$rest = rest_url('aksrt/v1/widgets/forum-terms');
-			echo '<div class="zib-widget padding-6 aksrt-ftag-wrap ajaxpager" data-aksrt-ajaxpager data-aksrt-ajax-url="' . esc_url($rest) . '">';
 		echo $html; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 		echo '</div>';
 		echo $args['after_widget']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped

src/AKSRT/Widgets/WidgetOnelinePosts.php

@@ -185,10 +185,7 @@ class WidgetOnelinePosts extends \WP_Widget {
 		if ($title !== '') {
 			echo $args['before_title'] . esc_html($title) . $args['after_title']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 		}
-		$rest = rest_url('aksrt/v1/widgets/oneline-posts');
-		echo '<div class="ajaxpager" data-aksrt-ajaxpager data-aksrt-ajax-url="' . esc_url($rest) . '">';
 		echo $html; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-		echo '</div>';
 		echo $args['after_widget']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 	}
 

src/AKSRT/Widgets/WidgetPaidPosts.php

@@ -72,7 +72,7 @@ class WidgetPaidPosts extends \WP_Widget {
 		return $query;
 	}
 
-	public static function render_items_html(\WP_Query $q): string {
+	public static function render_items_html(\WP_Query $q, string $style = 'mini'): string {
 		if (!$q->have_posts()) {
 			return '';
 		}
@@ -91,17 +91,18 @@ class WidgetPaidPosts extends \WP_Widget {
 			} else {
 				$badge = __('付费', 'aksrt');
 			}
+			$mode = in_array($style, ['list', 'card', 'mini'], true) ? $style : 'mini';
 			if (function_exists('aksrt_render_post')) {
 				$item = aksrt_render_post([
-					'mode'         => 'mini',
+					'mode'         => $mode,
 					'context'      => 'widget',
 					'show_thumb'   => true,
 					'show_meta'    => true,
-					'show_excerpt' => false,
+					'show_excerpt' => $mode === 'list',
-					'extra_class'  => 'ajax-item aksrt-paid-posts__mini',
+					'extra_class'  => 'ajax-item aksrt-paid-posts__' . $mode,
 				]);
 				if ($item !== '') {
-					echo '<div class="aksrt-paid-posts__item is-mini ajax-item">';
+					echo '<div class="aksrt-paid-posts__item is-' . esc_attr($mode) . ' ajax-item">';
 					echo $item; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 					echo '<span class="aksrt-paid-posts__price badge">' . esc_html($badge) . '</span>';
 					echo '</div>';
@@ -126,9 +127,13 @@ class WidgetPaidPosts extends \WP_Widget {
 		$paginate = sanitize_key((string) ($instance['paginate'] ?? 'ajax'));
 		$count = max(1, min(20, (int) ($instance['count'] ?? 6)));
 		$q = new \WP_Query(self::build_query_args($instance, $page));
-		$items = self::render_items_html($q);
+		$style = sanitize_key((string) ($instance['style'] ?? 'mini'));
+		if (!in_array($style, ['mini', 'list', 'card'], true)) {
+			$style = 'mini';
+		}
+		$items = self::render_items_html($q, $style);
 		$wrap_tag = (strpos($items, 'posts-mini') !== false || strpos($items, 'aksrt-paid-posts__mini') !== false) ? 'div' : 'ul';
-			$html = $items !== '' ? '<' . $wrap_tag . ' class="aksrt-paid-posts">' . $items . '</' . $wrap_tag . '>' : '';
+			$html = $items !== '' ? '<' . $wrap_tag . ' class="aksrt-paid-posts style-' . esc_attr($style) . '">' . $items . '</' . $wrap_tag . '>' : '';
 		if ($html === '' && $page === 1) {
 			$html = function_exists('aksrt_get_ajax_null')
 				? aksrt_get_ajax_null(__('暂无付费内容', 'aksrt'))
@@ -142,6 +147,7 @@ class WidgetPaidPosts extends \WP_Widget {
 			'orderby'   => sanitize_key((string) ($instance['orderby'] ?? 'date')),
 			'cat'       => max(0, (int) ($instance['cat'] ?? 0)),
 			'limit_day' => max(0, (int) ($instance['limit_day'] ?? 0)),
+			'style'     => $style,
 			'paginate'  => $paginate,
 		], static function ($v) {
 			return $v !== '' && $v !== null;
@@ -203,6 +209,15 @@ class WidgetPaidPosts extends \WP_Widget {
 				<input class="tiny-text" type="number" min="1" max="20" name="<?php echo esc_attr($this->get_field_name('count')); ?>" value="<?php echo esc_attr((string) ((int) ($instance['count'] ?? 6))); ?>">
 			</label>
 		</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('orderby')); ?>">
@@ -243,6 +258,7 @@ class WidgetPaidPosts extends \WP_Widget {
 			'title'    => sanitize_text_field((string) ($new_instance['title'] ?? '')),
 			'count'    => max(1, min(20, (int) ($new_instance['count'] ?? 6))),
 			'orderby'   => $orderby,
+			'style'     => in_array(sanitize_key((string) ($new_instance['style'] ?? 'mini')), ['mini', 'list', 'card'], true) ? sanitize_key((string) ($new_instance['style'] ?? 'mini')) : 'mini',
 			'cat'       => max(0, (int) ($new_instance['cat'] ?? 0)),
 			'limit_day' => max(0, (int) ($new_instance['limit_day'] ?? 0)),
 			'paginate'  => in_array(sanitize_key((string) ($new_instance['paginate'] ?? 'ajax')), ['none', 'ajax', 'number'], true) ? sanitize_key((string) ($new_instance['paginate'] ?? 'ajax')) : 'ajax',

src/AKSRT/Widgets/WidgetProductList.php

@@ -94,6 +94,7 @@ class WidgetProductList extends \WP_Widget {
 			return '';
 		}
 		$oneline = $style === 'oneline';
+		$mini    = $style === 'mini' || $style === 'list';
 		ob_start();
 		while ($products->have_posts()) {
 			$products->the_post();
@@ -101,19 +102,35 @@ class WidgetProductList extends \WP_Widget {
 			$card = class_exists('\AKSRT\Shop\Shop')
 				? \AKSRT\Shop\Shop::get_instance()->build_product_card_view($pid)
 				: [];
+			$price = (float) ($card['price'] ?? 0);
+			$image = (string) ($card['image'] ?? '');
+			$ph    = get_template_directory_uri() . '/assets/img/placeholder.svg';
 			if ($oneline) {
 				echo '<div class="swiper-slide ajax-item">';
 			}
-			if (function_exists('get_template_part') && !empty($card['id'])) {
+			if ($mini) {
+				// Compact row: thumb + title + price (zibll mini shop row lite).
+				echo '<div class="aksrt-product-widget__item aksrt-product-widget__item--mini ajax-item flex ac">';
+				echo '<a href="' . esc_url(get_permalink($pid)) . '" class="aksrt-product-widget__thumb mini">';
+				if ($image !== '') {
+					echo '<img class="aksrt-lazy lazyload fit-cover" data-src="' . esc_url($image) . '" src="' . esc_url($ph) . '" alt="' . esc_attr(get_the_title($pid)) . '" loading="lazy" width="56" height="56">';
+				}
+				echo '</a>';
+				echo '<div class="aksrt-product-widget__info flex1 min-w0">';
+				echo '<a href="' . esc_url(get_permalink($pid)) . '" class="aksrt-product-widget__title text-ellipsis">' . esc_html(get_the_title($pid)) . '</a>';
+				echo '<div class="aksrt-product-widget__meta flex jsb ac">';
+				echo '<span class="aksrt-product-widget__price c-red">&yen;' . esc_html(number_format_i18n($price, 2)) . '</span>';
+				if (!empty($card['sales'])) {
+					echo '<span class="aksrt-product-widget__sales muted-2-color em09">' . esc_html((string) $card['sales']) . esc_html__(' 已售', 'aksrt') . '</span>';
+				}
+				echo '</div></div></div>';
+			} elseif (function_exists('get_template_part') && !empty($card['id'])) {
 				get_template_part('templates/parts/shop/product', 'card', [
 					'product'    => $card,
 					'show_sales' => true,
 				]);
 			} else {
-				// Fallback mini card (lazy thumbs).
+				// Fallback card (lazy thumbs).
-				$price = (float) ($card['price'] ?? 0);
-				$image = (string) ($card['image'] ?? '');
-				$ph    = get_template_directory_uri() . '/assets/img/placeholder.svg';
 				echo '<div class="aksrt-product-widget__item ajax-item">';
 				if ($image !== '') {
 					echo '<a href="' . esc_url(get_permalink($pid)) . '" class="aksrt-product-widget__thumb">';

src/AKSRT/Widgets/WidgetProductTab.php

@@ -155,6 +155,7 @@ class WidgetProductTab extends \WP_Widget {
 			<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>