From 05200ce7818810285a08d8eed9c1e1f85fb2c865 Mon Sep 17 00:00:00 2001
From: unknown <kate522@88.com>
Date: Sun, 19 Jul 2026 01:22:36 +0800
Subject: [PATCH] feat(widgets): deepen categories, tag cloud, vertical icon
 cards

Add hierarchy/include-exclude for categories; multi-taxonomy colored
tag cloud; vertical icon-card layout with go_link and mobile columns.
---
 src/AKSRT/Widgets/CategoriesWidget.php | 168 +++++++++++++++-----
 src/AKSRT/Widgets/IconCardsWidget.php  | 207 +++++++++++++++----------
 src/AKSRT/Widgets/TagCloudWidget.php   | 152 +++++++++++++-----
 3 files changed, 374 insertions(+), 153 deletions(-)

diff --git a/src/AKSRT/Widgets/CategoriesWidget.php b/src/AKSRT/Widgets/CategoriesWidget.php
index df7a969e..fe2362ce 100644
--- a/src/AKSRT/Widgets/CategoriesWidget.php
+++ b/src/AKSRT/Widgets/CategoriesWidget.php
@@ -1,5 +1,7 @@
 <?php
 /**
+ * Categories list (zibll-like options depth).
+ *
  * @package AKSRT
  */
 
@@ -13,60 +15,154 @@ class CategoriesWidget extends \WP_Widget {
 		parent::__construct(
 			'aksrt_categories',
 			esc_html__('AKSRT 分类目录', 'aksrt'),
-			array(
-				'description' => esc_html__('以列表形式展示文章分类', 'aksrt'),
+			[
+				'description'                 => esc_html__('以列表形式展示文章分类', 'aksrt'),
 				'customize_selective_refresh' => true,
-			)
+			]
 		);
 	}
 
