diff --git a/web/public/cloud/admin-vpc.css b/web/public/cloud/admin-vpc.css index 4edd38ef..6e2e7875 100644 --- a/web/public/cloud/admin-vpc.css +++ b/web/public/cloud/admin-vpc.css @@ -353,6 +353,87 @@ button.admin-vpc-summary-card:focus-visible { font-size: 13px; } +.admin-vpc-pool-grid { + display: grid; + grid-template-columns: repeat(2, minmax(0, 1fr)); + gap: 14px; + padding: 20px 22px; +} + +.admin-vpc-pool-card { + min-width: 0; + padding: 17px; + border: 1px solid #dfe7ef; + border-radius: 12px; + background: #fbfcfe; +} + +.admin-vpc-pool-card > header, +.admin-vpc-pool-card > footer { + display: flex; + align-items: center; + justify-content: space-between; + gap: 12px; +} + +.admin-vpc-pool-card h3 { + margin: 0 0 3px; + color: #172033; + font-size: 16px; +} + +.admin-vpc-pool-card header p, +.admin-vpc-pool-card footer p { + margin: 0; + color: #8a99ab; + font-size: 12px; +} + +.admin-vpc-pool-card dl { + display: grid; + grid-template-columns: repeat(3, minmax(0, 1fr)); + gap: 8px; + margin: 15px 0; +} + +.admin-vpc-pool-card dl > div { + min-width: 0; + padding: 10px; + border-radius: 9px; + background: #fff; +} + +.admin-vpc-pool-card dt { + color: #8a99ab; + font-size: 11px; +} + +.admin-vpc-pool-card dd { + margin: 4px 0 0; + color: #26354a; + font-size: 13px; + font-weight: 750; + overflow-wrap: anywhere; +} + +.admin-vpc-pool-card.is-disabled { + opacity: .78; + background: #f8fafc; +} + +.admin-vpc-pool-capacity { + padding: 12px 14px; + border-radius: 10px; + color: #526278; + background: #f1f5f9; + font-size: 13px; + line-height: 1.5; +} + +#admin-vpc-pool-drawer form { + display: contents; +} + @media (max-width: 1399.98px) { .admin-vpc-summary { grid-template-columns: repeat(3, minmax(0, 1fr)); @@ -361,6 +442,10 @@ button.admin-vpc-summary-card:focus-visible { .admin-vpc-region-grid { grid-template-columns: repeat(2, minmax(0, 1fr)); } + + .admin-vpc-pool-grid { + grid-template-columns: minmax(0, 1fr); + } } @media (max-width: 991.98px) { @@ -403,7 +488,8 @@ button.admin-vpc-summary-card:focus-visible { } .admin-vpc-region-grid, - .admin-vpc-filter { + .admin-vpc-filter, + .admin-vpc-pool-grid { grid-template-columns: minmax(0, 1fr); padding: 16px; } diff --git a/web/public/cloud/admin-vpc.js b/web/public/cloud/admin-vpc.js index b9cb2b4a..b9291442 100644 --- a/web/public/cloud/admin-vpc.js +++ b/web/public/cloud/admin-vpc.js @@ -423,22 +423,54 @@ function editPool(pool) { lockPoolFields(true); } +function openPoolDrawer(pool = null) { + if (pool) editPool(pool); + else resetPoolForm(); + const dialog = byId('admin-vpc-pool-drawer'); + window.VenixDrawerMotion?.openDrawerWithMotion(dialog) || dialog.showModal(); +} + +async function closePoolDrawer() { + const dialog = byId('admin-vpc-pool-drawer'); + if (window.VenixDrawerMotion) await window.VenixDrawerMotion.closeDrawerWithMotion(dialog); + else dialog.close(); +} + function renderPools() { const list = byId('admin-vpc-pool-list'); list.replaceChildren(); const items = state.page.pools.items || []; if (!items.length) { - list.append(create('p', 'text-muted', '暂无 VPC 地址池。')); + list.append(create('p', 'admin-vpc-empty', '暂无 VPC 地址池。')); return; } for (const pool of items) { - const button = create('button', 'btn btn-light cloud-admin-host'); + const card = create('article', `admin-vpc-pool-card ${pool.state === 'active' ? '' : 'is-disabled'}`); + const header = create('header'); + const heading = create('div'); + heading.append(create('h3', '', pool.name), create('p', '', pool.region_name)); + header.append(heading, create('span', + `admin-vpc-state is-${pool.state === 'active' ? 'success' : 'warning'}`, + pool.state === 'active' ? '启用分配' : '已停用')); + const details = create('dl'); + for (const [label, value, mono] of [ + ['地址边界', pool.cidr, true], + ['分配前缀', `/${pool.allocation_prefix}`, true], + ['已用 / 容量', `${pool.used} / ${pool.capacity}`, false], + ]) { + const item = create('div'); + item.append(create('dt', '', label), create('dd', mono ? 'admin-mono' : '', value)); + details.append(item); + } + const footer = create('footer'); + footer.append(create('p', '', pool.address_locked + ? '已有 VPC 占用,地址边界已锁定' : `${pool.available} 个子网可用`)); + const button = create('button', 'btn btn-light btn-sm', canManage ? '编辑' : '查看'); button.type = 'button'; button.dataset.poolId = String(pool.id); - button.append(create('strong', '', pool.name), - create('div', 'text-muted', - `${pool.region_name} · ${pool.cidr} → /${pool.allocation_prefix} · ${pool.used}/${pool.capacity} · ${pool.state === 'active' ? '启用' : '停用'}`)); - list.append(button); + footer.append(button); + card.append(header, details, footer); + list.append(card); } } @@ -475,13 +507,13 @@ async function savePool(event) { byId('admin-vpc-pool-save').disabled = true; notice('正在保存 VPC 地址池…', 'warning'); try { - const result = await api(`/api/v1/admin/vpc-cidr-pools${id ? `/${encodeURIComponent(id)}` : ''}`, { + await api(`/api/v1/admin/vpc-cidr-pools${id ? `/${encodeURIComponent(id)}` : ''}`, { method: id ? 'PATCH' : 'POST', body: payload, }); const refreshed = await api('/api/v1/admin/vpc-control'); state.page = refreshed; renderAll(); - editPool(result.item); + await closePoolDrawer(); notice(id ? 'VPC 地址池已更新。' : 'VPC 地址池已创建。'); } catch (error) { notice(error.message, 'error'); @@ -506,7 +538,7 @@ function bind() { const pool = event.target.closest('[data-pool-id]'); if (pool) { const item = state.page.pools.items.find(row => String(row.id) === pool.dataset.poolId); - if (item) editPool(item); + if (item) openPoolDrawer(item); } }); byId('admin-vpc-filter').addEventListener('submit', event => { @@ -530,8 +562,15 @@ function bind() { for (const button of root.querySelectorAll('[data-vpc-open-state]')) { button.addEventListener('click', () => openNetworkState(button.dataset.vpcOpenState)); } - byId('admin-vpc-pool-new').addEventListener('click', resetPoolForm); + byId('admin-vpc-pool-new').addEventListener('click', () => openPoolDrawer()); byId('admin-vpc-pool-form').addEventListener('submit', savePool); + for (const id of ['admin-vpc-pool-close', 'admin-vpc-pool-cancel']) { + byId(id).addEventListener('click', closePoolDrawer); + } + byId('admin-vpc-pool-drawer').addEventListener('cancel', event => { + event.preventDefault(); + void closePoolDrawer(); + }); byId('admin-vpc-detail-close').addEventListener('click', closeDetail); byId('admin-vpc-detail').addEventListener('cancel', event => { event.preventDefault(); diff --git a/web/resources/views/venix/admin/cloud/vpc.tpl b/web/resources/views/venix/admin/cloud/vpc.tpl index a771d579..9a4cc78a 100644 --- a/web/resources/views/venix/admin/cloud/vpc.tpl +++ b/web/resources/views/venix/admin/cloud/vpc.tpl @@ -71,11 +71,12 @@ - Allocation Pools地区地址池停用只会阻止新建 VPC,不会断开或重新分配已有网络。添加Allocation Boundary添加 VPC 地址池已有 VPC 占用时 CIDR 与分配前缀自动锁定。所属地区运行状态启用分配停用地址池名称RFC1918 CIDR每个 VPC 的前缀保存后显示可分配子网数量。 + Allocation Pools地区地址池停用只会阻止新建 VPC,不会断开或重新分配已有网络;有占用时地址边界保持锁定。添加地址池 VPC DetailVPC 详情详情功能将在下一阶段启用。 +Allocation Boundary添加 VPC 地址池同一地区地址池不能重叠。已有 VPC 占用时,CIDR 和分配前缀自动锁定,但仍可停用后续分配。所属地区运行状态启用分配停用地址池名称RFC1918 CIDR每个 VPC 的前缀保存后显示可分配子网数量。 {include file='admin/static_footer.tpl'} diff --git a/web/resources/views/venix/layout_assets.tpl b/web/resources/views/venix/layout_assets.tpl index 8ea1f7e9..60a925ec 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='2026103114' scope='global'} +{assign var=venix_asset_version value='2026103115' scope='global'} diff --git a/web/tests/CloudAdminVpcUiContractTest.php b/web/tests/CloudAdminVpcUiContractTest.php index d372a691..ffb7d96c 100644 --- a/web/tests/CloudAdminVpcUiContractTest.php +++ b/web/tests/CloudAdminVpcUiContractTest.php @@ -58,10 +58,13 @@ $assert(str_contains($template, 'data-admin-vpc') && str_contains($template, 'id="admin-vpc-bootstrap"') && str_contains($template, 'data-vpc-view="overview"') && str_contains($template, 'id="admin-vpc-network-body"') + && str_contains($template, 'id="admin-vpc-pool-drawer"') && str_contains($template, 'id="admin-vpc-pool-form"') && str_contains($template, '/cloud/admin-vpc.css?v={$venix_asset_version}') && str_contains($template, '/cloud/admin-vpc.js?v={$venix_asset_version}') && str_contains($javascript, 'globalThis.crypto?.getRandomValues') + && str_contains($javascript, 'pool.address_locked') + && str_contains($javascript, 'openPoolDrawer') && str_contains($javascript, "api('/api/v1/admin/vpc-control')") && str_contains($javascript, "api(`/api/v1/admin/vpc-control/vpcs") @@ -78,7 +81,7 @@ $assert(str_contains($siteSettings, 'id="cloud_vpc_enabled"') 'The VPC feature switch is not editable in site settings or the administrator page still reports a hard-coded state.'); $assert(preg_match("/venix_asset_version value='([0-9]+)'/", $assets, $version) === 1 - && (int) $version[1] >= 2026103114, + && (int) $version[1] >= 2026103115, 'Administrator VPC browser assets were not cache-busted.'); echo "Administrator VPC CIDR pool page and API contracts passed.\n";
Allocation Pools
停用只会阻止新建 VPC,不会断开或重新分配已有网络。
Allocation Boundary
已有 VPC 占用时 CIDR 与分配前缀自动锁定。
停用只会阻止新建 VPC,不会断开或重新分配已有网络;有占用时地址边界保持锁定。
VPC Detail
详情功能将在下一阶段启用。
同一地区地址池不能重叠。已有 VPC 占用时,CIDR 和分配前缀自动锁定,但仍可停用后续分配。