style(admin): refine compute nodes for mobile

go
codex 3 weeks ago
parent e5292b64c0
commit fb05072884

@ -10,6 +10,7 @@ use App\Services\Auth;
use App\Services\CaptchaConfig;
use App\Services\Cloud\CloudIpChangeBillingService;
use App\Services\Cloud\CloudProvisioningBillingConfig;
use App\Services\Cloud\CloudUserIsoFeature;
use App\Services\LoginSessionDurationService;
use App\Services\LoginSessionRevocationService;
use App\Services\RegistrationEmailWhitelist;
@ -46,6 +47,7 @@ class ConfigController extends AdminController
CloudIpChangeBillingService::DEFAULT_PRICE,
CloudProvisioningBillingConfig::PAYMENT_WINDOW_MINUTES_KEY =>
(string) CloudProvisioningBillingConfig::DEFAULT_PAYMENT_WINDOW_MINUTES,
CloudUserIsoFeature::CONFIG_KEY => 'false',
'host_1' => '',
'host_2' => '',
'host_3' => '',
@ -146,6 +148,18 @@ class ConfigController extends AdminController
$payload[CloudProvisioningBillingConfig::PAYMENT_WINDOW_MINUTES_KEY]
);
}
if (array_key_exists(CloudUserIsoFeature::CONFIG_KEY, $payload)) {
$enabled = filter_var(
$payload[CloudUserIsoFeature::CONFIG_KEY],
FILTER_VALIDATE_BOOLEAN,
FILTER_NULL_ON_FAILURE
);
if ($enabled === null) {
throw new \InvalidArgumentException('用户 ISO 开关状态无效');
}
$payload[CloudUserIsoFeature::CONFIG_KEY] =
$enabled ? 'true' : 'false';
}
} catch (\InvalidArgumentException $exception) {
return $response->withJson([
'ret' => 0,

@ -1335,12 +1335,47 @@
flex-basis: 34px;
}
.cloud-admin-host-summary-card:last-child:nth-child(odd) {
grid-column: 1 / -1;
}
.cloud-admin-host-region-head {
display: grid;
grid-template-columns: minmax(0, 1fr) auto;
align-items: flex-start;
}
.cloud-admin-host-region-meta {
justify-content: flex-end;
grid-column: 1 / -1;
justify-content: flex-start;
margin-left: 0;
}
.cloud-admin-host-region-capacity {
display: grid;
grid-template-columns: repeat(2, minmax(0, 1fr));
}
.cloud-admin-host-region-capacity span:last-child {
grid-column: 1 / -1;
}
.cloud-admin-host-region-nodes {
padding: 10px;
}
.cloud-admin .cloud-admin-host {
padding: 14px 38px 14px 12px;
}
.cloud-admin-host-metrics {
display: grid;
grid-template-columns: repeat(2, minmax(0, 1fr));
gap: 5px 10px;
}
.cloud-admin-host-statuses {
gap: 5px;
}
.cloud-admin-host-filters,

@ -90,29 +90,6 @@ async function loadHosts() {
}
return state.hosts;
}
async function loadUserIsoSettings() {
const settings = await api('/api/v1/admin/user-iso/settings');
byId('user-iso-enabled').checked = settings?.enabled === true;
}
async function saveUserIsoSettings(event) {
event.preventDefault();
if (state.busy) return;
const button = byId('user-iso-settings-save');
state.busy = true;
button.disabled = true;
try {
const settings = await api('/api/v1/admin/user-iso/settings', {
method: 'PUT', body: { enabled: byId('user-iso-enabled').checked },
});
byId('user-iso-enabled').checked = settings?.enabled === true;
notice(settings?.enabled ? '用户 ISO 功能已开放。' : '用户 ISO 功能已关闭。');
} catch (error) {
notice(error.message, true);
} finally {
state.busy = false;
button.disabled = !canManage;
}
}
function parseHostNetwork(value) {
const text = String(value || '');
const match = /^(bridge|network):([A-Za-z0-9][A-Za-z0-9_.-]*)$/.exec(text);
@ -196,6 +173,8 @@ function renderHostNode(host) {
button.type = 'button';
button.dataset.hostId = String(host.id);
button.setAttribute('aria-label', `配置计算节点 ${host.name || host.id}`);
button.setAttribute('aria-controls', 'host-config-drawer');
button.setAttribute('aria-haspopup', 'dialog');
if (String(state.selectedHost) === String(host.id)) button.setAttribute('aria-current', 'true');
const heading = element('span', 'cloud-admin-host-heading');
heading.append(element('strong', '', host.name || `计算节点 ${host.id}`), element('small', '', `#${host.id} · ${host?.location?.physical_label || host.region || '物理位置未设置'}`));
@ -1463,8 +1442,8 @@ async function initialize() {
});
try { const session = await api('/api/v1/session'); state.csrf = session.csrf_token || state.csrf; if (!session.admin) throw new Error('需要管理员权限。'); if (!state.csrf) throw new Error('会话令牌缺失,请重新登录。');
if (root.dataset.cloudAdmin === 'hosts') {
await Promise.all([loadHosts(), loadUserIsoSettings()]); renderHosts(); fillHost(null);
byId('host-new').addEventListener('click', event => openNewHostConfig(event.currentTarget)); byId('host-form').addEventListener('submit', saveHost); byId('user-iso-settings-form').addEventListener('submit', saveUserIsoSettings);
await loadHosts(); renderHosts(); fillHost(null); renderHostConfigOverview(null);
byId('host-new').addEventListener('click', event => openNewHostConfig(event.currentTarget)); byId('host-form').addEventListener('submit', saveHost);
byId('host-config-close').addEventListener('click', closeHostConfig); const configDrawer = byId('host-config-drawer'); configDrawer.addEventListener('cancel', event => { event.preventDefault(); closeHostConfig(); }); configDrawer.addEventListener('click', event => { if (event.target === configDrawer) closeHostConfig(); });
byId('host-config-scheduling').addEventListener('click', () => openHostConfigTool('scheduling'));
byId('host-config-network-pools').addEventListener('click', () => openHostConfigTool('networkPools'));
@ -1480,7 +1459,7 @@ async function initialize() {
const networkDrawer = byId('host-network-pools-drawer'); networkDrawer.addEventListener('cancel', event => { event.preventDefault(); closeHostNetworkPools(); }); networkDrawer.addEventListener('click', event => { if (event.target === networkDrawer) closeHostNetworkPools(); });
byId('host-vpc-transport-close').addEventListener('click', closeHostVpcTransport); byId('host-vpc-transport-form').addEventListener('submit', saveHostVpcTransport); byId('host-vpc-transport-discover').addEventListener('click', discoverHostVpcTransport); byId('host-vpc-transport-test').addEventListener('click', testHostVpcTransport); byId('host-vpc-transport-candidate').addEventListener('change', selectHostVpcTransportCandidate);
const vpcTransportDrawer = byId('host-vpc-transport-drawer'); vpcTransportDrawer.addEventListener('cancel', event => { event.preventDefault(); closeHostVpcTransport(); }); vpcTransportDrawer.addEventListener('click', event => { if (event.target === vpcTransportDrawer) closeHostVpcTransport(); });
if (!canManage) { byId('host-form').querySelectorAll('input,select,textarea,button').forEach(input => { input.disabled = true; }); byId('host-enabled').disabled = true; byId('user-iso-settings-form').querySelectorAll('input,button').forEach(input => { input.disabled = true; }); }
if (!canManage) { byId('host-form').querySelectorAll('input,select,textarea,button').forEach(input => { input.disabled = true; }); byId('host-enabled').disabled = true; }
notice(canManage ? '请选择宿主机编辑,或添加新的宿主机。' : '当前管理员仅可查看配置。');
}
else if (root.dataset.cloudAdmin === 'templates') { byId('template-import')?.addEventListener('submit', importTemplate); byId('template-upload')?.addEventListener('submit', uploadCloudTemplate); byId('template-catalog-refresh')?.addEventListener('click', loadCatalog); byId('template-startup-form').addEventListener('submit', saveStartupScript); byId('template-startup-close').addEventListener('click', closeStartupScript); byId('template-startup-script').addEventListener('input', updateStartupScriptControls); byId('template-startup-dialog').addEventListener('cancel', event => { event.preventDefault(); closeStartupScript(); }); await loadCatalog(); }

@ -37,6 +37,7 @@
<div class="admin-config-jumps">
<a href="#configSite">站点基础</a>
<a href="#configCloudBilling">云实例计费</a>
<a href="#configCloudFeatures">云功能开关</a>
<a href="#configSecurity">登录安全</a>
@ -93,6 +94,28 @@
</div>
</details>
<details class="card admin-config-section" id="configCloudFeatures">
<summary>
<span>
<strong>云功能开关</strong>
<small>控制普通用户可访问的云服务功能</small>
</span>
<i class="mdi mdi-chevron-down"></i>
</summary>
<div class="admin-config-body">
<div class="row g-3">
<div class="col-md-6">
<label class="form-label" for="cloud_user_iso_enabled">用户 ISO 功能</label>
<select class="form-select" id="cloud_user_iso_enabled" name="cloud_user_iso_enabled">
<option value="true">向普通用户开放</option>
<option value="false">关闭</option>
</select>
<div class="form-text">关闭后普通用户看不到 ISO 导航,相关读取、导入、任务及删除接口也会拒绝访问。</div>
</div>
</div>
</div>
</details>
<details class="card admin-config-section" id="configSecurity">
<summary>
<span>

@ -13,36 +13,12 @@
<div class="text-sm-end mt-3 mt-sm-0 cloud-admin-actions">
<p id="cloud-admin-status" class="alert alert-info cloud-admin-notice" role="status" aria-live="polite">正在加载…</p>
<a class="btn btn-outline-primary" href="/admin/agents"><i class="mdi mdi-lan-connect me-1"></i>Agent API</a>
<button id="host-new" class="btn btn-primary" type="button" {if !$admin_can_manage|default:false}disabled{/if}><i class="mdi mdi-plus me-1"></i>添加节点</button>
<button id="host-new" class="btn btn-primary" type="button" aria-controls="host-config-drawer" aria-haspopup="dialog" {if !$admin_can_manage|default:false}disabled{/if}><i class="mdi mdi-plus me-1"></i>添加节点</button>
</div>
</div>
<section id="host-summary" class="cloud-admin-host-summary" aria-label="计算节点汇总"></section>
<form id="user-iso-settings-form" class="card cloud-admin-feature-card mb-3">
<div class="card-body">
<div class="cloud-admin-card-head cloud-admin-card-head-compact">
<div class="cloud-admin-feature-copy">
<span class="cloud-admin-card-icon"><i class="mdi mdi-disc-player"></i></span>
<div>
<h5 class="mb-1">用户 ISO 功能</h5>
<p class="text-muted mb-0">关闭后普通用户看不到 ISO 导航,相关读取、导入、任务及删除接口也会拒绝访问。</p>
</div>
</div>
<div class="cloud-admin-feature-actions">
<label class="cloud-admin-switch" for="user-iso-enabled">
<input id="user-iso-enabled" type="checkbox" {if !$admin_can_manage|default:false}disabled{/if}>
<span aria-hidden="true"></span>
<strong>向普通用户开放</strong>
</label>
<button id="user-iso-settings-save" class="btn btn-outline-primary" type="submit" {if !$admin_can_manage|default:false}disabled{/if}>
<i class="mdi mdi-content-save-outline me-1"></i>保存开关
</button>
</div>
</div>
</div>
</form>
<div class="cloud-admin-host-directory">
<div class="card">
<div class="card-body">
@ -50,11 +26,11 @@
<div><p class="admin-eyebrow mb-1">Regions</p><h5 class="mb-0">地区与节点</h5></div>
</div>
<div class="cloud-admin-host-filters" aria-label="筛选计算节点">
<label class="cloud-admin-host-search"><span class="visually-hidden">搜索计算节点</span><i class="mdi mdi-magnify" aria-hidden="true"></i><input id="host-search" class="form-control" type="search" autocomplete="off" placeholder="搜索节点、线路或资源池"></label>
<select id="host-region-filter" class="form-select" aria-label="按地区筛选"><option value="">全部地区</option></select>
<select id="host-state-filter" class="form-select" aria-label="按状态筛选"><option value="">全部状态</option><option value="ready">可调度</option><option value="attention">需要处理</option><option value="active">调度启用</option><option value="draining">正在排空</option><option value="disabled">调度停用</option></select>
<label class="cloud-admin-host-search"><span class="visually-hidden">搜索计算节点</span><i class="mdi mdi-magnify" aria-hidden="true"></i><input id="host-search" class="form-control" type="search" autocomplete="off" placeholder="搜索节点、线路或资源池" aria-controls="host-list"></label>
<select id="host-region-filter" class="form-select" aria-label="按地区筛选" aria-controls="host-list"><option value="">全部地区</option></select>
<select id="host-state-filter" class="form-select" aria-label="按状态筛选" aria-controls="host-list"><option value="">全部状态</option><option value="ready">可调度</option><option value="attention">需要处理</option><option value="active">调度启用</option><option value="draining">正在排空</option><option value="disabled">调度停用</option></select>
</div>
<div id="host-list" class="cloud-admin-host-list"></div>
<div id="host-list" class="cloud-admin-host-list" aria-label="计算节点列表"></div>
</div>
</div>
<div class="card cloud-admin-guide-card">
@ -76,10 +52,10 @@
<div class="cloud-admin-section-title"><span><i class="mdi mdi-server-network"></i></span><div><h6>节点概览</h6><p id="host-config-placement">正在读取地区与资源状态…</p></div></div>
<dl id="host-config-metrics" class="admin-instance-details cloud-admin-host-config-metrics"></dl>
<div class="cloud-admin-host-tool-grid" aria-label="计算节点管理工具">
<button id="host-config-scheduling" class="btn btn-outline-primary" type="button"><i class="mdi mdi-gauge me-1"></i>调度与容量</button>
<button id="host-config-network-pools" class="btn btn-outline-primary" type="button"><i class="mdi mdi-ip-network-outline me-1"></i>公网地址池</button>
<button id="host-config-vpc" class="btn btn-outline-primary" type="button"><i class="mdi mdi-lan me-1"></i>VPC 私网传输</button>
{if $admin_can_manage|default:false}<button id="host-config-storage" class="btn btn-outline-primary" type="button"><i class="mdi mdi-database-cog-outline me-1"></i>存储目录</button>{/if}
<button id="host-config-scheduling" class="btn btn-outline-primary" type="button" aria-controls="host-scheduling-drawer" aria-haspopup="dialog"><i class="mdi mdi-gauge me-1"></i>调度与容量</button>
<button id="host-config-network-pools" class="btn btn-outline-primary" type="button" aria-controls="host-network-pools-drawer" aria-haspopup="dialog"><i class="mdi mdi-ip-network-outline me-1"></i>公网地址池</button>
<button id="host-config-vpc" class="btn btn-outline-primary" type="button" aria-controls="host-vpc-transport-drawer" aria-haspopup="dialog"><i class="mdi mdi-lan me-1"></i>VPC 私网传输</button>
{if $admin_can_manage|default:false}<button id="host-config-storage" class="btn btn-outline-primary" type="button" aria-controls="host-storage-drawer" aria-haspopup="dialog"><i class="mdi mdi-database-cog-outline me-1"></i>存储目录</button>{/if}
<a class="btn btn-outline-secondary" href="/admin/agents"><i class="mdi mdi-lan-connect me-1"></i>Agent API</a>
</div>
</section>

@ -1,2 +1,2 @@
{* Shared Venix CSS/JS cache key. Increment whenever a shared browser asset changes. *}
{assign var=venix_asset_version value='2026103103' scope='global'}
{assign var=venix_asset_version value='2026103104' scope='global'}

@ -23,6 +23,7 @@ $assert(str_contains($template, 'id="host-summary"')
&& str_contains($template, 'id="host-search"')
&& str_contains($template, 'id="host-region-filter"')
&& str_contains($template, 'id="host-state-filter"')
&& str_contains($template, 'aria-controls="host-list"')
&& str_contains($template, 'id="host-config-drawer"')
&& str_contains($template, 'data-admin-host-config-drawer')
&& str_contains($template, 'id="host-config-overview"')
@ -60,12 +61,14 @@ $assert(str_contains($styles, '.cloud-admin-host-summary')
&& str_contains($styles, '.cloud-admin-host-node')
&& str_contains($styles, '.cloud-admin-host-tool-grid')
&& str_contains($styles, '.cloud-admin-host-config-metrics')
&& str_contains($styles, '.cloud-admin-host-summary-card:last-child:nth-child(odd)')
&& str_contains($styles, 'grid-template-columns: repeat(2, minmax(0, 1fr))')
&& str_contains($styles, '.cloud-admin-host-badge.is-success')
&& str_contains($styles, '@media (max-width: 767.98px)'),
'Compute-node region layout is missing desktop or responsive styles.');
$assert(preg_match("/venix_asset_version value='([0-9]+)'/", $assets,
$match) === 1 && (int) $match[1] >= 2026103103,
$match) === 1 && (int) $match[1] >= 2026103104,
'Compute-node region UI changes require a new shared asset version.');
echo "Administrator compute-node region UI contracts passed.\n";

@ -29,6 +29,12 @@ $sidebar = file_get_contents(
$hostAdmin = file_get_contents(
$root . '/resources/views/venix/admin/hosts/index.tpl'
);
$siteAdmin = file_get_contents(
$root . '/resources/views/venix/admin/config.tpl'
);
$siteConfig = file_get_contents(
$root . '/app/Controllers/Admin/ConfigController.php'
);
$adminClient = file_get_contents($root . '/public/cloud/admin.js');
$assert(str_contains($pages, "'/cloud/iso-images'")
@ -46,9 +52,11 @@ $assert(substr_count($controller, 'CloudUserIsoFeature::assertEnabled();') === 2
"public const CONFIG_KEY = 'cloud_user_iso_enabled'")
&& str_contains($feature, 'return self::$cached = false;')
&& str_contains($view, "assign('user_iso_enabled'")
&& str_contains($hostAdmin, 'id="user-iso-enabled"')
&& str_contains($adminClient,
"api('/api/v1/admin/user-iso/settings'")
&& !str_contains($hostAdmin, 'id="user-iso-enabled"')
&& !str_contains($adminClient, 'loadUserIsoSettings')
&& str_contains($siteAdmin, 'id="cloud_user_iso_enabled"')
&& str_contains($siteAdmin, 'name="cloud_user_iso_enabled"')
&& str_contains($siteConfig, 'CloudUserIsoFeature::CONFIG_KEY')
&& !str_contains($controller, 'userIsoTargets(')
&& !str_contains($controller, 'userIsoHost('),
'User ISO exposure must remain globally gated and fail closed.');

Loading…
Cancel
Save