diff --git a/web/public/cloud/styles.css b/web/public/cloud/styles.css
index d4aa1ce4..417395f1 100644
--- a/web/public/cloud/styles.css
+++ b/web/public/cloud/styles.css
@@ -444,13 +444,25 @@ body.vu-body .ssh-key-picker-manage:hover {
.cloud-vpc-instance-search-input { width:100%; min-height:46px; margin:0; padding:10px 14px 10px 43px; border:1px solid #dce6eb; border-radius:10px; background:#f9fbfc; color:#304a5d; font:inherit; font-size:14px; outline:none; }
.cloud-vpc-instance-search-input:focus { border-color:#79c9cd; background:#fff; box-shadow:0 0 0 3px rgba(20,160,170,.12); }
.cloud-vpc-instance-search-input::placeholder { color:#93a3ae; }
+.cloud-vpc-list-controls { display:flex; align-items:center; justify-content:space-between; padding:0 22px 12px; }
+.cloud-vpc-instance-list { display:grid; gap:8px; padding:0 22px 20px; }
+.cloud-vpc-instance-card { display:grid; grid-template-columns:28px minmax(150px,.75fr) minmax(280px,1.25fr) auto; align-items:center; gap:14px; min-width:0; padding:12px 14px; border:1px solid #e4ecef; border-radius:9px; background:#fbfdfd; }
+.cloud-vpc-instance-card.selected { border-color:#54bdc3; background:#f1fafa; box-shadow:inset 0 0 0 1px #54bdc3; }
+.cloud-vpc-instance-select { display:grid; place-items:center; align-self:stretch; cursor:pointer; }
+.cloud-vpc-instance-facts { display:grid; grid-template-columns:repeat(2,minmax(0,1fr)); gap:12px; margin:0; }
+.cloud-vpc-instance-facts>div { display:grid; gap:3px; min-width:0; }
+.cloud-vpc-instance-facts dt { color:#8a9aa7; font-size:9px; }
+.cloud-vpc-instance-facts dd { margin:0; color:#50697a; font-size:10px; font-weight:700; overflow-wrap:anywhere; }
+.cloud-vpc-instance-facts code { color:#486579; font:600 11px/1.5 ui-monospace,SFMono-Regular,Menlo,Consolas,monospace; overflow-wrap:anywhere; }
+.cloud-vpc-private-address dd>span { color:#8799a6; font-size:11px; }
+.cloud-vpc-instance-card .cloud-vpc-instance-status { justify-self:end; min-width:0; }
.cloud-vpc-member-table th:first-child,.cloud-vpc-member-table td:first-child { width:52px; padding-right:0; }
.cloud-vpc-member-table th:nth-child(2) { width:25%; }
.cloud-vpc-member-table th:nth-child(3),.cloud-vpc-member-table th:nth-child(4) { width:23%; }
-.cloud-vpc-member-table input[type="checkbox"],.cloud-vpc-confirm-check input { accent-color:#079ca8; width:17px; height:17px; margin:0; vertical-align:middle; flex:none; }
-.cloud-vpc-member-table input[type="checkbox"]:disabled { opacity:.4; cursor:not-allowed; }
+.cloud-vpc-member-table input[type="checkbox"],.cloud-vpc-instance-select input[type="checkbox"],.cloud-vpc-select-all input[type="checkbox"],.cloud-vpc-confirm-check input { accent-color:#079ca8; width:17px; height:17px; margin:0; vertical-align:middle; flex:none; }
+.cloud-vpc-member-table input[type="checkbox"]:disabled,.cloud-vpc-instance-select input[type="checkbox"]:disabled,.cloud-vpc-select-all input[type="checkbox"]:disabled { opacity:.4; cursor:not-allowed; }
.cloud-vpc-select-all { display:flex; align-items:center; gap:10px; cursor:pointer; }
-.cloud-vpc-select-all>span { display:none; }
+.cloud-vpc-select-all>span { color:#6f8494; font-size:11px; font-weight:700; }
.cloud-vpc-member-table tr.selected { background:#f0fafa; }
.cloud-vpc-instance-identity .cloud-vpc-name-link { font-size:14px; }
.cloud-vpc-instance-status small { display:block; color:#8596a3; font-size:12px; line-height:1.6; margin-top:7px; }
@@ -487,6 +499,11 @@ html.cloud-vpc-confirm-open { overflow:hidden; }
@media(max-width:1100px) {
.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; }
+ .cloud-vpc-instance-card { grid-template-columns:28px minmax(0,1fr) auto; }
+ .cloud-vpc-instance-select { grid-column:1; grid-row:1/3; }
+ .cloud-vpc-instance-identity { grid-column:2; grid-row:1; }
+ .cloud-vpc-instance-facts { grid-column:2/4; grid-row:2; }
+ .cloud-vpc-instance-card .cloud-vpc-instance-status { grid-column:3; grid-row:1; }
}
@media(max-width:820px) {
.cloud-vpc-network-card { grid-template-columns:minmax(0,1fr) auto 26px; gap:10px 14px; }
@@ -536,6 +553,10 @@ html.cloud-vpc-confirm-open { overflow:hidden; }
.cloud-vpc-list-hint { padding:15px 16px; }
.cloud-vpc-instance-search { width:auto; margin:0 12px 12px; }
.cloud-vpc-instance-search-input { min-height:46px; font-size:16px; }
+ .cloud-vpc-list-controls { padding:0 16px 12px; }
+ .cloud-vpc-instance-list { padding:0 16px 18px; }
+ .cloud-vpc-instance-card { padding:14px 12px; }
+ .cloud-vpc-instance-select input[type="checkbox"],.cloud-vpc-select-all input[type="checkbox"] { width:20px; height:20px; }
.cloud-vpc-instance-manager:not(.has-selection) .cloud-vpc-batch-toolbar { display:none; }
.cloud-vpc-batch-toolbar { position:sticky; z-index:25; bottom:calc(10px + env(safe-area-inset-bottom)); display:grid; grid-template-columns:minmax(0,1fr) auto; gap:10px 14px; margin:12px; padding:14px; border:1px solid #d4e3e7; border-radius:14px; background:#fff; box-shadow:0 12px 30px rgba(35,72,88,.16); }
.cloud-vpc-batch-toolbar>span { grid-column:1; margin:0; align-self:center; }
@@ -561,6 +582,9 @@ html.cloud-vpc-confirm-open { overflow:hidden; }
.cloud-vpc-members-overview { padding:16px; }
.cloud-vpc-batch-status { align-items:stretch; flex-direction:column; margin-inline:16px; }
.cloud-vpc-batch-actions { justify-content:flex-start; }
+ .cloud-vpc-instance-facts { grid-template-columns:1fr; gap:8px; }
+ .cloud-vpc-instance-facts>div { display:flex; align-items:flex-start; justify-content:space-between; gap:12px; }
+ .cloud-vpc-instance-facts dd { text-align:right; }
}
@media(max-width:400px) {
.cloud-vpc-table tr { padding-inline:14px; }
diff --git a/web/public/cloud/vpcs.js b/web/public/cloud/vpcs.js
index c483eba0..d5a25a8c 100644
--- a/web/public/cloud/vpcs.js
+++ b/web/public/cloud/vpcs.js
@@ -241,24 +241,6 @@ function routeChanged() {
byId('cloud-vpcs-workspace')?.scrollIntoView({ block: 'start' });
}
-function tableCell(className, label, content) {
- const cell = element('td', className, content);
- cell.dataset.label = label;
- return cell;
-}
-
-function tableHeader(labels) {
- const head = element('thead');
- const row = element('tr');
- for (const label of labels) {
- const cell = element('th', '', label);
- cell.scope = 'col';
- row.append(cell);
- }
- head.append(row);
- return head;
-}
-
function selectionForVpc(vpc, action) {
const key = `${vpcKey(vpc)}:${action}`;
if (!state.selections.has(key)) state.selections.set(key, new Set());
@@ -402,20 +384,25 @@ function canSelectInstance(instance, action, batchBlocked) {
function renderInstanceRow(instance, vpc, joining, checkbox) {
const id = instanceId(instance);
const port = instance.port || {};
- const row = element('tr', 'cloud-vpc-instance-row');
+ const row = element('article', 'cloud-vpc-instance-card cloud-vpc-instance-row');
+ row.setAttribute('role', 'listitem');
row.classList.toggle('selected', checkbox.checked);
- const select = tableCell('cloud-vpc-table-select', '选择');
- select.append(checkbox);
- const identity = tableCell('cloud-vpc-instance-identity', '实例');
+ const select = element('label', 'cloud-vpc-instance-select');
+ select.append(checkbox, element('span', 'sr-only', `选择 ${instance.name || id}`));
+ const identity = element('div', 'cloud-vpc-instance-identity');
const link = element('a', 'cloud-vpc-name-link', instance.name || `实例 #${id}`);
link.href = `/user/cloud/instances/${encodeURIComponent(id)}`;
identity.append(link);
- const publicAddress = tableCell('cloud-vpc-table-address', '公网 IPv4');
- publicAddress.append(element('code', '', publicIpv4(instance)));
- const privateAddress = tableCell('cloud-vpc-table-address cloud-vpc-private-address',
- joining ? '私网分配' : '私网 IPv4');
- privateAddress.append(element(joining ? 'span' : 'code', '', joining
+ const facts = element('dl', 'cloud-vpc-instance-facts');
+ const publicAddress = element('div');
+ const publicValue = element('dd');
+ publicValue.append(element('code', '', publicIpv4(instance)));
+ publicAddress.append(element('dt', '', '公网 IPv4'), publicValue);
+ const privateAddress = element('div', 'cloud-vpc-private-address');
+ const privateValue = element('dd');
+ privateValue.append(element(joining ? 'span' : 'code', '', joining
? '自动分配' : port.private_ip || '待分配'));
+ privateAddress.append(element('dt', '', joining ? '私网分配' : '私网 IPv4'), privateValue);
if (!joining && port.mac_address) {
const details = element('details', 'cloud-vpc-mac');
details.open = state.expandedMacs.has(id);
@@ -424,8 +411,9 @@ function renderInstanceRow(instance, vpc, joining, checkbox) {
if (details.open) state.expandedMacs.add(id);
else state.expandedMacs.delete(id);
});
- privateAddress.append(details);
+ privateValue.append(details);
}
+ facts.append(publicAddress, privateAddress);
const batchItem = activeBatchItemForInstance(vpc, instance);
const [label, type] = batchItem
@@ -433,7 +421,7 @@ function renderInstanceRow(instance, vpc, joining, checkbox) {
: joining
? (instance.can_attach === true ? ['可加入', 'running'] : ['暂不可加入', 'other'])
: PORT_STATE_LABELS[String(port.state || '')] || ['状态待确认', 'other'];
- const status = tableCell('cloud-vpc-instance-status', '状态');
+ const status = element('div', 'cloud-vpc-instance-status');
status.append(element('span', `state-pill ${type}`, label));
if (!batchItem && instance.action_unavailable_reason) {
status.append(element('small', '', instance.action_unavailable_reason));
@@ -452,7 +440,7 @@ function renderInstanceRow(instance, vpc, joining, checkbox) {
void mutatePort(instance, vpc, action === 'retry_attach' ? 'attach' : 'detach'));
status.append(retry);
}
- row.append(select, identity, publicAddress, privateAddress, status);
+ row.append(select, identity, facts, status);
return row;
}
@@ -494,9 +482,6 @@ function renderInstanceManager(vpc, joining) {
searchField.append(search);
section.append(searchField);
}
- const table = element('table', 'cloud-vpc-table cloud-vpc-member-table');
- table.setAttribute('aria-label', joining ? '可加入实例' : '已加入实例');
- const header = tableHeader(['', '实例', '公网 IPv4', joining ? '私网分配' : '私网 IPv4', '状态']);
const selectAll = element('input');
selectAll.type = 'checkbox';
selectAll.dataset.vpcFocus = 'select-all';
@@ -504,9 +489,11 @@ function renderInstanceManager(vpc, joining) {
selectAll.disabled = eligibleIds.size === 0;
const selectAllLabel = element('label', 'cloud-vpc-select-all');
selectAllLabel.append(selectAll, element('span', '', joining ? '全选可加入实例' : '全选可移出实例'));
- header.querySelector('th').append(selectAllLabel);
- table.append(header);
- const body = element('tbody');
+ const controls = element('div', 'cloud-vpc-list-controls');
+ controls.append(selectAllLabel);
+ const list = element('div', 'cloud-vpc-instance-list');
+ list.setAttribute('role', 'list');
+ list.setAttribute('aria-label', joining ? '可加入实例' : '已加入实例');
const checks = [];
const countLabel = element('span');
countLabel.setAttribute('role', 'status');
@@ -553,7 +540,7 @@ function renderInstanceManager(vpc, joining) {
updateControls();
});
checks.push({ id, checkbox, row, instance });
- body.append(row);
+ list.append(row);
}
selectAll.addEventListener('change', () => {
for (const { id, row } of checks) {
@@ -566,7 +553,6 @@ function renderInstanceManager(vpc, joining) {
clear.addEventListener('click', () => { selection.clear(); updateControls(); });
submit.addEventListener('click', () => void submitMembershipBatch(vpc, action,
instances.filter(item => selection.has(instanceId(item)) && eligibleIds.has(instanceId(item)))));
- table.append(body);
const noMatches = emptyState('没有匹配的实例', '请尝试其他实例名称或公网 IP。');
noMatches.classList.add('cloud-vpc-search-empty');
noMatches.hidden = true;
@@ -588,7 +574,7 @@ function renderInstanceManager(vpc, joining) {
search?.addEventListener('input', applySearch);
const toolbar = element('div', 'cloud-vpc-batch-toolbar');
toolbar.append(countLabel, clear, submit);
- section.append(table, noMatches, toolbar);
+ section.append(controls, list, noMatches, toolbar);
applySearch();
return section;
}
diff --git a/web/resources/views/venix/cloud/pages/vpcs.tpl b/web/resources/views/venix/cloud/pages/vpcs.tpl
index 6fcde94e..c7d15a94 100644
--- a/web/resources/views/venix/cloud/pages/vpcs.tpl
+++ b/web/resources/views/venix/cloud/pages/vpcs.tpl
@@ -54,16 +54,15 @@
{if $cloud_vpc_view.joining}选择同地区实例,一次提交加入;私网 IP 自动分配。{else}勾选实例可批量移出当前 VPC。{/if}
{if !empty($cloud_vpc_view.members)}
{if $cloud_vpc_view.joining}{/if}
-
+
+ {foreach $cloud_vpc_view.members as $instance}
+
+
+
+ - 公网 IPv4
{$instance.public_ipv4|escape:'html'}- {if $cloud_vpc_view.joining}私网分配{else}私网 IPv4{/if}
- {if $cloud_vpc_view.joining}自动分配{else}
{$instance.port.private_ip|default:'待分配'|escape:'html'}{if !empty($instance.port.mac_address)}MAC 地址
{$instance.port.mac_address|escape:'html'} {/if}{/if}
+ {$instance.state_label|escape:'html'}{if !empty($instance.action_unavailable_reason)}{$instance.action_unavailable_reason|escape:'html'}{/if}
+
+ {/foreach}
已选择 0 台
{else}{if $cloud_vpc_view.joining}暂无可加入的实例{else}尚未加入实例{/if}{if $cloud_vpc_view.joining}只显示同地区且尚未加入 VPC 的实例。{else}将同地区实例连接到这张私网。{/if}
{if !$cloud_vpc_view.joining}
加入实例 →{/if}
{/if}
diff --git a/web/resources/views/venix/layout_assets.tpl b/web/resources/views/venix/layout_assets.tpl
index 4ca045b6..fc3d754c 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='2026110114' scope='global'}
+{assign var=venix_asset_version value='2026110115' scope='global'}
diff --git a/web/tests/CloudUserFirstPaintViewTest.php b/web/tests/CloudUserFirstPaintViewTest.php
index 3c7cf962..87151a29 100644
--- a/web/tests/CloudUserFirstPaintViewTest.php
+++ b/web/tests/CloudUserFirstPaintViewTest.php
@@ -98,9 +98,11 @@ foreach ([['query' => [], 'page' => 'home'], ['query' => ['view' => 'create'], '
$summary = $one($xpath, 'cloud-vpc-network-summary')->textContent;
$joining = ($case['query']['view'] ?? '') === 'join';
$activeTab = $one($xpath, $joining ? 'cloud-vpc-join-link' : 'cloud-vpc-members-link');
+ $instanceCards = $xpath->query('//*[contains(concat(" ", normalize-space(@class), " "), " cloud-vpc-instance-card ")]');
$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')
+ && $instanceCards->length === 1
&& str_contains($summary, '香港')
&& str_contains($summary, '10.0.1.0/24')
&& str_contains($summary, '10.0.1.1')
diff --git a/web/tests/CloudVpcPageBehaviorTest.mjs b/web/tests/CloudVpcPageBehaviorTest.mjs
index e93002f2..9858acde 100644
--- a/web/tests/CloudVpcPageBehaviorTest.mjs
+++ b/web/tests/CloudVpcPageBehaviorTest.mjs
@@ -204,7 +204,10 @@ for (const [query, page, joining] of [
/地区香港私网网段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);
+ assert.equal(t.nodes.get('cloud-vpc-instance-manager')
+ .querySelectorAll('.cloud-vpc-instance-card').length, 2);
+ assert.match(t.nodes.get('cloud-vpc-instance-manager').textContent,
+ /vm-1.*192\.0\.2\.1.*10\.0\.1\.1.*已连接/s);
assert.equal(t.nodes.get('cloud-vpc-delete').disabled, true);
await t.go(`${href(B)}/join`);
assert.equal(t.nodes.get('cloud-vpc-join-link').getAttribute('aria-current'), 'page');
diff --git a/web/tests/CloudVpcUserContractTest.php b/web/tests/CloudVpcUserContractTest.php
index e9e4ff35..df689d0f 100644
--- a/web/tests/CloudVpcUserContractTest.php
+++ b/web/tests/CloudVpcUserContractTest.php
@@ -93,14 +93,16 @@ $assert(str_contains($template, 'id="cloud-vpcs-home"')
&& str_contains($template, 'class="cloud-vpc-create-footer"')
&& str_contains($template, 'id="cloud-vpc-batch-status"')
&& str_contains($template, 'id="cloud-vpc-instance-manager"')
+ && str_contains($template, 'class="cloud-vpc-instance-list"')
+ && str_contains($template, 'class="cloud-vpc-instance-card cloud-vpc-instance-row"')
&& str_contains($template, 'VPC 私网')
&& 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')
+ && str_contains($styles, '.cloud-vpc-instance-list')
+ && str_contains($styles, '.cloud-vpc-instance-card')
&& str_contains($styles, '.cloud-vpc-batch-status'),
'The VPC page must expose list, creation and member-management views.');
$membersPanelOffset = strpos($template, 'class="inventory-panel cloud-vpc-members-panel"');
@@ -116,13 +118,13 @@ $assert($membersPanelOffset !== false
$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-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($javascript, "'cloud-vpc-instance-list'")
+ && str_contains($javascript, "'cloud-vpc-instance-card cloud-vpc-instance-row'")
&& !str_contains($template, 'class="cloud-vpc-network-actions"')
&& !str_contains($javascript, "'cloud-vpc-network-actions'")
&& !str_contains($styles, '.cloud-vpc-network-actions')
@@ -142,26 +144,19 @@ $assert(str_contains($batchService, 'There is no selection-count limit')
&& str_contains($batchService, "'items' => \$items->map(")
&& str_contains($portService, "'public_ipv4' => \$publicIpv4"),
'The VPC service must expose item progress and public-address data without a batch limit.');
-$assert(str_contains($styles,
- '.cloud-vpc-table,.cloud-vpc-table tbody { display:block; }')
- && str_contains($styles,
- '.cloud-vpc-table-address::before { content:attr(data-label);')
- && str_contains($styles, '.cloud-vpc-network-list { display:grid;')
+$assert(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,
- '.cloud-vpc-instance-status { grid-column:3; grid-row:1;')
- && str_contains($styles,
- '.cloud-vpc-table-select { grid-column:1; grid-row:1/5;')
+ && str_contains($styles, '.cloud-vpc-instance-list { display:grid;')
+ && str_contains($styles, '.cloud-vpc-instance-card { display:grid;')
+ && str_contains($styles, '.cloud-vpc-instance-facts { display:grid;')
+ && str_contains($styles, '.cloud-vpc-instance-select { display:grid;')
&& str_contains($styles,
'.cloud-vpc-batch-toolbar { position:sticky;')
&& str_contains($styles, '.cloud-vpc-instance-search-input')
&& str_contains($styles, '.cloud-vpc-tab-count')
- && str_contains($javascript,
- "tableHeader(['', '实例', '公网 IPv4', joining ? '私网分配' : '私网 IPv4', '状态'])")
- && str_contains($javascript, "tableCell('cloud-vpc-table-address', '公网 IPv4')")
- && str_contains($javascript, "tableCell('cloud-vpc-instance-status', '状态')")
+ && str_contains($javascript, "element('dl', 'cloud-vpc-instance-facts')")
+ && str_contains($javascript, "element('dt', '', '公网 IPv4')")
+ && str_contains($javascript, "element('div', 'cloud-vpc-instance-status')")
&& str_contains($javascript, 'function instanceMatchesMemberQuery(')
&& str_contains($javascript, "search.placeholder = '搜索实例或公网 IP'")
&& str_contains($javascript, "search?.addEventListener('input', applySearch)")