diff --git a/web/app/Controllers/Admin/ConfigController.php b/web/app/Controllers/Admin/ConfigController.php index 14a2cbe8..94b940b9 100644 --- a/web/app/Controllers/Admin/ConfigController.php +++ b/web/app/Controllers/Admin/ConfigController.php @@ -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, diff --git a/web/public/cloud/admin.css b/web/public/cloud/admin.css index f1b413c0..ff0745d7 100644 --- a/web/public/cloud/admin.css +++ b/web/public/cloud/admin.css @@ -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, diff --git a/web/public/cloud/admin.js b/web/public/cloud/admin.js index a050c0d9..9351af03 100644 --- a/web/public/cloud/admin.js +++ b/web/public/cloud/admin.js @@ -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(); } diff --git a/web/resources/views/venix/admin/config.tpl b/web/resources/views/venix/admin/config.tpl index 3d3987c1..f6710053 100644 --- a/web/resources/views/venix/admin/config.tpl +++ b/web/resources/views/venix/admin/config.tpl @@ -37,6 +37,7 @@
+正在加载…
Agent API - +Regions
正在读取地区与资源状态…