refactor(admin-vpc): 将地址池编辑移入抽屉

go
codex 3 weeks ago
parent e839e82f67
commit e54a2395fa

@ -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;
}

@ -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();

@ -71,11 +71,12 @@
</section>
<section id="admin-vpc-panel-pools" class="admin-vpc-panel" role="tabpanel" {if $vpc_view != 'pools'}hidden{/if}>
<div class="cloud-admin-grid"><section class="card"><div class="card-body"><div class="cloud-admin-card-head"><div><p class="admin-eyebrow mb-1">Allocation Pools</p><h2 class="h5 mb-1">地区地址池</h2><p class="text-muted mb-0">停用只会阻止新建 VPC,不会断开或重新分配已有网络。</p></div><button id="admin-vpc-pool-new" class="btn btn-primary" type="button" {if !$admin_can_manage|default:false}disabled{/if}><i class="mdi mdi-plus me-1" aria-hidden="true"></i>添加</button></div><div id="admin-vpc-pool-list" class="cloud-admin-host-list"></div></div></section><form id="admin-vpc-pool-form" class="card cloud-admin-form-card"><div class="card-body"><div class="cloud-admin-card-head"><div><p class="admin-eyebrow mb-1">Allocation Boundary</p><h2 id="admin-vpc-pool-title" class="h5 mb-1">添加 VPC 地址池</h2><p class="text-muted mb-0">已有 VPC 占用时 CIDR 与分配前缀自动锁定。</p></div></div><input id="admin-vpc-pool-id" type="hidden"><input id="admin-vpc-pool-revision" type="hidden" value="0"><section class="cloud-admin-form-section"><div class="cloud-admin-form-grid"><div><label for="admin-vpc-pool-region" class="form-label">所属地区</label><select id="admin-vpc-pool-region" class="form-select" required {if !$admin_can_manage|default:false}disabled{/if}></select></div><div><label for="admin-vpc-pool-state" class="form-label">运行状态</label><select id="admin-vpc-pool-state" class="form-select" required {if !$admin_can_manage|default:false}disabled{/if}><option value="active">启用分配</option><option value="disabled">停用</option></select></div><div class="cloud-admin-full"><label for="admin-vpc-pool-name" class="form-label">地址池名称</label><input id="admin-vpc-pool-name" class="form-control" maxlength="80" required {if !$admin_can_manage|default:false}disabled{/if}></div><div><label for="admin-vpc-pool-cidr" class="form-label">RFC1918 CIDR</label><input id="admin-vpc-pool-cidr" class="form-control admin-mono" placeholder="例如 10.64.0.0/12" required {if !$admin_can_manage|default:false}disabled{/if}></div><div><label for="admin-vpc-pool-prefix" class="form-label">每个 VPC 的前缀</label><input id="admin-vpc-pool-prefix" class="form-control" type="number" min="16" max="28" value="24" required {if !$admin_can_manage|default:false}disabled{/if}></div><div id="admin-vpc-pool-capacity" class="cloud-admin-full form-text">保存后显示可分配子网数量。</div></div></section><div class="cloud-admin-form-footer"><span class="text-muted">仅接受 RFC1918 内的规范网络地址。</span><button id="admin-vpc-pool-save" class="btn btn-primary" type="submit" {if !$admin_can_manage|default:false}disabled{/if}>保存地址池</button></div></div></form></div>
<section class="card admin-vpc-section" aria-labelledby="admin-vpc-pools-title"><header class="admin-vpc-section-head"><div><p class="admin-eyebrow mb-1">Allocation Pools</p><h2 id="admin-vpc-pools-title">地区地址池</h2><p>停用只会阻止新建 VPC,不会断开或重新分配已有网络;有占用时地址边界保持锁定。</p></div><button id="admin-vpc-pool-new" class="btn btn-primary" type="button" aria-controls="admin-vpc-pool-drawer" aria-haspopup="dialog" {if !$admin_can_manage|default:false}disabled{/if}><i class="mdi mdi-plus me-1" aria-hidden="true"></i>添加地址池</button></header><div id="admin-vpc-pool-list" class="admin-vpc-pool-grid"></div></section>
</section>
</main>
<dialog data-admin-instance-drawer id="admin-vpc-detail" aria-labelledby="admin-vpc-detail-title"><header class="admin-instance-drawer-header"><div><p class="admin-eyebrow mb-1">VPC Detail</p><h2 id="admin-vpc-detail-title">VPC 详情</h2></div><button class="admin-modal-close position-static" id="admin-vpc-detail-close" type="button" aria-label="关闭 VPC 详情"><i class="mdi mdi-close" aria-hidden="true"></i></button></header><div class="admin-instance-drawer-body"><p id="admin-vpc-detail-notice" class="alert alert-info">详情功能将在下一阶段启用。</p><div id="admin-vpc-detail-body"></div></div></dialog>
<dialog data-admin-instance-drawer id="admin-vpc-pool-drawer" aria-labelledby="admin-vpc-pool-title"><form id="admin-vpc-pool-form"><header class="admin-instance-drawer-header"><div><p class="admin-eyebrow mb-1">Allocation Boundary</p><h2 id="admin-vpc-pool-title">添加 VPC 地址池</h2></div><button class="admin-modal-close position-static" id="admin-vpc-pool-close" type="button" aria-label="关闭地址池设置"><i class="mdi mdi-close" aria-hidden="true"></i></button></header><div class="admin-instance-drawer-body"><p class="alert alert-info">同一地区地址池不能重叠。已有 VPC 占用时,CIDR 和分配前缀自动锁定,但仍可停用后续分配。</p><input id="admin-vpc-pool-id" type="hidden"><input id="admin-vpc-pool-revision" type="hidden" value="0"><div class="cloud-admin-form-grid"><div><label for="admin-vpc-pool-region" class="form-label">所属地区</label><select id="admin-vpc-pool-region" class="form-select" required {if !$admin_can_manage|default:false}disabled{/if}></select></div><div><label for="admin-vpc-pool-state" class="form-label">运行状态</label><select id="admin-vpc-pool-state" class="form-select" required {if !$admin_can_manage|default:false}disabled{/if}><option value="active">启用分配</option><option value="disabled">停用</option></select></div><div class="cloud-admin-full"><label for="admin-vpc-pool-name" class="form-label">地址池名称</label><input id="admin-vpc-pool-name" class="form-control" maxlength="80" required {if !$admin_can_manage|default:false}disabled{/if}></div><div><label for="admin-vpc-pool-cidr" class="form-label">RFC1918 CIDR</label><input id="admin-vpc-pool-cidr" class="form-control admin-mono" placeholder="例如 10.64.0.0/12" required {if !$admin_can_manage|default:false}disabled{/if}></div><div><label for="admin-vpc-pool-prefix" class="form-label">每个 VPC 的前缀</label><input id="admin-vpc-pool-prefix" class="form-control" type="number" min="16" max="28" value="24" required {if !$admin_can_manage|default:false}disabled{/if}></div><div id="admin-vpc-pool-capacity" class="cloud-admin-full admin-vpc-pool-capacity">保存后显示可分配子网数量。</div></div></div><footer class="admin-instance-drawer-footer"><span class="text-muted fs-12">仅接受 10.0.0.0/8、172.16.0.0/12、192.168.0.0/16 内的规范网络地址。</span><div class="d-flex gap-2"><button id="admin-vpc-pool-cancel" class="btn btn-light" type="button">取消</button><button id="admin-vpc-pool-save" class="btn btn-primary" type="submit" {if !$admin_can_manage|default:false}disabled{/if}>保存地址池</button></div></footer></form></dialog>
<script id="admin-vpc-bootstrap" type="application/json">{$admin_vpc_bootstrap_json|default:'null' nofilter}</script>
<script type="module" src="/cloud/admin-vpc.js?v={$venix_asset_version}"></script>
{include file='admin/static_footer.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'}

@ -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";

Loading…
Cancel
Save