From 055ca0a4ba21a666f73ef5bbd9cd6d38ce4c7d0d Mon Sep 17 00:00:00 2001 From: codex Date: Sat, 31 Oct 2026 04:12:18 +0800 Subject: [PATCH] style(admin): refine agent settings for mobile --- web/public/cloud/admin.css | 52 +++++++++++++++++++ web/public/cloud/agent-settings.js | 16 ++++-- .../views/venix/admin/cloud/agents.tpl | 22 ++++---- web/resources/views/venix/layout_assets.tpl | 2 +- web/tests/AdminAgentRegionUiContractTest.php | 11 +++- 5 files changed, 85 insertions(+), 18 deletions(-) diff --git a/web/public/cloud/admin.css b/web/public/cloud/admin.css index 05077a74..808d9223 100644 --- a/web/public/cloud/admin.css +++ b/web/public/cloud/admin.css @@ -1265,6 +1265,17 @@ background: #f8fafc; } +[data-admin-agent-settings-drawer] .cloud-agent-health { + margin: 0; +} + +[data-admin-agent-settings-drawer] .cloud-admin-submit { + display: flex; + flex-wrap: wrap; + justify-content: flex-end; + gap: 8px; +} + .cloud-agent-health dt, .cloud-agent-health dd { margin: 0; @@ -1537,6 +1548,30 @@ grid-template-columns: minmax(0, 1fr); } + .cloud-agent-checklist, + .cloud-agent-secret-control { + grid-template-columns: minmax(0, 1fr); + } + + .cloud-agent-secret-control .btn, + .cloud-agent-config-box .btn { + width: 100%; + } + + [data-admin-agent-settings-drawer] .admin-instance-drawer-footer > span { + text-align: left; + } + + [data-admin-agent-settings-drawer] .cloud-admin-submit { + width: 100%; + display: grid; + grid-template-columns: minmax(0, 1fr); + } + + [data-admin-agent-settings-drawer] .cloud-admin-submit .btn { + width: 100%; + } + .cloud-admin-host-guide-body, .cloud-admin-host-config-footer { align-items: stretch; @@ -1652,6 +1687,23 @@ } @media (max-width: 575.98px) { + .cloud-admin-agent-row { + min-height: 0 !important; + } + + .cloud-admin-agent-row .cloud-admin-host-metrics { + grid-template-columns: minmax(0, 1fr); + } + + .cloud-agent-secret-actions { + display: grid; + grid-template-columns: minmax(0, 1fr); + } + + .cloud-agent-secret-actions .btn { + width: 100%; + } + .cloud-agent-health { grid-template-columns: minmax(0, 1fr); gap: 3px; diff --git a/web/public/cloud/agent-settings.js b/web/public/cloud/agent-settings.js index 031adc91..df6a96ac 100644 --- a/web/public/cloud/agent-settings.js +++ b/web/public/cloud/agent-settings.js @@ -144,6 +144,7 @@ function renderAgent(agent) { button.dataset.hostId = String(agent.host_id); button.setAttribute('aria-controls', 'agent-settings-drawer'); button.setAttribute('aria-haspopup', 'dialog'); + button.setAttribute('aria-expanded', 'false'); button.setAttribute('aria-label', `配置 Agent ${agent.host_name || agent.agent_id}`); if (String(agent.host_id) === String(state.selected)) button.setAttribute('aria-current', 'true'); const heading = text('span', 'cloud-admin-host-heading', ''); @@ -192,6 +193,10 @@ function renderList() { group.append(header, nodes); list.append(group); } if (!visible) list.append(text('p', 'cloud-admin-host-empty', '没有符合当前筛选条件的 Agent。')); + if (byId('agent-settings-drawer')?.open) { + state.drawerOpener = list.querySelector(`[data-host-id="${state.selected}"]`); + state.drawerOpener?.setAttribute('aria-expanded', 'true'); + } } function renderHealth(agent) { @@ -234,11 +239,11 @@ function generateAgentSecret() { return btoa(String.fromCharCode(...bytes)).replaceAll('+', '-').replaceAll('/', '_').replace(/=+$/u, ''); } -function configFragment(agent, secret) { +function configFragment(agent, secret, redact = false) { return JSON.stringify({ panel_url: location.origin, agent_id: String(agent?.agent_id || agent?.host_id || ''), - agent_secret: secret, + agent_secret: redact ? '••••••••••••••••••••••••••••••••' : secret, }, null, 2); } @@ -272,7 +277,8 @@ function renderSecretDraft(agent) { || (rotating && !state.rotationConfirmed); const box = byId('agent-settings-config-box'); box.hidden = !hasDraft; - byId('agent-settings-config-preview').textContent = hasDraft ? configFragment(agent, secret) : ''; + byId('agent-settings-config-preview').textContent = hasDraft + ? configFragment(agent, secret, !state.secretVisible) : ''; const generateLabel = byId('agent-settings-generate').querySelector('span'); generateLabel.textContent = agent?.secret_configured ? '生成新密钥(轮换)' : '生成安全密钥'; byId('agent-settings-secret-help').textContent = hasDraft && agent?.secret_configured @@ -302,7 +308,6 @@ function finishDrawerClose() { state.drawerScroll = null; if (state.drawerOpener?.isConnected) state.drawerOpener.focus({ preventScroll: true }); state.drawerOpener = null; - clearSecretDraft(); } function openDrawer(opener) { @@ -311,11 +316,14 @@ function openDrawer(opener) { if (drawer.open) return; lockDrawerScroll(); window.VenixDrawerMotion.openDrawerWithMotion(drawer); + opener?.setAttribute('aria-expanded', 'true'); } function closeDrawer() { const drawer = byId('agent-settings-drawer'); if (!drawer?.open) return; + state.drawerOpener?.setAttribute('aria-expanded', 'false'); + clearSecretDraft(); void window.VenixDrawerMotion.closeDrawerWithMotion(drawer).then(closed => { if (closed) finishDrawerClose(); }); diff --git a/web/resources/views/venix/admin/cloud/agents.tpl b/web/resources/views/venix/admin/cloud/agents.tpl index cebc1b34..e2345d02 100644 --- a/web/resources/views/venix/admin/cloud/agents.tpl +++ b/web/resources/views/venix/admin/cloud/agents.tpl @@ -43,12 +43,12 @@