-	public function widget($args, $instance) {
-		echo $args['before_widget'];
+	public function widget($args, $instance): void {
+		echo $args['before_widget']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 
-		$title = apply_filters('widget_title', $instance['title'], $instance, $this->id_base);
+		$title = apply_filters('widget_title', (string) ($instance['title'] ?? ''), $instance, $this->id_base);
+		if ($title !== '') {
+			echo $args['before_title'] . esc_html($title) . $args['after_title']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+		}
 
-		if ($title): ?>
-			<h3 class="widget-title"><?php echo $title; ?></h3>
-		<?php endif;
+		$count = max(1, min(50, (int) ($instance['count'] ?? 8)));
+		$orderby = sanitize_key((string) ($instance['orderby'] ?? 'count'));
+		if (!in_array($orderby, ['count', 'name', 'id', 'slug'], true)) {
+			$orderby = 'count';
+		}
+		$order = strtoupper((string) ($instance['order'] ?? 'DESC')) === 'ASC' ? 'ASC' : 'DESC';
+		$hide_empty = !isset($instance['hide_empty']) || !empty($instance['hide_empty']);
+		$hierarchical = !empty($instance['hierarchical']);
+		$parent = max(0, (int) ($instance['parent'] ?? 0));
+		$show_count = !isset($instance['show_count']) || !empty($instance['show_count']);
+		$exclude = $this->parse_ids((string) ($instance['exclude'] ?? ''));
+		$include = $this->parse_ids((string) ($instance['include'] ?? ''));
 
-		$count = absint($instance['count'] ?: 8);
-		$cats = get_categories(array('number' => $count, 'orderby' => 'count', 'order' => 'DESC'));
-		?>
-		<ul class="widget-list">
-			<?php foreach ($cats as $cat): ?>
-				<li>
-					<a href="<?php echo esc_url(get_category_link($cat->term_id)); ?>"><?php echo esc_html($cat->name); ?></a>
-					<span><?php echo (int)$cat->count; ?></span>
-				</li>
-			<?php endforeach; ?>
-		</ul>
-		<?php
-		echo $args['after_widget'];
+		$term_args = [
+			'taxonomy'     => 'category',
+			'number'       => $count,
+			'orderby'      => $orderby,
+			'order'        => $order,
+			'hide_empty'   => $hide_empty,
+			'hierarchical' => $hierarchical,
+		];
+		if ($parent > 0) {
+			$term_args['parent'] = $parent;
+		}
+		if ($include) {
+			$term_args['include'] = $include;
+			$term_args['orderby'] = 'include';
+			unset($term_args['number']);
+		}
+		if ($exclude) {
+			$term_args['exclude'] = $exclude;
+		}
+
+		$cats = get_categories($term_args);
+		if (!$cats) {
+			echo $args['after_widget']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+			return;
+		}
+
+		echo '<ul class="widget-list aksrt-cat-list">';
+		foreach ($cats as $cat) {
+			echo '<li>';
+			echo '<a href="' . esc_url(get_category_link($cat->term_id)) . '">' . esc_html($cat->name) . '</a>';
+			if ($show_count) {
+				echo '<span class="count">' . (int) $cat->count . '</span>';
+			}
+			echo '</li>';
+		}
+		echo '</ul>';
+
+		echo $args['after_widget']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 	}
 
-	public function form($instance) {
-		$title = $instance['title'] ?? __('分类目录', 'aksrt');
-		$count = isset($instance['count']) ? (int)$instance['count'] : 8;
+	/** @return array<int,int> */
+	private function parse_ids(string $raw): array {
+		if ($raw === '') {
+			return [];
+		}
+		$ids = [];
+		foreach (preg_split('/[\s,]+/', $raw) ?: [] as $p) {
+			$id = (int) $p;
+			if ($id > 0) {
+				$ids[] = $id;
+			}
+		}
+		return array_values(array_unique($ids));
+	}
+
+	public function form($instance): void {
 		?>
 		<p>
-			<label for="<?php echo $this->get_field_id('title'); ?>"><?php esc_html_e('标题:', 'aksrt'); ?></label>
-			<input class="widefat" id="<?php echo $this->get_field_id('title'); ?>"
-			       name="<?php echo $this->get_field_name('title'); ?>"
-			       type="text" value="<?php echo esc_attr($title); ?>">
+			<label><?php esc_html_e('标题:', 'aksrt'); ?>
+				<input class="widefat" type="text" name="<?php echo esc_attr($this->get_field_name('title')); ?>" value="<?php echo esc_attr((string) ($instance['title'] ?? __('分类目录', 'aksrt'))); ?>">
+			</label>
 		</p>
 		<p>
-			<label for="<?php echo $this->get_field_id('count'); ?>"><?php esc_html_e('显示数量:', 'aksrt'); ?></label>
-			<input class="tiny-text" id="<?php echo $this->get_field_id('count'); ?>"
-			       name="<?php echo $this->get_field_name('count'); ?>"
-			       type="number" min="1" max="50" value="<?php echo $count; ?>">
+			<label><?php esc_html_e('显示数量:', 'aksrt'); ?>
+				<input class="tiny-text" type="number" min="1" max="50" name="<?php echo esc_attr($this->get_field_name('count')); ?>" value="<?php echo esc_attr((string) ((int) ($instance['count'] ?? 8))); ?>">
+			</label>
+		</p>
+		<p>
+			<label><?php esc_html_e('排序', 'aksrt'); ?>
+				<select name="<?php echo esc_attr($this->get_field_name('orderby')); ?>">
+					<option value="count" <?php selected(($instance['orderby'] ?? 'count'), 'count'); ?>><?php esc_html_e('文章数', 'aksrt'); ?></option>
+					<option value="name" <?php selected(($instance['orderby'] ?? ''), 'name'); ?>><?php esc_html_e('名称', 'aksrt'); ?></option>
+					<option value="id" <?php selected(($instance['orderby'] ?? ''), 'id'); ?>><?php esc_html_e('ID', 'aksrt'); ?></option>
+					<option value="slug" <?php selected(($instance['orderby'] ?? ''), 'slug'); ?>><?php esc_html_e('别名', 'aksrt'); ?></option>
+				</select>
+			</label>
+			<select name="<?php echo esc_attr($this->get_field_name('order')); ?>">
+				<option value="DESC" <?php selected(($instance['order'] ?? 'DESC'), 'DESC'); ?>><?php esc_html_e('降序', 'aksrt'); ?></option>
+				<option value="ASC" <?php selected(($instance['order'] ?? ''), 'ASC'); ?>><?php esc_html_e('升序', 'aksrt'); ?></option>
+			</select>
+		</p>
+		<p>
+			<label><?php esc_html_e('父分类 ID（0=全部）', 'aksrt'); ?>
+				<input class="tiny-text" type="number" min="0" name="<?php echo esc_attr($this->get_field_name('parent')); ?>" value="<?php echo esc_attr((string) ((int) ($instance['parent'] ?? 0))); ?>">
+			</label>
+		</p>
+		<p>
+			<label><?php esc_html_e('包含 ID', 'aksrt'); ?>
+				<input class="widefat" type="text" name="<?php echo esc_attr($this->get_field_name('include')); ?>" value="<?php echo esc_attr((string) ($instance['include'] ?? '')); ?>">
+			</label>
+		</p>
+		<p>
+			<label><?php esc_html_e('排除 ID', 'aksrt'); ?>
+				<input class="widefat" type="text" name="<?php echo esc_attr($this->get_field_name('exclude')); ?>" value="<?php echo esc_attr((string) ($instance['exclude'] ?? '')); ?>">
+			</label>
+		</p>
+		<p>
+			<label><input type="checkbox" name="<?php echo esc_attr($this->get_field_name('show_count')); ?>" value="1" <?php checked(!isset($instance['show_count']) || !empty($instance['show_count'])); ?>> <?php esc_html_e('显示数量', 'aksrt'); ?></label><br>
+			<label><input type="checkbox" name="<?php echo esc_attr($this->get_field_name('hide_empty')); ?>" value="1" <?php checked(!isset($instance['hide_empty']) || !empty($instance['hide_empty'])); ?>> <?php esc_html_e('隐藏空分类', 'aksrt'); ?></label><br>
+			<label><input type="checkbox" name="<?php echo esc_attr($this->get_field_name('hierarchical')); ?>" value="1" <?php checked(!empty($instance['hierarchical'])); ?>> <?php esc_html_e('层级', 'aksrt'); ?></label>
 		</p>
 		<?php
 	}
 
-	public function update($new, $old) {
+	public function update($new_instance, $old_instance): array {
+		$orderby = sanitize_key((string) ($new_instance['orderby'] ?? 'count'));
+		if (!in_array($orderby, ['count', 'name', 'id', 'slug'], true)) {
+			$orderby = 'count';
+		}
 		return [
-			'title' => sanitize_text_field($new['title']),
-			'count' => absint($new['count']),
+			'title'        => sanitize_text_field((string) ($new_instance['title'] ?? '')),
+			'count'        => max(1, min(50, (int) ($new_instance['count'] ?? 8))),
+			'orderby'      => $orderby,
+			'order'        => strtoupper((string) ($new_instance['order'] ?? 'DESC')) === 'ASC' ? 'ASC' : 'DESC',
+			'parent'       => max(0, (int) ($new_instance['parent'] ?? 0)),
+			'include'      => sanitize_text_field((string) ($new_instance['include'] ?? '')),
+			'exclude'      => sanitize_text_field((string) ($new_instance['exclude'] ?? '')),
+			'show_count'   => !empty($new_instance['show_count']) ? 1 : 0,
+			'hide_empty'   => !empty($new_instance['hide_empty']) ? 1 : 0,
+			'hierarchical' => !empty($new_instance['hierarchical']) ? 1 : 0,
 		];
 	}
 }
diff --git a/src/AKSRT/Widgets/IconCardsWidget.php b/src/AKSRT/Widgets/IconCardsWidget.php
index 84e422c8..1237a020 100644
--- a/src/AKSRT/Widgets/IconCardsWidget.php
+++ b/src/AKSRT/Widgets/IconCardsWidget.php
@@ -1,5 +1,7 @@
 <?php
 /**
+ * Vertical icon cards grid (zibll zib_widget_ui_icon_card).
+ *
  * @package AKSRT
  */
 
@@ -9,91 +11,134 @@ defined('ABSPATH') || exit;
 
 class IconCardsWidget extends \WP_Widget {
 
-    public function __construct() {
-        parent::__construct('aksrt_icon_cards', esc_html__('AKSRT 图标卡片', 'aksrt'), [
-            'description' => esc_html__('显示图标+文字卡片网格', 'aksrt'),
-        ]);
-    }
+	public function __construct() {
+		parent::__construct('aksrt_icon_cards', esc_html__('AKSRT 图标卡片', 'aksrt'), [
+			'description' => esc_html__('图标在上、文案在下的竖版图标卡片网格。', 'aksrt'),
+		]);
+	}
 
-    public function widget($args, $instance): void {
-        echo $args['before_widget'];
-        $title = apply_filters('widget_title', $instance['title'] ?? '', $instance, $this->id_base);
-        $cards = isset($instance['cards']) && is_array($instance['cards']) ? $instance['cards'] : [];
-        $columns = max(1, min(4, (int) ($instance['columns'] ?? 2)));
+	public function widget($args, $instance): void {
+		$cards = isset($instance['cards']) && is_array($instance['cards']) ? $instance['cards'] : [];
+		$columns = max(1, min(4, (int) ($instance['columns'] ?? $instance['pc_row'] ?? 2)));
+		$m_cols = max(1, min(3, (int) ($instance['m_row'] ?? 2)));
+		$go_link = !empty($instance['go_link']);
+		$show_bg = !isset($instance['show_widget_bg']) || !empty($instance['show_widget_bg']);
+		$icon_size = max(18, min(48, (int) ($instance['icon_size'] ?? 28)));
 
-        if ($title) echo $args['before_title'] . esc_html($title) . $args['after_title'];
+		$valid = [];
+		foreach ($cards as $card) {
+			if (!is_array($card)) {
+				continue;
+			}
+			$title = sanitize_text_field((string) ($card['title'] ?? ''));
+			if ($title === '') {
+				continue;
+			}
+			$url = esc_url_raw(trim((string) ($card['link'] ?? $card['url'] ?? '')));
+			if ($url !== '' && $go_link && function_exists('aksrt_go_link')) {
+				$url = aksrt_go_link($url, true);
+			}
+			$valid[] = [
+				'title' => $title,
+				'icon'  => sanitize_text_field((string) ($card['icon'] ?? '')),
+				'desc'  => sanitize_text_field((string) ($card['description'] ?? $card['desc'] ?? '')),
+				'url'   => $url,
+			];
+		}
+		if (!$valid) {
+			return;
+		}
 
-        if (!empty($cards)) : ?>
-            <div class="widget-icon-cards" style="--ic-columns:<?php echo (int) $columns; ?>;">
-                <?php foreach ($cards as $card) :
-                    $card_title = sanitize_text_field($card['title'] ?? '');
-                    $card_icon  = sanitize_text_field($card['icon'] ?? '');
-                    $card_link  = esc_url($card['link'] ?? '');
-                    $card_desc  = sanitize_text_field($card['description'] ?? '');
-                    if ($card_title === '') continue;
-                    $tag = $card_link !== '' ? 'a' : 'div';
-                    $extra = $card_link !== '' ? ' href="' . $card_link . '" target="_blank" rel="noopener"' : '';
-                ?>
-                <<?php echo $tag; ?> class="widget-icon-cards__item"<?php echo $extra; ?>>
-                    <?php if ($card_icon) : ?>
-                        <div class="widget-icon-cards__icon"><i class="<?php echo esc_attr($card_icon); ?>" aria-hidden="true"></i></div>
-                    <?php endif; ?>
-                    <div class="widget-icon-cards__text">
-                        <div class="widget-icon-cards__title"><?php echo esc_html($card_title); ?></div>
-                        <?php if ($card_desc) : ?>
-                            <div class="widget-icon-cards__desc"><?php echo esc_html($card_desc); ?></div>
-                        <?php endif; ?>
-                    </div>
-                </<?php echo $tag; ?>>
-                <?php endforeach; ?>
-            </div>
-        <?php endif;
+		echo $args['before_widget']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+		$title = apply_filters('widget_title', (string) ($instance['title'] ?? ''), $instance, $this->id_base);
+		if ($title !== '') {
+			echo $args['before_title'] . esc_html($title) . $args['after_title']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+		}
 
-        echo $args['after_widget'];
-    }
+		$style = sprintf('--ic-columns:%d;--ic-m-columns:%d;--ic-icon:%dpx;', $columns, $m_cols, $icon_size);
+		echo '<div class="widget-icon-cards' . ($show_bg ? '' : ' is-bare') . '" style="' . esc_attr($style) . '">';
+		foreach ($valid as $card) {
+			$tag = $card['url'] !== '' ? 'a' : 'div';
+			$extra = $card['url'] !== '' ? ' href="' . esc_url($card['url']) . '" target="_blank" rel="noopener noreferrer"' : '';
+			echo '<' . $tag . ' class="widget-icon-cards__item is-vertical"' . $extra . '>';
+			if ($card['icon'] !== '') {
+				echo '<div class="widget-icon-cards__icon"><i class="' . esc_attr($card['icon']) . '" aria-hidden="true"></i></div>';
+			}
+			echo '<div class="widget-icon-cards__text">';
+			echo '<div class="widget-icon-cards__title">' . esc_html($card['title']) . '</div>';
+			if ($card['desc'] !== '') {
+				echo '<div class="widget-icon-cards__desc">' . esc_html($card['desc']) . '</div>';
+			}
+			echo '</div></' . $tag . '>';
+		}
+		echo '</div>';
 
-    public function form($instance): void {
-        $cards = isset($instance['cards']) && is_array($instance['cards']) ? $instance['cards'] : [];
-        while (count($cards) < 4) {
-            $cards[] = ['title' => '', 'icon' => '', 'link' => '', 'description' => ''];
-        }
-        ?>
-        <p>
-            <label for="<?php echo $this->get_field_id('title'); ?>"><?php esc_html_e('标题（可选）:', 'aksrt'); ?></label>
-            <input class="widefat" type="text" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" value="<?php echo esc_attr($instance['title'] ?? ''); ?>">
-        </p>
-        <p>
-            <label for="<?php echo $this->get_field_id('columns'); ?>"><?php esc_html_e('列数:', 'aksrt'); ?></label>
-            <input class="tiny-text" type="number" min="1" max="4" id="<?php echo $this->get_field_id('columns'); ?>" name="<?php echo $this->get_field_name('columns'); ?>" value="<?php echo (int) ($instance['columns'] ?? 2); ?>">
-        </p>
-        <hr>
-        <?php foreach ($cards as $i => $card) : ?>
-        <div style="border:1px solid #ddd;padding:6px;margin-bottom:6px;border-radius:4px;">
-            <p style="margin:0 0 4px;"><input class="widefat" type="text" name="<?php echo $this->get_field_name("cards[{$i}][title]"); ?>" value="<?php echo esc_attr($card['title']); ?>" placeholder="<?php esc_attr_e('标题', 'aksrt'); ?>"></p>
-            <p style="margin:0 0 4px;"><input class="widefat" type="text" name="<?php echo $this->get_field_name("cards[{$i}][icon]"); ?>" value="<?php echo esc_attr($card['icon']); ?>" placeholder="<?php esc_attr_e('图标类名 (如 fas fa-star)', 'aksrt'); ?>"></p>
-            <p style="margin:0 0 4px;"><input class="widefat" type="text" name="<?php echo $this->get_field_name("cards[{$i}][description]"); ?>" value="<?php echo esc_attr($card['description']); ?>" placeholder="<?php esc_attr_e('描述（可选）', 'aksrt'); ?>"></p>
-            <p style="margin:0;"><input class="widefat" type="url" name="<?php echo $this->get_field_name("cards[{$i}][link]"); ?>" value="<?php echo esc_attr($card['link']); ?>" placeholder="<?php esc_attr_e('链接（可选）', 'aksrt'); ?>"></p>
-        </div>
-        <?php endforeach;
-    }
+		echo $args['after_widget']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+	}
 
-    public function update($new_instance, $old_instance): array {
-        $cards = [];
-        if (isset($new_instance['cards']) && is_array($new_instance['cards'])) {
-            foreach ($new_instance['cards'] as $card) {
-                if (!is_array($card)) continue;
-                $cards[] = [
-                    'title'       => sanitize_text_field($card['title'] ?? ''),
-                    'icon'        => sanitize_text_field($card['icon'] ?? ''),
-                    'link'        => esc_url_raw($card['link'] ?? ''),
-                    'description' => sanitize_text_field($card['description'] ?? ''),
-                ];
-            }
-        }
-        return [
-            'title'   => sanitize_text_field($new_instance['title'] ?? ''),
-            'columns' => max(1, min(4, (int) ($new_instance['columns'] ?? 2))),
-            'cards'   => $cards,
-        ];
-    }
+	public function form($instance): void {
+		$cards = isset($instance['cards']) && is_array($instance['cards']) ? $instance['cards'] : [];
+		while (count($cards) < 4) {
+			$cards[] = ['title' => '', 'icon' => '', 'link' => '', 'description' => ''];
+		}
+		?>
+		<p>
+			<label><?php esc_html_e('标题（可选）:', 'aksrt'); ?>
+				<input class="widefat" type="text" name="<?php echo esc_attr($this->get_field_name('title')); ?>" value="<?php echo esc_attr((string) ($instance['title'] ?? '')); ?>">
+			</label>
+		</p>
+		<p>
+			<label><?php esc_html_e('PC 列数:', 'aksrt'); ?>
+				<input class="tiny-text" type="number" min="1" max="4" name="<?php echo esc_attr($this->get_field_name('columns')); ?>" value="<?php echo esc_attr((string) ((int) ($instance['columns'] ?? 2))); ?>">
+			</label>
+			<label><?php esc_html_e('移动列数', 'aksrt'); ?>
+				<input class="tiny-text" type="number" min="1" max="3" name="<?php echo esc_attr($this->get_field_name('m_row')); ?>" value="<?php echo esc_attr((string) ((int) ($instance['m_row'] ?? 2))); ?>">
+			</label>
+		</p>
+		<p>
+			<label><input type="checkbox" name="<?php echo esc_attr($this->get_field_name('go_link')); ?>" value="1" <?php checked(!empty($instance['go_link'])); ?>> <?php esc_html_e('外链跳转页', 'aksrt'); ?></label>
+			<label><input type="checkbox" name="<?php echo esc_attr($this->get_field_name('show_widget_bg')); ?>" value="1" <?php checked(!isset($instance['show_widget_bg']) || !empty($instance['show_widget_bg'])); ?>> <?php esc_html_e('卡片背景', 'aksrt'); ?></label>
+		</p>
+		<hr>
+		<?php foreach ($cards as $i => $card) : ?>
+			<div style="border:1px solid #ddd;padding:6px;margin-bottom:6px;border-radius:4px;">
+				<input class="widefat" type="text" name="<?php echo esc_attr($this->get_field_name("cards[{$i}][title]")); ?>" value="<?php echo esc_attr((string) ($card['title'] ?? '')); ?>" placeholder="<?php esc_attr_e('标题', 'aksrt'); ?>">
+				<input class="widefat" type="text" name="<?php echo esc_attr($this->get_field_name("cards[{$i}][icon]")); ?>" value="<?php echo esc_attr((string) ($card['icon'] ?? '')); ?>" placeholder="<?php esc_attr_e('图标类名', 'aksrt'); ?>">
+				<input class="widefat" type="text" name="<?php echo esc_attr($this->get_field_name("cards[{$i}][description]")); ?>" value="<?php echo esc_attr((string) ($card['description'] ?? '')); ?>" placeholder="<?php esc_attr_e('描述', 'aksrt'); ?>">
+				<input class="widefat" type="url" name="<?php echo esc_attr($this->get_field_name("cards[{$i}][link]")); ?>" value="<?php echo esc_attr((string) ($card['link'] ?? '')); ?>" placeholder="<?php esc_attr_e('链接', 'aksrt'); ?>">
+			</div>
+		<?php endforeach;
+	}
+
+	public function update($new_instance, $old_instance): array {
+		$cards = [];
+		if (isset($new_instance['cards']) && is_array($new_instance['cards'])) {
+			foreach ($new_instance['cards'] as $card) {
+				if (!is_array($card)) {
+					continue;
+				}
+				$title = sanitize_text_field((string) ($card['title'] ?? ''));
+				if ($title === '') {
+					continue;
+				}
+				$cards[] = [
+					'title'       => $title,
+					'icon'        => sanitize_text_field((string) ($card['icon'] ?? '')),
+					'link'        => esc_url_raw(trim((string) ($card['link'] ?? ''))),
+					'description' => sanitize_text_field((string) ($card['description'] ?? '')),
+				];
+				if (count($cards) >= 12) {
+					break;
+				}
+			}
+		}
+		return [
+			'title'          => sanitize_text_field((string) ($new_instance['title'] ?? '')),
+			'columns'        => max(1, min(4, (int) ($new_instance['columns'] ?? 2))),
+			'm_row'          => max(1, min(3, (int) ($new_instance['m_row'] ?? 2))),
+			'go_link'        => !empty($new_instance['go_link']) ? 1 : 0,
+			'show_widget_bg' => !empty($new_instance['show_widget_bg']) ? 1 : 0,
+			'cards'          => $cards,
+		];
+	}
 }
diff --git a/src/AKSRT/Widgets/TagCloudWidget.php b/src/AKSRT/Widgets/TagCloudWidget.php
index 22eeb779..53044419 100644
--- a/src/AKSRT/Widgets/TagCloudWidget.php
+++ b/src/AKSRT/Widgets/TagCloudWidget.php
@@ -1,5 +1,7 @@
 <?php
 /**
+ * Tag cloud (zibll widget_ui_tag_cloud lite).
+ *
  * @package AKSRT
  */
 
@@ -13,60 +15,138 @@ class TagCloudWidget extends \WP_Widget {
 		parent::__construct(
 			'aksrt_tag_cloud',
 			esc_html__('AKSRT 标签云', 'aksrt'),
-			array(
-				'description' => esc_html__('展示文章标签云', 'aksrt'),
+			[
+				'description'                 => esc_html__('展示文章标签/分类云', 'aksrt'),
 				'customize_selective_refresh' => true,
-			)
+			]
 		);
 	}
 
-	public function widget($args, $instance) {
-		echo $args['before_widget'];
+	public function widget($args, $instance): void {
+		echo $args['before_widget']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+		$title = apply_filters('widget_title', (string) ($instance['title'] ?? ''), $instance, $this->id_base);
+		if ($title !== '') {
+			echo $args['before_title'] . esc_html($title) . $args['after_title']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+		}
 
-		$title = apply_filters('widget_title', $instance['title'], $instance, $this->id_base);
-		$count = absint($instance['count'] ?: 15);
+		$taxonomy = sanitize_key((string) ($instance['taxonomy'] ?? 'post_tag'));
+		if (!taxonomy_exists($taxonomy)) {
+			$taxonomy = 'post_tag';
+		}
+		$number = max(1, min(80, (int) ($instance['count'] ?? $instance['number'] ?? 15)));
+		$orderby = sanitize_key((string) ($instance['orderby'] ?? 'count'));
+		if (!in_array($orderby, ['count', 'name', 'id'], true)) {
+			$orderby = 'count';
+		}
+		$show_count = !empty($instance['show_count']);
+		$blank = !empty($instance['blank']);
+		$color = sanitize_html_class((string) ($instance['color'] ?? 'rand'));
+		$fixed_width = !empty($instance['fixed_width']);
 
-		if ($title): ?>
-			<h3 class="widget-title"><?php echo $title; ?></h3>
-		<?php endif;
-		?>
+		$tags = get_terms([
+			'taxonomy'   => $taxonomy,
+			'orderby'    => $orderby,
+			'order'      => 'DESC',
+			'number'     => $number,
+			'hide_empty' => !empty($instance['hide_empty']),
+		]);
+		if (is_wp_error($tags) || !$tags) {
+			echo $args['after_widget']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+			return;
+		}
 
-		<div class="tag-cloud">
-			<?php
-			$tags = get_tags(['number' => $count, 'orderby' => 'count', 'order' => 'DESC']);
-			foreach ($tags as $tag):
-				$size = 12 + min(4, (int)($tag->count / 5));
-			?>
-				<a href="<?php echo esc_url(get_tag_link($tag->term_id)); ?>" style="font-size:<?php echo $size ?>px;">#<?php echo esc_html($tag->name); ?></a>
-			<?php endforeach; ?>
-		</div>
-		<?php
-		echo $args['after_widget'];
+		$palette = ['c-blue', 'c-yellow', 'c-green', 'c-purple', 'c-red', '', 'c-blue-2', 'c-yellow-2', 'c-green-2', 'c-purple-2', 'c-red-2', ''];
+		$i = random_int(0, 10);
+		$wrap = 'tag-cloud aksrt-tag-cloud author-tag' . ($fixed_width ? ' fixed-width' : '');
+		echo '<div class="' . esc_attr($wrap) . '">';
+		foreach ($tags as $tag) {
+			$url = get_term_link($tag);
+			if (is_wp_error($url)) {
+				continue;
+			}
+			$cls = 'but';
+			if ($color === 'rand') {
+				if ($i > 10) {
+					$i = 0;
+				}
+				$cls .= ' ' . $palette[$i];
+				$i++;
+			} elseif ($color !== '') {
+				$cls .= ' ' . $color;
+			}
+			$tgt = $blank ? ' target="_blank" rel="noopener noreferrer"' : '';
+			$count = $show_count ? '<span class="em09 tag-count"> (' . (int) $tag->count . ')</span>' : '';
+			echo '<a href="' . esc_url($url) . '" class="text-ellipsis ' . esc_attr(trim($cls)) . '"' . $tgt . '>' . esc_html($tag->name) . $count . '</a>'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+		}
+		echo '</div>';
+
+		echo $args['after_widget']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 	}
 
-	public function form($instance) {
-		$title = $instance['title'] ?? __('标签云', 'aksrt');
-		$count = isset($instance['count']) ? (int)$instance['count'] : 15;
+	public function form($instance): void {
+		$taxs = get_taxonomies(['public' => true], 'objects');
 		?>
 		<p>
-			<label for="<?php echo $this->get_field_id('title'); ?>"><?php esc_html_e('标题:', 'aksrt'); ?></label>
-			<input class="widefat" id="<?php echo $this->get_field_id('title'); ?>"
-			       name="<?php echo $this->get_field_name('title'); ?>"
-			       type="text" value="<?php echo esc_attr($title); ?>">
+			<label><?php esc_html_e('标题:', 'aksrt'); ?>
+				<input class="widefat" type="text" name="<?php echo esc_attr($this->get_field_name('title')); ?>" value="<?php echo esc_attr((string) ($instance['title'] ?? __('标签云', 'aksrt'))); ?>">
+			</label>
 		</p>
 		<p>
-			<label for="<?php echo $this->get_field_id('count'); ?>"><?php esc_html_e('标签数量:', 'aksrt'); ?></label>
-			<input class="tiny-text" id="<?php echo $this->get_field_id('count'); ?>"
-			       name="<?php echo $this->get_field_name('count'); ?>"
-			       type="number" min="1" max="50" value="<?php echo $count; ?>">
+			<label><?php esc_html_e('分类法', 'aksrt'); ?>
+				<select class="widefat" name="<?php echo esc_attr($this->get_field_name('taxonomy')); ?>">
+					<?php foreach ($taxs as $tax) : ?>
+						<option value="<?php echo esc_attr($tax->name); ?>" <?php selected(($instance['taxonomy'] ?? 'post_tag'), $tax->name); ?>><?php echo esc_html($tax->labels->name); ?></option>
+					<?php endforeach; ?>
+				</select>
+			</label>
+		</p>
+		<p>
+			<label><?php esc_html_e('标签数量:', 'aksrt'); ?>
+				<input class="tiny-text" type="number" min="1" max="80" name="<?php echo esc_attr($this->get_field_name('count')); ?>" value="<?php echo esc_attr((string) ((int) ($instance['count'] ?? 15))); ?>">
+			</label>
+		</p>
+		<p>
+			<label><?php esc_html_e('排序', 'aksrt'); ?>
+				<select name="<?php echo esc_attr($this->get_field_name('orderby')); ?>">
+					<option value="count" <?php selected(($instance['orderby'] ?? 'count'), 'count'); ?>><?php esc_html_e('数量', 'aksrt'); ?></option>
+					<option value="name" <?php selected(($instance['orderby'] ?? ''), 'name'); ?>><?php esc_html_e('名称', 'aksrt'); ?></option>
+					<option value="id" <?php selected(($instance['orderby'] ?? ''), 'id'); ?>><?php esc_html_e('ID', 'aksrt'); ?></option>
+				</select>
+			</label>
+		</p>
+		<p>
+			<label><?php esc_html_e('颜色', 'aksrt'); ?>
+				<select name="<?php echo esc_attr($this->get_field_name('color')); ?>">
+					<option value="rand" <?php selected(($instance['color'] ?? 'rand'), 'rand'); ?>><?php esc_html_e('随机', 'aksrt'); ?></option>
+					<option value="c-blue" <?php selected(($instance['color'] ?? ''), 'c-blue'); ?>><?php esc_html_e('蓝', 'aksrt'); ?></option>
+					<option value="c-green" <?php selected(($instance['color'] ?? ''), 'c-green'); ?>><?php esc_html_e('绿', 'aksrt'); ?></option>
+					<option value="c-yellow" <?php selected(($instance['color'] ?? ''), 'c-yellow'); ?>><?php esc_html_e('黄', 'aksrt'); ?></option>
+					<option value="c-purple" <?php selected(($instance['color'] ?? ''), 'c-purple'); ?>><?php esc_html_e('紫', 'aksrt'); ?></option>
+					<option value="c-red" <?php selected(($instance['color'] ?? ''), 'c-red'); ?>><?php esc_html_e('红', 'aksrt'); ?></option>
+					<option value="" <?php selected(($instance['color'] ?? ''), ''); ?>><?php esc_html_e('默认', 'aksrt'); ?></option>
+				</select>
+			</label>
+		</p>
+		<p>
+			<label><input type="checkbox" name="<?php echo esc_attr($this->get_field_name('show_count')); ?>" value="1" <?php checked(!empty($instance['show_count'])); ?>> <?php esc_html_e('显示数量', 'aksrt'); ?></label><br>
+			<label><input type="checkbox" name="<?php echo esc_attr($this->get_field_name('blank')); ?>" value="1" <?php checked(!empty($instance['blank'])); ?>> <?php esc_html_e('新窗口', 'aksrt'); ?></label><br>
+			<label><input type="checkbox" name="<?php echo esc_attr($this->get_field_name('fixed_width')); ?>" value="1" <?php checked(!empty($instance['fixed_width'])); ?>> <?php esc_html_e('固定宽度', 'aksrt'); ?></label><br>
+			<label><input type="checkbox" name="<?php echo esc_attr($this->get_field_name('hide_empty')); ?>" value="1" <?php checked(!empty($instance['hide_empty'])); ?>> <?php esc_html_e('隐藏空标签', 'aksrt'); ?></label>
 		</p>
 		<?php
 	}
 
-	public function update($new, $old) {
+	public function update($new_instance, $old_instance): array {
 		return [
-			'title' => sanitize_text_field($new['title']),
-			'count' => absint($new['count']),
+			'title'       => sanitize_text_field((string) ($new_instance['title'] ?? '')),
+			'taxonomy'    => sanitize_key((string) ($new_instance['taxonomy'] ?? 'post_tag')),
+			'count'       => max(1, min(80, (int) ($new_instance['count'] ?? 15))),
+			'orderby'     => in_array(($new_instance['orderby'] ?? ''), ['count', 'name', 'id'], true) ? $new_instance['orderby'] : 'count',
+			'color'       => sanitize_html_class((string) ($new_instance['color'] ?? 'rand')),
+			'show_count'  => !empty($new_instance['show_count']) ? 1 : 0,
+			'blank'       => !empty($new_instance['blank']) ? 1 : 0,
+			'fixed_width' => !empty($new_instance['fixed_width']) ? 1 : 0,
+			'hide_empty'  => !empty($new_instance['hide_empty']) ? 1 : 0,
 		];
 	}
 }