diff --git a/web/public/cloud/styles.css b/web/public/cloud/styles.css index 3240d1e2..f25e530a 100644 --- a/web/public/cloud/styles.css +++ b/web/public/cloud/styles.css @@ -374,7 +374,22 @@ body.vu-body .ssh-key-picker-manage:hover { #cloud-vpcs-workspace .vm-settings-status { margin:0 0 18px; font-size:13px; line-height:1.6; } .cloud-vpc-notice { margin-bottom:20px; } .cloud-vpc-list-panel,.cloud-vpc-create-panel,.cloud-vpc-members-panel { min-height:0; min-width:0; overflow:hidden; } -.cloud-vpc-list { min-width:0; } +.cloud-vpc-list { min-width:0; padding:20px 22px; } +.cloud-vpc-network-list { display:grid; gap:12px; min-width:0; } +.cloud-vpc-network-card { display:grid; grid-template-columns:minmax(220px,1.2fr) minmax(160px,.8fr) minmax(72px,auto) auto 26px; align-items:center; gap:18px; min-width:0; min-height:72px; padding:14px 18px; border:1px solid #dbe6eb; border-radius:14px; background:#fff; color:inherit; text-decoration:none; transition:border-color .16s ease,background .16s ease,box-shadow .16s ease; } +.cloud-vpc-network-card:hover { border-color:#b6dfe1; background:#fbfefe; box-shadow:0 8px 24px rgba(31,73,87,.055); } +.cloud-vpc-network-card:focus-visible { outline:3px solid rgba(18,166,176,.22); outline-offset:2px; } +.cloud-vpc-network-identity { display:flex; align-items:center; gap:12px; min-width:0; } +.cloud-vpc-network-icon { display:grid; place-items:center; flex:0 0 38px; width:38px; height:38px; border-radius:11px; background:#eaf7f8; color:#178e98; font-size:18px; } +.cloud-vpc-network-title { display:grid; gap:4px; min-width:0; } +.cloud-vpc-network-title strong { color:#2c465a; font-size:14px; overflow-wrap:anywhere; } +.cloud-vpc-network-title small,.cloud-vpc-network-address small,.cloud-vpc-network-count small { color:#8496a4; font-size:10px; line-height:1.45; } +.cloud-vpc-network-address,.cloud-vpc-network-count { display:grid; gap:4px; min-width:0; } +.cloud-vpc-network-address code { color:#486579; font:600 12px/1.5 ui-monospace,SFMono-Regular,Menlo,Consolas,monospace; overflow-wrap:anywhere; } +.cloud-vpc-network-count strong { color:#50697a; font-size:12px; } +.cloud-vpc-network-card>.state-pill { justify-self:end; } +.cloud-vpc-network-arrow { display:grid; place-items:center; width:26px; height:26px; color:#738997; font-size:20px; } +.cloud-vpc-list>.cloud-vpc-empty { margin:0; } .cloud-vpc-table { width:100%; min-width:0; border-collapse:collapse; table-layout:fixed; text-align:left; font-size:13px; } .cloud-vpc-table th { height:auto; background:#f8fafb; color:#8797a5; font-size:11px; font-weight:750; padding:14px 20px; border-bottom:1px solid #e5ecf0; } .cloud-vpc-table td { height:auto; vertical-align:middle; padding:19px 20px; border:0; border-bottom:1px solid #e7edf1; font-size:13px; color:#526c7e; overflow-wrap:anywhere; } @@ -382,11 +397,6 @@ body.vu-body .ssh-key-picker-manage:hover { .cloud-vpc-table tbody tr:hover { background:#fcfefe; } .cloud-vpc-name-link { color:#344f62; font-weight:650; text-decoration:none; line-height:1.6; } .cloud-vpc-name-link:hover { color:#079ca8; text-decoration:underline; text-underline-offset:4px; } -.cloud-vpc-network-name small { display:block; color:#8295a2; margin-top:4px; font-size:11px; } -.cloud-vpc-network-table th:nth-child(1) { width:34%; } -.cloud-vpc-network-table th:nth-child(2) { width:30%; } -.cloud-vpc-network-table th:nth-child(3) { width:14%; } -.cloud-vpc-network-table th:nth-child(4) { width:22%; } .cloud-vpc-text-button { display:inline-flex; align-items:center; justify-content:center; gap:6px; min-height:32px; padding:3px 0; background:none; border:0; color:#078f9a; font-family:inherit; font-size:13px; font-weight:600; line-height:1.5; text-decoration:none; cursor:pointer; } .cloud-vpc-text-button:hover:not(:disabled) { color:#067580; text-decoration:underline; text-underline-offset:4px; } #cloud-vpcs-workspace .danger { color:#bf4d5a; } @@ -475,6 +485,14 @@ html.cloud-vpc-confirm-open { overflow:hidden; } .cloud-vpc-table th,.cloud-vpc-table td { padding-inline:14px; } .cloud-vpc-member-table th:first-child,.cloud-vpc-member-table td:first-child { width:40px; } } +@media(max-width:820px) { + .cloud-vpc-network-card { grid-template-columns:minmax(0,1fr) auto 26px; gap:10px 14px; } + .cloud-vpc-network-identity { grid-column:1; grid-row:1; } + .cloud-vpc-network-card>.state-pill { grid-column:2; grid-row:1; } + .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; } +} @media(max-width:760px) { #cloud-vpcs-workspace { padding-bottom:max(8px,env(safe-area-inset-bottom)); } #cloud-vpcs-workspace .cloud-vpcs-heading { align-items:stretch; flex-direction:column; gap:18px; margin-bottom:22px; } @@ -485,14 +503,7 @@ html.cloud-vpc-confirm-open { overflow:hidden; } .cloud-vpc-table tr { display:grid; padding:17px 16px; gap:13px 16px; border-bottom:1px solid #e6edf1; } .cloud-vpc-table tr:last-child { border-bottom:0; } .cloud-vpc-table td { padding:0; border:0; min-width:0; } - .cloud-vpc-table-address::before,.cloud-vpc-network-count::before { content:attr(data-label); display:block; margin-bottom:4px; font-family:inherit; font-size:10px; line-height:1.6; color:#8a9ca9; } - .cloud-vpc-network-table tbody { display:grid; gap:10px; padding:12px; background:#f5f8fa; } - .cloud-vpc-network-table tr,.cloud-vpc-network-table tr:last-child { border:1px solid #dfe8ed; border-radius:12px; background:#fff; } - .cloud-vpc-network-table tr { grid-template-columns:minmax(0,1fr) auto; } - .cloud-vpc-network-name { grid-column:1; grid-row:1; } - .cloud-vpc-network-status { grid-column:2; grid-row:1; justify-self:end; } - .cloud-vpc-network-table .cloud-vpc-table-address { grid-column:1; grid-row:2; } - .cloud-vpc-network-count { grid-column:2; grid-row:2; text-align:right; } + .cloud-vpc-table-address::before { content:attr(data-label); display:block; margin-bottom:4px; font-family:inherit; font-size:10px; line-height:1.6; color:#8a9ca9; } .cloud-vpc-members-panel { overflow:visible; } .cloud-vpc-member-table tbody { display:grid; gap:10px; padding:12px; background:#f5f8fa; } .cloud-vpc-member-table tbody tr { grid-template-columns:28px minmax(0,1fr) auto; gap:10px 12px; padding:16px 14px; border:1px solid #dfe8ed; border-radius:12px; background:#fff; } @@ -538,6 +549,12 @@ html.cloud-vpc-confirm-open { overflow:hidden; } .cloud-vpc-batch-actions { align-self:center; } .cloud-vpc-batch-actions .cloud-vpc-text-button { min-height:44px; } } +@media(max-width:510px) { + .cloud-vpc-list { padding-inline:16px; } + .cloud-vpc-network-list { gap:10px; } + .cloud-vpc-network-card { padding:14px; } + .cloud-vpc-network-card>.state-pill { max-width:120px; white-space:normal; text-align:center; } +} @media(max-width:400px) { .cloud-vpc-table tr { padding-inline:14px; } .cloud-vpc-confirm { padding:20px; } diff --git a/web/public/cloud/vpcs.js b/web/public/cloud/vpcs.js index 9b8f0fdc..99457ee7 100644 --- a/web/public/cloud/vpcs.js +++ b/web/public/cloud/vpcs.js @@ -358,6 +358,28 @@ function emptyState(title, description, href = '', action = '') { return box; } +function renderNetworkCard(vpc) { + const link = element('a', 'cloud-vpc-network-card'); + link.href = membersRouteHref(vpc); + const identity = element('span', 'cloud-vpc-network-identity'); + const icon = element('span', 'cloud-vpc-network-icon'); + const iconGlyph = element('i', 'mdi mdi-lan-connect'); + iconGlyph.setAttribute('aria-hidden', 'true'); + icon.append(iconGlyph); + const title = element('span', 'cloud-vpc-network-title'); + title.append(element('strong', '', vpc.name), element('small', '', vpc.region_name)); + identity.append(icon, title); + const address = element('span', 'cloud-vpc-network-address'); + address.append(element('small', '', '私网网段'), element('code', '', vpc.cidr)); + const count = element('span', 'cloud-vpc-network-count'); + count.append(element('small', '', '实例'), element('strong', '', `${vpc.port_count || 0} 台`)); + const [label, type] = activeBatchForVpc(vpc) ? ['变更中', 'other'] : vpcState(vpc.state); + const arrow = element('span', 'cloud-vpc-network-arrow', '›'); + arrow.setAttribute('aria-hidden', 'true'); + link.append(identity, address, count, element('span', `state-pill ${type}`, label), arrow); + return link; +} + function renderHome() { const list = byId('cloud-vpcs-list'); list.replaceChildren(); @@ -366,28 +388,10 @@ function renderHome() { '/user/cloud/vpcs?view=create', '创建 VPC')); return; } - const table = element('table', 'cloud-vpc-table cloud-vpc-network-table'); - table.setAttribute('aria-label', 'VPC 网络列表'); - table.append(tableHeader(['网络名称 / 地区', '私网网段', '实例', '状态'])); - const body = element('tbody'); - for (const vpc of state.items) { - const row = element('tr'); - const identity = tableCell('cloud-vpc-network-name', '网络'); - const link = element('a', 'cloud-vpc-name-link', vpc.name); - link.href = membersHref(vpc); - identity.append(link, element('small', '', vpc.region_name)); - const address = tableCell('cloud-vpc-table-address', '私网网段'); - address.append(element('code', '', vpc.cidr)); - const [label, type] = activeBatchForVpc(vpc) ? ['变更中', 'other'] : vpcState(vpc.state); - const status = tableCell('cloud-vpc-network-status', '状态'); - status.append(element('span', `state-pill ${type}`, label)); - row.append(identity, address, - tableCell('cloud-vpc-network-count', '实例', `${vpc.port_count || 0} 台`), - status); - body.append(row); - } - table.append(body); - list.append(table); + const networks = element('div', 'cloud-vpc-network-list'); + networks.setAttribute('aria-label', 'VPC 网络列表'); + networks.append(...state.items.map(renderNetworkCard)); + list.append(networks); } function canSelectInstance(instance, action, batchBlocked) { diff --git a/web/resources/views/venix/cloud/pages/vpcs.tpl b/web/resources/views/venix/cloud/pages/vpcs.tpl index 06f47271..332f3f11 100644 --- a/web/resources/views/venix/cloud/pages/vpcs.tpl +++ b/web/resources/views/venix/cloud/pages/vpcs.tpl @@ -12,15 +12,12 @@

我的网络

每张 VPC 仅连接同一地区的实例,私网地址由系统统一分配。

{$cloud_vpc_view.used|default:0|escape:'html'} / {$cloud_vpc_view.maximum|default:16|escape:'html'} 个
{if !empty($cloud_vpc_view.networks)} - - - {foreach $cloud_vpc_view.networks as $network} - - - - - {/foreach} -
网络名称 / 地区私网网段实例状态
{$network.name|escape:'html'}{$network.region_name|escape:'html'}{$network.cidr|escape:'html'}{$network.port_count|default:0|escape:'html'} 台{$network.state_label|escape:'html'}
+
{foreach $cloud_vpc_view.networks as $network} + + {$network.name|escape:'html'}{$network.region_name|escape:'html'} + 私网网段{$network.cidr|escape:'html'}实例{$network.port_count|default:0|escape:'html'} 台{$network.state_label|escape:'html'} + + {/foreach}
{else}
还没有 VPC

选择一个地区,建立你的第一张私有网络。

创建 VPC
{/if}
diff --git a/web/resources/views/venix/layout_assets.tpl b/web/resources/views/venix/layout_assets.tpl index b428ff1c..b2229a76 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='2026110110' scope='global'} +{assign var=venix_asset_version value='2026110111' scope='global'} diff --git a/web/tests/CloudUserFirstPaintViewTest.php b/web/tests/CloudUserFirstPaintViewTest.php index 44d0d240..1e93a527 100644 --- a/web/tests/CloudUserFirstPaintViewTest.php +++ b/web/tests/CloudUserFirstPaintViewTest.php @@ -80,7 +80,13 @@ foreach ([['query' => [], 'page' => 'home'], ['query' => ['view' => 'create'], ' $xpath = $render('vpcs', ['cloud_vpc_view' => $view]); $assert(!$one($xpath, 'cloud-vpcs-' . $case['page'])->hasAttribute('hidden'), 'VPC initial route is hidden before JavaScript.'); $assert($one($xpath, 'cloud-vpcs-quota')->textContent === '1 / 16 个', 'VPC first paint resets the quota to zero.'); - if ($case['page'] === 'home') $assert(str_contains($one($xpath, 'cloud-vpcs-list')->textContent, 'vpc-before-js'), 'VPC list is empty.'); + if ($case['page'] === 'home') { + $cards = $xpath->query('//*[contains(concat(" ", normalize-space(@class), " "), " cloud-vpc-network-card ")]'); + $assert(str_contains($one($xpath, 'cloud-vpcs-list')->textContent, 'vpc-before-js') + && $cards->length === 1 + && str_contains((string) $cards->item(0)?->getAttribute('href'), 'vpc=' . $key), + 'VPC first paint is missing its navigable network card.'); + } if ($case['page'] === 'create') $assert($xpath->query('//select[@id="cloud-vpc-region"]/option[@value="1"]')->length === 1, 'VPC regions wait for JavaScript.'); if ($case['page'] === 'members') { $text = $one($xpath, 'cloud-vpc-instance-manager')->textContent; diff --git a/web/tests/CloudVpcPageBehaviorTest.mjs b/web/tests/CloudVpcPageBehaviorTest.mjs index eb5f6dbc..fcb44dab 100644 --- a/web/tests/CloudVpcPageBehaviorTest.mjs +++ b/web/tests/CloudVpcPageBehaviorTest.mjs @@ -186,10 +186,14 @@ for (const [query, page, joining] of [ const t = await setup(); assert.equal(t.nodes.get('cloud-vpcs-home').hidden, false); assert.equal(t.nodes.get('cloud-vpcs-create').hidden, true); - assert.equal(t.nodes.get('cloud-vpcs-list').querySelector('tbody').children.length, 2); - assert.equal(t.nodes.get('cloud-vpcs-list').querySelectorAll('th').length, 4); + const networkCards = t.nodes.get('cloud-vpcs-list').querySelectorAll('.cloud-vpc-network-card'); + assert.equal(networkCards.length, 2); + assert.match(networkCards[0].textContent, /production.*香港.*10\.0\.1\.0\/24.*2 台.*运行正常/s); assert.equal(t.nodes.get('cloud-vpcs-list').textContent.includes('管理实例'), false); assert.equal(t.nodes.get('cloud-vpcs-list').querySelectorAll('details').length, 0); + await networkCards[0].fire('click'); + assert.equal(t.fullPageNavigations(), 0, 'Opening a VPC card must stay in the workspace'); + assert.equal(t.nodes.get('cloud-vpcs-members').hidden, false); await t.go('#/create'); assert.equal(t.nodes.get('cloud-vpcs-create').hidden, false); assert.equal(t.nodes.get('cloud-vpc-region').textContent.includes('200'), false); diff --git a/web/tests/CloudVpcUserContractTest.php b/web/tests/CloudVpcUserContractTest.php index 9389ea03..5086a89b 100644 --- a/web/tests/CloudVpcUserContractTest.php +++ b/web/tests/CloudVpcUserContractTest.php @@ -98,11 +98,14 @@ $assert(str_contains($template, 'id="cloud-vpcs-home"') && str_contains($styles, '.cloud-vpc-batch-status'), 'The VPC page must expose list, creation and member-management views.'); $assert(str_contains($javascript, 'function renderHome(') + && str_contains($javascript, 'function renderNetworkCard(') && str_contains($javascript, 'function renderInstanceManager(') && str_contains($javascript, 'function tableHeader(') && str_contains($javascript, "'已加入实例'") && str_contains($javascript, "'加入实例'") - && str_contains($javascript, "'cloud-vpc-table cloud-vpc-network-table'") + && str_contains($javascript, "'cloud-vpc-network-card'") + && str_contains($template, 'class="cloud-vpc-network-list"') + && str_contains($template, 'class="cloud-vpc-network-card"') && str_contains($javascript, "'cloud-vpc-table cloud-vpc-member-table'") && !str_contains($template, 'class="cloud-vpc-network-actions"') && !str_contains($javascript, "'cloud-vpc-network-actions'") @@ -116,7 +119,7 @@ $assert(str_contains($javascript, 'function renderHome(') && !str_contains($javascript, 'vpc-attach-batch') && str_contains($javascript, 'public_ipv4') && !str_contains($javascript, '可分配 ${region.available} 个子网'), - 'The VPC page must render and mutate member batches through the current table UI.'); + 'The VPC page must render network cards and mutate member batches through the current UI.'); $assert(str_contains($batchService, 'There is no selection-count limit') && str_contains($batchService, 'releaseAttachPortJobsLocked(') && str_contains($batchService, 'beginDetachCleanupLocked(') @@ -126,7 +129,9 @@ $assert(str_contains($batchService, 'There is no selection-count limit') $assert(str_contains($styles, '.cloud-vpc-table,.cloud-vpc-table tbody { display:block; }') && str_contains($styles, - '.cloud-vpc-table-address::before,.cloud-vpc-network-count::before { content:attr(data-label);') + '.cloud-vpc-table-address::before { content:attr(data-label);') + && str_contains($styles, '.cloud-vpc-network-list { display:grid;') + && str_contains($styles, '.cloud-vpc-network-card { display:grid;') && str_contains($styles, '.cloud-vpc-member-table tbody tr { grid-template-columns:28px') && str_contains($styles,