Agent Connection

选择计算节点

- +
接入进度

按顺序完成身份保存、宿主机配置、存储注册和能力测试。

-
    +
      @@ -66,20 +66,20 @@
      - - + +
      -
      密钥不会从服务器返回到浏览器。
      +
      密钥不会从服务器返回到浏览器。
      - - - + + +
      -
      diff --git a/web/resources/views/venix/layout_assets.tpl b/web/resources/views/venix/layout_assets.tpl index f4c571fa..9ff61e20 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='2026103108' scope='global'} +{assign var=venix_asset_version value='2026103109' scope='global'} diff --git a/web/tests/AdminAgentRegionUiContractTest.php b/web/tests/AdminAgentRegionUiContractTest.php index 5ad89b2f..1935f5f2 100644 --- a/web/tests/AdminAgentRegionUiContractTest.php +++ b/web/tests/AdminAgentRegionUiContractTest.php @@ -30,6 +30,8 @@ $assert(str_contains($template, 'id="agent-settings-summary"') && str_contains($template, 'id="agent-settings-copy-secret"') && str_contains($template, 'id="agent-settings-copy-config"') && str_contains($template, 'id="agent-settings-rotation-confirm"') + && str_contains($template, 'aria-describedby="agent-settings-secret-help"') + && str_contains($template, 'aria-labelledby="agent-settings-config-title"') && str_contains($template, 'aria-controls="agent-settings-list"'), 'Agent page is missing its summary or region filters.'); $assert(str_contains($script, 'state.regions = Array.isArray(payload.regions)') @@ -46,6 +48,9 @@ $assert(str_contains($script, 'state.regions = Array.isArray(payload.regions)') && str_contains($script, 'function configFragment(') && str_contains($script, 'navigator.clipboard?.writeText') && str_contains($script, 'state.rotationConfirmed') + && str_contains($script, "setAttribute('aria-expanded', 'true')") + && str_contains($script, 'state.drawerOpener = list.querySelector') + && str_contains($script, 'configFragment(agent, secret, !state.secretVisible)') && !str_contains($script, 'Math.random') && !str_contains($script, 'localStorage') && !str_contains($script, 'sessionStorage') @@ -55,10 +60,12 @@ $assert(str_contains($styles, '.cloud-admin-agent-directory') && str_contains($styles, '.cloud-admin-agent-filters') && str_contains($styles, '.cloud-admin-agent-row') && str_contains($styles, '.cloud-agent-checklist-step') - && str_contains($styles, '.cloud-agent-config-box'), + && str_contains($styles, '.cloud-agent-config-box') + && str_contains($styles, '[data-admin-agent-settings-drawer] .cloud-admin-submit') + && str_contains($styles, '.cloud-agent-secret-actions'), 'Agent region layout styles are missing.'); $assert(preg_match("/venix_asset_version value='([0-9]+)'/", $assets, - $match) === 1 && (int) $match[1] >= 2026103108, + $match) === 1 && (int) $match[1] >= 2026103109, 'Agent region UI requires a new shared asset version.'); echo "Administrator Agent region UI contracts passed.\n";