diff --git a/web/public/cloud/styles.css b/web/public/cloud/styles.css index 10aa828a..22d597fd 100644 --- a/web/public/cloud/styles.css +++ b/web/public/cloud/styles.css @@ -424,13 +424,12 @@ body.vu-body .ssh-key-picker-manage:hover { .cloud-vpc-create-form>.cloud-vpc-create-footer { padding:16px 22px; border-top:1px solid #e8eef2; background:#fbfcfd; } .cloud-vpc-title-row { display:flex; align-items:center; flex-wrap:wrap; gap:14px; } .cloud-vpc-title-row .state-pill { margin-bottom:8px; } -.cloud-vpc-network-overview { margin:0 0 20px; overflow:hidden; border:1px solid #e3eaef; border-radius:13px; background:#fff; box-shadow:0 10px 30px rgba(19,42,65,.027); } -.cloud-vpc-network-summary { display:grid; grid-template-columns:repeat(3,minmax(0,1fr)); margin:0; } -.cloud-vpc-network-summary>div { display:grid; gap:7px; min-width:0; padding:17px 21px; } -.cloud-vpc-network-summary>div+div { border-left:1px solid #edf1f4; } -.cloud-vpc-network-summary dt { font-size:10px; font-weight:750; color:#8a9aa7; } -.cloud-vpc-network-summary dd { font-size:13px; font-weight:700; margin:0; overflow-wrap:anywhere; } -.cloud-vpc-network-summary>div:not(:first-child) dd,.cloud-vpc-table-address code,.cloud-vpc-confirm-instances code { font:500 14px/1.6 ui-monospace,SFMono-Regular,Menlo,Consolas,monospace; color:#486579; background:none; padding:0; } +.cloud-vpc-members-overview { padding:20px 22px 18px; } +.cloud-vpc-facts { display:grid; grid-template-columns:repeat(4,minmax(0,1fr)); gap:10px; margin:0; } +.cloud-vpc-facts>div { display:grid; align-content:start; gap:5px; min-width:0; padding:13px 14px; border-radius:9px; background:#f7fafb; } +.cloud-vpc-facts dt { color:#8798a6; font-size:10px; font-weight:700; } +.cloud-vpc-facts dd { margin:0; color:#334e62; font-size:13px; font-weight:800; overflow-wrap:anywhere; } +.cloud-vpc-facts>div:nth-child(2) dd,.cloud-vpc-facts>div:nth-child(3) dd,.cloud-vpc-table-address code,.cloud-vpc-confirm-instances code { font:500 14px/1.6 ui-monospace,SFMono-Regular,Menlo,Consolas,monospace; color:#486579; background:none; padding:0; } .cloud-vpc-tabs { display:flex; gap:28px; padding:0 24px; border-bottom:1px solid #e5ecf0; } .cloud-vpc-tabs a { display:inline-flex; align-items:center; gap:7px; min-height:58px; padding:17px 0 15px; border-bottom:2px solid transparent; color:#7b909f; text-decoration:none; font-size:14px; font-weight:600; } .cloud-vpc-tabs a[aria-current="page"] { border-bottom-color:#0c9eaa; color:#078f9b; } @@ -494,6 +493,7 @@ html.cloud-vpc-confirm-open { overflow:hidden; } .cloud-vpc-network-address { grid-column:1; grid-row:2; } .cloud-vpc-network-count { grid-column:2; grid-row:2; justify-items:end; } .cloud-vpc-network-arrow { grid-column:3; grid-row:1/3; align-self:center; } + .cloud-vpc-facts { grid-template-columns:repeat(2,minmax(0,1fr)); } } @media(max-width:760px) { #cloud-vpcs-workspace { padding-bottom:max(8px,env(safe-area-inset-bottom)); } @@ -529,10 +529,6 @@ html.cloud-vpc-confirm-open { overflow:hidden; } .cloud-vpc-instance-status .cloud-vpc-text-button { min-height:40px; margin-top:0; } .cloud-vpc-create-fields { grid-template-columns:1fr; gap:22px; } .cloud-vpc-create-form .field input,.cloud-vpc-create-form .field select { font-size:16px; } - .cloud-vpc-network-summary { grid-template-columns:repeat(3,minmax(0,1fr)); } - .cloud-vpc-network-summary>div { gap:4px; padding:14px 12px; } - .cloud-vpc-network-summary dt { font-size:10px; } - .cloud-vpc-network-summary dd,.cloud-vpc-network-summary>div:not(:first-child) dd { font-size:12px; } .cloud-vpc-tabs { gap:22px; padding-inline:16px; background:#fff; } .cloud-vpc-tabs a { min-height:54px; padding-block:15px 13px; } .cloud-vpc-list-hint { padding:15px 16px; } @@ -560,13 +556,13 @@ html.cloud-vpc-confirm-open { overflow:hidden; } .cloud-vpc-allocation small,.cloud-vpc-allocation strong,.cloud-vpc-allocation>div>span { grid-column:1; grid-row:auto; } .cloud-vpc-create-form>.cloud-vpc-create-footer { align-items:stretch; flex-direction:column; padding:14px 16px 16px; } .cloud-vpc-create-form>.cloud-vpc-create-footer .button { width:100%; justify-content:center; } + .cloud-vpc-members-overview { padding:16px; } } @media(max-width:400px) { .cloud-vpc-table tr { padding-inline:14px; } .cloud-vpc-confirm { padding:20px; } .cloud-vpc-confirm-instances li { flex-wrap:wrap; gap:4px; } - .cloud-vpc-network-summary { grid-template-columns:1fr; } - .cloud-vpc-network-summary>div { grid-template-columns:100px minmax(0,1fr); align-items:center; padding:12px 14px; } - .cloud-vpc-network-summary>div+div { border-top:1px solid #edf1f4; border-left:0; } - .cloud-vpc-network-summary dd,.cloud-vpc-network-summary>div:not(:first-child) dd { text-align:right; } + .cloud-vpc-facts { grid-template-columns:1fr; } + .cloud-vpc-facts>div { grid-template-columns:100px minmax(0,1fr); align-items:center; padding:12px 14px; } + .cloud-vpc-facts dd,.cloud-vpc-facts>div:nth-child(2) dd,.cloud-vpc-facts>div:nth-child(3) dd { text-align:right; } } diff --git a/web/public/cloud/vpcs.js b/web/public/cloud/vpcs.js index 99457ee7..c483eba0 100644 --- a/web/public/cloud/vpcs.js +++ b/web/public/cloud/vpcs.js @@ -603,6 +603,7 @@ function renderMembers(vpc, joining) { summary.replaceChildren(); for (const [label, value] of [ ['地区', vpc.region_name], ['私网网段', vpc.cidr], ['默认网关', vpc.gateway], + ['已加入实例', `${instancesForVpc(vpc).length} 台`], ]) { const item = element('div'); item.append(element('dt', '', label), element('dd', '', value)); diff --git a/web/resources/views/venix/cloud/pages/vpcs.tpl b/web/resources/views/venix/cloud/pages/vpcs.tpl index af93a354..7d9c6e43 100644 --- a/web/resources/views/venix/cloud/pages/vpcs.tpl +++ b/web/resources/views/venix/cloud/pages/vpcs.tpl @@ -44,9 +44,9 @@
PRIVATE NETWORK

{$cloud_vpc_view.current.name|default:''|escape:'html'}

{$cloud_vpc_view.current.state_label|default:''|escape:'html'}

管理实例成员、私网地址和连接状态。

-
{if !empty($cloud_vpc_view.current)}
地区
{$cloud_vpc_view.current.region_name|escape:'html'}
私网网段
{$cloud_vpc_view.current.cidr|escape:'html'}
默认网关
{$cloud_vpc_view.current.gateway|escape:'html'}
{/if}
{if !empty($cloud_vpc_view.current.batch)}
正在应用私网变更共 {$cloud_vpc_view.current.batch.total|default:0|escape:'html'} 台 · {$cloud_vpc_view.current.batch.succeeded|default:0|escape:'html'} 台成功。离开页面不会中断任务。
{/if}
+
{if !empty($cloud_vpc_view.current)}
地区
{$cloud_vpc_view.current.region_name|escape:'html'}
私网网段
{$cloud_vpc_view.current.cidr|escape:'html'}
默认网关
{$cloud_vpc_view.current.gateway|escape:'html'}
已加入实例
{$cloud_vpc_view.member_count|default:0|escape:'html'} 台
{/if}
{if !empty($cloud_vpc_view.current)} diff --git a/web/resources/views/venix/layout_assets.tpl b/web/resources/views/venix/layout_assets.tpl index 03f14e24..18bb8e6f 100644 --- a/web/resources/views/venix/layout_assets.tpl +++ b/web/resources/views/venix/layout_assets.tpl @@ -1,2 +1,2 @@ {* Shared Venix CSS/JS cache key. Increment whenever a shared browser asset changes. *} -{assign var=venix_asset_version value='2026110112' scope='global'} +{assign var=venix_asset_version value='2026110113' scope='global'} diff --git a/web/tests/CloudUserFirstPaintViewTest.php b/web/tests/CloudUserFirstPaintViewTest.php index 119e0c89..fa2f7f01 100644 --- a/web/tests/CloudUserFirstPaintViewTest.php +++ b/web/tests/CloudUserFirstPaintViewTest.php @@ -95,10 +95,16 @@ foreach ([['query' => [], 'page' => 'home'], ['query' => ['view' => 'create'], ' } if ($case['page'] === 'members') { $text = $one($xpath, 'cloud-vpc-instance-manager')->textContent; + $summary = $one($xpath, 'cloud-vpc-network-summary')->textContent; $joining = ($case['query']['view'] ?? '') === 'join'; $assert(str_contains($text, $joining ? 'vm-candidate' : 'vm-member') && !str_contains($text, 'other-region') - && str_contains($text, $joining ? '192.0.2.8' : '10.0.1.2'), 'VPC members or addresses do not match the requested view.'); + && str_contains($text, $joining ? '192.0.2.8' : '10.0.1.2') + && str_contains($summary, '香港') + && str_contains($summary, '10.0.1.0/24') + && str_contains($summary, '10.0.1.1') + && str_contains($summary, '1 台'), + 'VPC members, network facts or addresses do not match the requested view.'); } } diff --git a/web/tests/CloudVpcPageBehaviorTest.mjs b/web/tests/CloudVpcPageBehaviorTest.mjs index fcb44dab..e93002f2 100644 --- a/web/tests/CloudVpcPageBehaviorTest.mjs +++ b/web/tests/CloudVpcPageBehaviorTest.mjs @@ -199,6 +199,9 @@ for (const [query, page, joining] of [ assert.equal(t.nodes.get('cloud-vpc-region').textContent.includes('200'), false); await t.go(href(A)); assert.equal(t.nodes.get('cloud-vpcs-members').hidden, false); + assert.equal(t.nodes.get('cloud-vpc-network-summary').children.length, 4); + assert.match(t.nodes.get('cloud-vpc-network-summary').textContent, + /地区香港私网网段10\.0\.1\.0\/24默认网关10\.0\.1\.1已加入实例2 台/); assert.match(t.nodes.get('cloud-vpc-members-link').textContent, /2/); assert.match(t.nodes.get('cloud-vpc-join-link').textContent, /5/); assert.equal(t.nodes.get('cloud-vpc-instance-manager').querySelectorAll('th').length, 5); diff --git a/web/tests/CloudVpcUserContractTest.php b/web/tests/CloudVpcUserContractTest.php index a0104957..0e8c4bd4 100644 --- a/web/tests/CloudVpcUserContractTest.php +++ b/web/tests/CloudVpcUserContractTest.php @@ -85,7 +85,8 @@ $assert(str_contains($template, 'id="cloud-vpcs-home"') && str_contains($template, 'class="inventory-panel cloud-vpc-members-panel"') && str_contains($template, 'class="eyebrow">PRIVATE NETWORKING') && str_contains($template, 'class="panel-heading">

我的网络

') - && str_contains($template, 'class="cloud-vpc-network-overview"') + && str_contains($template, 'class="cloud-vpc-members-overview"') + && str_contains($template, 'id="cloud-vpc-network-summary" class="cloud-vpc-facts"') && str_contains($template, 'class="cloud-vpc-create-form"') && str_contains($template, 'class="cloud-vpc-create-body"') && str_contains($template, 'class="cloud-vpc-allocation"') @@ -96,6 +97,7 @@ $assert(str_contains($template, 'id="cloud-vpcs-home"') && str_contains($styles, '.cloud-vpc-create-form') && str_contains($styles, '.cloud-vpc-create-body') && str_contains($styles, '.cloud-vpc-allocation-icon') + && str_contains($styles, '.cloud-vpc-facts') && str_contains($styles, '.cloud-vpc-create-footer') && str_contains($styles, '.cloud-vpc-table') && str_contains($styles, '.cloud-vpc-member-table')