From 643ba29658013e98cff3e10f22d29df6cef9632e Mon Sep 17 00:00:00 2001 From: codex Date: Wed, 4 Nov 2026 01:44:48 +0800 Subject: [PATCH] fix: show dual stack reservation addresses --- web/public/cloud/admin-resources.js | 4 +++- web/tests/AdminResourceSchedulingContractTest.php | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/web/public/cloud/admin-resources.js b/web/public/cloud/admin-resources.js index c40bdfb2..829ed9cb 100644 --- a/web/public/cloud/admin-resources.js +++ b/web/public/cloud/admin-resources.js @@ -341,7 +341,9 @@ function showReservation(id, opener) { ['资源', `${item.cpu_cores} 核 / ${item.memory_mib} MiB / ${item.disk_gib} GiB`], ['订单', item.order_id ? `#${item.order_id}` : '未关联'], ['销售方案', item.offer_name || (item.offer_id ? `#${item.offer_id}` : '未关联')], ['用户', `#${item.user_id}`], ['宿主机', item.host_name || (item.host_id ? `#${item.host_id}` : '尚未选择')], - ['实例', item.instance_id ? `#${item.instance_id}` : '未关联'], ['公网 IP', item.public_ip || '未分配'], + ['实例', item.instance_id ? `#${item.instance_id}` : '未关联'], + ['公网 IPv4', item.public_ipv4 || '未分配'], + ['公网 IPv6', item.public_ipv6 || '未分配'], ['到期时间', formatTime(item.expires_at)], ['释放时间', formatTime(item.released_at)], ['释放原因', item.release_reason || '未记录'], ['创建时间', formatTime(item.created_at)], ['更新时间', formatTime(item.updated_at)], ]; diff --git a/web/tests/AdminResourceSchedulingContractTest.php b/web/tests/AdminResourceSchedulingContractTest.php index 44ff26dd..6ec879f1 100644 --- a/web/tests/AdminResourceSchedulingContractTest.php +++ b/web/tests/AdminResourceSchedulingContractTest.php @@ -150,6 +150,10 @@ $assert(str_contains($script, 'window.VenixDrawerMotion') && str_contains($script, 'codeInput.disabled = Boolean(item)') && str_contains($script, 'data-resource-local-filter'), 'Resource JavaScript must use shared motion and CSRF without duplicating authorization rules.'); +$assert(str_contains($script, "['公网 IPv4', item.public_ipv4 || '未分配']") + && str_contains($script, "['公网 IPv6', item.public_ipv6 || '未分配']") + && !str_contains($script, "['公网 IP', item.public_ip || '未分配']"), + 'Reservation details must render both public address families instead of the retired IPv4 alias.'); $assert(str_contains($template, '国家 / 地区') && str_contains($template, '{foreach $resource_page.country_options as $country}') && str_contains($template, 'id="resource-code-label"')