From d7262885ea6acf5ce3446f53d209fd6990b1b494 Mon Sep 17 00:00:00 2001 From: admin Date: Sun, 27 Sep 2026 22:28:05 +0800 Subject: [PATCH] fix: compact saved SSH key cards --- web/public/cloud/runtime.js | 2 +- web/public/cloud/styles.css | 4 ++-- web/resources/views/venix/layout_assets.tpl | 2 +- web/tests/VirtualizationAssetsTest.php | 4 ++++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/web/public/cloud/runtime.js b/web/public/cloud/runtime.js index acda4f5b..2839ef8f 100644 --- a/web/public/cloud/runtime.js +++ b/web/public/cloud/runtime.js @@ -243,7 +243,7 @@ async function loadKeys() { function renderKeys() { const container = byId('ssh-keys-list'); container.replaceChildren(); if (!state.sshKeys.length) return container.append(makeElement('p', 'muted', '还没有公钥。')); - for (const key of state.sshKeys) { const row = makeElement('div', 'ssh-key-row'); const details = makeElement('div', 'ssh-key-details'); details.append(makeElement('strong', '', key.name), makeElement('small', 'muted', key.fingerprint || '')); const actions = makeElement('div', 'ssh-key-actions'); const button = actionButton('删除', async () => { if (!confirm(`删除公钥“${key.name}”?已创建的虚拟机不受影响。`)) return; try { await api(`/api/v1/ssh-keys/${encodeURIComponent(key.id)}`, { method: 'DELETE' }); await loadKeys(); } catch (error) { toast(error.message, 'error'); } }); button.classList.add('ssh-key-delete'); actions.append(button); row.append(details, actions); container.append(row); } + for (const key of state.sshKeys) { const row = makeElement('div', 'ssh-key-row'); const details = makeElement('div', 'ssh-key-details'); details.append(makeElement('strong', '', key.name), makeElement('small', '', key.fingerprint || '')); const actions = makeElement('div', 'ssh-key-actions'); const button = actionButton('删除', async () => { if (!confirm(`删除公钥“${key.name}”?已创建的虚拟机不受影响。`)) return; try { await api(`/api/v1/ssh-keys/${encodeURIComponent(key.id)}`, { method: 'DELETE' }); await loadKeys(); } catch (error) { toast(error.message, 'error'); } }); button.classList.add('ssh-key-delete'); actions.append(button); row.append(details, actions); container.append(row); } } function renderKeyCards(kind) { const id = kind === 'create' ? 'vm-guest-ssh-key-cards' : 'reinstall-ssh-key-cards'; const container = byId(id); if (!container) return; container.replaceChildren(); diff --git a/web/public/cloud/styles.css b/web/public/cloud/styles.css index f63e602c..e6e7d0d3 100644 --- a/web/public/cloud/styles.css +++ b/web/public/cloud/styles.css @@ -73,7 +73,7 @@ input:focus,select:focus,button:focus-visible{outline:3px solid rgba(18,166,176, .host-test-status{font-size:12px;color:#708095;background:#f4f7fa;padding:12px 14px;border-radius:8px;line-height:1.55;margin:0 0 15px}.host-test-status.success{background:#e7f8ef;color:#1d9168}.host-test-status.warning{background:#fff4e6;color:#9a641d}.host-submit-actions{display:flex;gap:9px;flex-wrap:wrap}.host-submit-actions .button{flex:1}.host-card .form-error{margin:0 0 13px} .update-grid{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:19px;align-items:start}.update-grid .host-card{min-width:0}.update-grid .form-stack input{margin-bottom:17px}.update-grid .form-stack .field-hint{display:block;color:#8395a5;font-size:11px;line-height:1.6;margin:-7px 0 17px}.update-grid .form-stack .button{align-self:flex-start}.update-grid .host-test-status{margin-top:17px;overflow-wrap:anywhere}.update-versions{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:11px}.update-versions>div{border:1px solid #e2ebf0;border-radius:9px;padding:13px;background:#fbfdfd;min-width:0}.update-versions span{display:block;color:#8291a1;font-size:11px;margin-bottom:9px}.update-versions strong{display:block;color:#284459;font-size:12px;font-family:ui-monospace,SFMono-Regular,Menlo,monospace;overflow-wrap:anywhere} .update-grid .form-stack input[readonly]{background:#f4f7f9;color:#6c7d8d} -.ssh-keys-grid{display:grid;grid-template-columns:minmax(0,.9fr) minmax(0,1.1fr);gap:19px;align-items:start}.ssh-keys-grid .host-card{min-width:0}.ssh-keys-grid .form-stack .button{align-self:flex-start}.ssh-keys-grid .form-stack textarea{margin-bottom:19px}.ssh-key-file-hint{display:block;color:#8b9bab;font-size:11px;line-height:1.5;margin:-14px 0 20px}.ssh-keys-list{display:grid;gap:11px}.ssh-keys-list>.muted{margin:0}.ssh-key-row{display:flex;justify-content:space-between;align-items:center;gap:16px;padding:14px;border:1px solid #e2ebef;border-radius:9px;background:#fbfdfd}.ssh-key-details{min-width:0;display:grid;gap:5px}.ssh-key-details strong{font-size:13px;color:#2b4358;overflow-wrap:anywhere}.ssh-key-details code{font-size:11px;color:#3b7a87;overflow-wrap:anywhere}.ssh-key-details small{font-size:10px;color:#95a4b2}.ssh-key-actions{display:flex;flex:none;gap:7px}.ssh-key-delete{color:#b94b57;border-color:#efd8dc} +.ssh-keys-grid{display:grid;grid-template-columns:minmax(0,.9fr) minmax(0,1.1fr);gap:19px;align-items:start}.ssh-keys-grid .host-card{min-width:0}.ssh-keys-grid .form-stack .button{align-self:flex-start}.ssh-keys-grid .form-stack textarea{margin-bottom:19px}.ssh-key-file-hint{display:block;color:#8b9bab;font-size:11px;line-height:1.5;margin:-14px 0 20px}.ssh-keys-list{display:grid;gap:11px}.ssh-keys-list>.muted{margin:0}.ssh-key-row{display:flex;justify-content:space-between;align-items:center;gap:16px;padding:14px;border:1px solid #e2ebef;border-radius:9px;background:#fbfdfd}.ssh-key-details{min-width:0;display:grid;gap:5px}.ssh-key-details strong{font-size:13px;color:#2b4358;overflow-wrap:anywhere}.ssh-key-details code{font-size:11px;color:#3b7a87;overflow-wrap:anywhere}.ssh-key-details small{display:block;margin:0;font-size:10px;line-height:1.5;color:#95a4b2;overflow-wrap:anywhere}.ssh-key-actions{display:flex;flex:none;gap:7px}.ssh-key-delete{color:#b94b57;border-color:#efd8dc} .ssh-key-picker-title{display:block;color:#34445a;font-size:12px;font-weight:700}.ssh-key-picker{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:10px;margin-top:10px}.ssh-key-option{display:flex;align-items:center;width:100%;min-width:0;min-height:74px;padding:12px 14px;text-align:left;border:1px solid #dce4eb;border-radius:9px;background:#fff;color:#334a5f;cursor:pointer}.ssh-key-option strong{font-size:12px;line-height:1.5;overflow-wrap:anywhere}.ssh-key-option[aria-pressed="true"]{border-color:#3bb5bc;background:#effafa;box-shadow:0 0 0 2px rgba(20,166,175,.08)}.ssh-key-option:focus-visible{outline:3px solid rgba(18,166,176,.22);outline-offset:2px}.ssh-key-picker-empty{grid-column:1/-1;margin:0;color:#8b9bab;font-size:11px}.ssh-key-picker-manage{margin-top:9px;padding:0;border:0;background:transparent;color:#148c98;font-size:11px;font-weight:700;cursor:pointer}.ssh-key-picker-manage:hover{text-decoration:underline}.field small.root-password-hint-error{color:#b73e4c}.field small.root-password-hint-success{color:#247f67} @media(max-width:510px){.ssh-key-picker{grid-template-columns:1fr}} .unlock-content{min-height:calc(100vh - 75px);display:flex;align-items:center;justify-content:center;padding:40px 24px}.unlock-card{width:min(100%,480px);padding:35px}.unlock-card h1{font-size:28px;letter-spacing:-.5px;margin:12px 0}.unlock-card .muted{margin:0 0 27px}.unlock-card .muted strong{color:#30445a;overflow-wrap:anywhere}.unlock-submit{width:100%;min-height:46px}.unlock-settings-button{margin-top:18px;padding-left:0} @@ -173,7 +173,7 @@ tbody tr:hover{background:#fcfefe} @media(max-width:510px){.workspace-form-body{padding:22px 19px 25px}.workspace-form-actions{padding:15px 19px}.workspace-form-actions .button{flex:1 1 100%}.workspace-form-back{margin-bottom:10px}} @media(max-width:510px){.host-public-pool>.form-grid{grid-template-columns:1fr}} @media(max-width:510px){.register-code-row{flex-wrap:wrap}.register-code-row input{flex-basis:100%}.register-code-row .button{width:100%}.pending-user-row{align-items:flex-start;flex-direction:column}.pending-user-row .button{width:100%}.smtp-card .form-grid{grid-template-columns:1fr}} -@media(max-width:510px){.ssh-key-row{align-items:flex-start;flex-direction:column}.ssh-key-actions{width:100%}.ssh-key-actions .button{flex:1}} +@media(max-width:510px){.ssh-key-row{align-items:flex-start;flex-direction:column;justify-content:flex-start}.ssh-key-actions{width:100%}.ssh-key-actions .row-button{flex:1}} @media(max-width:510px){.vm-detail-heading .heading-actions{justify-content:space-between}.vm-detail-heading .heading-actions .button{flex:0 0 auto}.vm-detail-facts{grid-template-columns:1fr}.vm-detail-facts>div{padding:12px 0}.vm-detail-actions .row-button{flex:1 1 135px}.vm-table td{padding:10px 11px}.vm-identity{min-width:0}.vm-name-link{max-width:calc(100vw - 130px)}} .rescue-status{margin:8px 0 17px;padding:12px 14px;border:1px solid #c8e9e8;border-radius:9px;background:#f0fbfa;color:#236d71;font-size:12px;line-height:1.6} .rescue-directory-note{margin:0 0 17px;padding:10px 12px;border:1px solid #d6e8ee;border-radius:8px;background:#f6fafc;color:#557085;font-size:11px;line-height:1.6;overflow-wrap:anywhere} diff --git a/web/resources/views/venix/layout_assets.tpl b/web/resources/views/venix/layout_assets.tpl index 21ade483..326280d8 100644 --- a/web/resources/views/venix/layout_assets.tpl +++ b/web/resources/views/venix/layout_assets.tpl @@ -1 +1 @@ -{assign var=venix_asset_version value='2026092721' scope='global'} +{assign var=venix_asset_version value='2026092722' scope='global'} diff --git a/web/tests/VirtualizationAssetsTest.php b/web/tests/VirtualizationAssetsTest.php index 1f40910f..4fba4878 100644 --- a/web/tests/VirtualizationAssetsTest.php +++ b/web/tests/VirtualizationAssetsTest.php @@ -89,6 +89,10 @@ $assert(substr_count($clientScript, "window.addEventListener('pageshow'") >= 3 && substr_count($clientScript, 'startPolling();') >= 6, 'Instance, detail and invoice polling must resume after a browser back-forward cache restore'); $assert(str_contains($baseStyles, '#create-view.workspace-form-page,#reinstall-view.workspace-form-page{width:100%;margin-left:0;margin-right:0}'), 'Create and reinstall pages must align to the full VM-list content width'); +$assert(str_contains($baseStyles, '.ssh-key-details small{display:block;margin:0;') + && str_contains($baseStyles, '.ssh-key-actions .row-button{flex:1}') + && str_contains($clientScript, "makeElement('small', '', key.fingerprint || '')"), + 'Saved SSH keys must not inherit global muted spacing and mobile actions must target the rendered button class'); $assert(str_contains($cloudTemplate, '>实例管理') && str_contains($cloudTemplate, '>部署实例'), 'Instance page terminology missing'); $assert(str_contains($sharedSidebar, '>我的实例') && str_contains($sharedSidebar, '>部署实例'), 'Shared sidebar instance terminology missing'); $assert(!str_contains($cloudTemplate, '购买并开通') && !str_contains($sharedSidebar, '我的虚拟机'), 'Retired VM sales labels remain');