diff --git a/web/app/Controllers/CloudPageController.php b/web/app/Controllers/CloudPageController.php index 3a7184f1..8dcc0b7c 100644 --- a/web/app/Controllers/CloudPageController.php +++ b/web/app/Controllers/CloudPageController.php @@ -342,12 +342,13 @@ final class CloudPageController return preg_match('/^[1-9][0-9]*$/D', $vmId) === 1 ? $vmId : null; } - /** Deployment forms need only opaque key identifiers and user labels. */ + /** Deployment forms expose only the key identifier and safe display metadata. */ private function sshKeyOptions(int $userId): array { return array_map(static fn (array $key): array => [ 'id' => $key['id'], 'name' => $key['name'], + 'fingerprint' => $key['fingerprint'], ], CloudDeploymentPageService::sshKeys($userId)); } diff --git a/web/public/cloud/runtime.js b/web/public/cloud/runtime.js index 4b5b174e..8a44b304 100644 --- a/web/public/cloud/runtime.js +++ b/web/public/cloud/runtime.js @@ -343,7 +343,37 @@ function renderKeys() { 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(); if (!state.sshKeys.some(key => String(key.id) === state.selectedKeys[kind])) state.selectedKeys[kind] = ''; - for (const key of state.sshKeys) { const button = makeElement('button', 'ssh-key-option'); button.type = 'button'; button.setAttribute('aria-pressed', String(state.selectedKeys[kind] === String(key.id))); button.append(makeElement('strong', 'ssh-key-choice-label', key.name)); button.addEventListener('click', () => { state.selectedKeys[kind] = state.selectedKeys[kind] === String(key.id) ? '' : String(key.id); renderKeyCards(kind); }); container.append(button); } + for (const key of state.sshKeys) { + const keyId = String(key.id); + const selected = state.selectedKeys[kind] === keyId; + const fingerprint = String(key.fingerprint || '').trim(); + const button = makeElement('button', 'ssh-key-option'); + button.type = 'button'; + button.dataset.keyId = keyId; + button.dataset.keyFingerprint = fingerprint; + button.setAttribute('aria-pressed', String(selected)); + button.setAttribute('aria-label', `${selected ? '取消选择' : '选择'} SSH 公钥 ${key.name},指纹 ${fingerprint || '未记录'}`); + const icon = makeElement('i', 'mdi mdi-key-variant ssh-key-choice-icon'); + icon.setAttribute('aria-hidden', 'true'); + const copy = makeElement('span', 'ssh-key-choice-copy'); + const fingerprintLabel = makeElement('small', 'ssh-key-choice-fingerprint', fingerprint || '指纹未记录'); + if (fingerprint) fingerprintLabel.title = fingerprint; + copy.append(makeElement('strong', 'ssh-key-choice-label', key.name), fingerprintLabel); + const check = makeElement('span', 'ssh-key-choice-check', '✓'); + check.setAttribute('aria-hidden', 'true'); + button.append(icon, copy, check); + button.addEventListener('click', () => { + state.selectedKeys[kind] = state.selectedKeys[kind] === keyId ? '' : keyId; + container.querySelectorAll('.ssh-key-option').forEach((option) => { + const optionSelected = option.dataset.keyId === state.selectedKeys[kind]; + const optionName = option.querySelector('.ssh-key-choice-label')?.textContent || ''; + const optionFingerprint = option.dataset.keyFingerprint || '未记录'; + option.setAttribute('aria-pressed', String(optionSelected)); + option.setAttribute('aria-label', `${optionSelected ? '取消选择' : '选择'} SSH 公钥 ${optionName},指纹 ${optionFingerprint}`); + }); + }); + container.append(button); + } if (!state.sshKeys.length) container.append(makeElement('p', 'muted', '暂无公钥,可先到“公钥管理”添加。不选公钥也会生成强密码。')); } function flagForCountry(code) { @@ -2037,7 +2067,7 @@ function updateTemplateFamilySelection(card, selectedName = "", selectedVersion const versionLabel = String(selectedVersion || fallbackVersion).trim(); card.classList.toggle("has-selection", selected); if (label) { - label.textContent = selected ? (versionLabel ? `版本 ${versionLabel}` : "已选择") : ""; + label.textContent = selected ? versionLabel : ""; label.title = selected ? selectedName : ""; } summary?.setAttribute("aria-label", selected diff --git a/web/public/cloud/styles.css b/web/public/cloud/styles.css index a3ef4a0e..ab521251 100644 --- a/web/public/cloud/styles.css +++ b/web/public/cloud/styles.css @@ -74,7 +74,7 @@ input:focus,select:focus,button:focus-visible{outline:3px solid rgba(18,166,176, .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{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} +.ssh-key-picker-title{display:block;color:#34445a;font-size:12px;font-weight:700}.ssh-key-picker{display:grid;grid-template-columns:repeat(auto-fill,minmax(240px,320px));justify-content:start;gap:8px;margin-top:10px}.ssh-key-picker>.muted{grid-column:1/-1;margin:0}.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-picker .ssh-key-option{display:grid;grid-template-columns:34px minmax(0,1fr) 20px;gap:10px;min-height:58px;padding:9px 11px;transition:border-color .15s,background-color .15s,box-shadow .15s}.ssh-key-picker .ssh-key-option:hover{border-color:#a9d7da;background:#f8fcfc}.ssh-key-choice-icon{display:grid;width:34px;height:34px;place-items:center;border-radius:8px;background:#e8f7f7;color:#168c96;font-size:19px}.ssh-key-choice-copy{display:grid;gap:2px;min-width:0}.ssh-key-choice-label{overflow:hidden;color:#2b4358;font-size:12px;line-height:1.4;text-overflow:ellipsis;white-space:nowrap}.field .ssh-key-choice-fingerprint{display:block;min-width:0;margin:0;overflow:hidden;color:#8999a8;font:9px/1.45 ui-monospace,SFMono-Regular,Menlo,monospace;text-overflow:ellipsis;white-space:nowrap}.ssh-key-choice-check{display:grid;width:20px;height:20px;place-items:center;border:1px solid #cfdae1;border-radius:50%;background:#fff;color:transparent;font-size:11px;font-weight:900}.ssh-key-option[aria-pressed="true"]{border-color:#3bb5bc;background:#effafa;box-shadow:0 0 0 2px rgba(20,166,175,.08)}.ssh-key-picker .ssh-key-option[aria-pressed="true"] .ssh-key-choice-icon{background:#d8f1f1;color:#0c7f89}.ssh-key-picker .ssh-key-option[aria-pressed="true"] .ssh-key-choice-check{border-color:#20a6af;background:#20a6af;color:#fff}.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} .dashboard{min-height:100vh;display:grid;grid-template-columns:244px minmax(0,1fr)} @@ -144,7 +144,7 @@ tbody tr:hover{background:#fcfefe} .create-source-picker{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:12px;border:0;padding:0;margin:0 0 23px;min-width:0}.create-source-picker legend{color:#34445a;font-size:13px;font-weight:700;padding:0;margin-bottom:10px}.create-source-picker label{position:relative;display:block;cursor:pointer}.create-source-picker input{position:absolute;opacity:0;width:1px;height:1px}.create-source-picker label span{display:flex;align-items:center;border:1px solid #dce4eb;border-radius:9px;padding:12px 14px;min-height:50px;background:#fff}.create-source-picker input:checked+span{border-color:#3bb5bc;background:#effafa;box-shadow:0 0 0 2px rgba(20,166,175,.08)}.create-source-picker input:focus-visible+span{outline:3px solid rgba(18,166,176,.22);outline-offset:2px}.create-source-picker strong{display:block;color:#334a5f;font-size:12px} .template-field-label{display:block;color:#34445a;font-size:13px;font-weight:700;margin-bottom:10px}.template-field-label span{color:#dc5965}.template-catalog{display:grid;grid-template-columns:repeat(auto-fill,minmax(210px,1fr));align-items:start;gap:14px}.template-catalog-empty,.template-catalog-status{grid-column:1/-1;margin:0;padding:17px;border:1px dashed #cbdbe3;border-radius:10px;background:#f8fbfc;color:#698094;font-size:12px}.template-catalog-status{border-style:solid;background:#f1f9fa;color:#2f7f87}.template-family-card{position:relative;z-index:1;min-width:0;border:1px solid #dce7ec;border-radius:12px;background:#fff;overflow:visible;transition:border-color .18s ease,background-color .18s ease,box-shadow .18s ease}.template-family-card[open]{z-index:20;border-color:#a8dadd;box-shadow:0 12px 28px rgba(30,66,82,.14)}.template-family-card.has-selection{border-color:#2eabb4;background:#f5fbfb}.template-family-selected-mark{position:absolute;top:10px;right:10px;z-index:2;display:none;place-items:center;width:22px;height:22px;border-radius:50%;background:#18a6b0;color:#fff;font-size:12px;font-weight:900;line-height:1;pointer-events:none}.template-family-card.has-selection .template-family-selected-mark{display:grid}.template-family-summary{display:flex;align-items:center;flex-direction:column;gap:6px;min-height:152px;padding:15px 13px 12px;border-radius:inherit;background:transparent;cursor:pointer;text-align:center;list-style:none;-webkit-tap-highlight-color:transparent}.template-family-summary::-webkit-details-marker{display:none}.template-family-summary:focus-visible{outline:3px solid rgba(18,166,176,.22);outline-offset:-3px}.template-family-summary strong{color:#30465a;font-size:14px}.template-family-icon{display:flex;align-items:center;justify-content:center;width:58px;height:58px;border-radius:15px;background:linear-gradient(145deg,#2a6385,#173d58);color:#fff;font-size:28px;font-weight:800;box-shadow:0 6px 16px rgba(24,68,90,.15)}.template-family-arrow{display:block;flex:none;width:8px;height:8px;border-right:2px solid #718795;border-bottom:2px solid #718795;transform:rotate(45deg);transition:transform .2s,border-color .2s}.template-family-card[open] .template-family-arrow{border-color:#168d96;transform:rotate(225deg)}.template-versions{position:absolute;top:calc(100% + 8px);left:0;right:0;z-index:30;display:grid;gap:7px;max-height:min(260px,50vh);padding:12px;overflow-y:auto;border:1px solid #dce7ec;border-radius:10px;background:#fbfdfd;box-shadow:0 16px 36px rgba(25,55,76,.18)}.template-version-option{width:100%;display:grid;gap:3px;padding:11px 12px;border:1px solid #dee8ed;border-radius:8px;background:#fff;text-align:left;color:#344e60}.template-version-option strong{font-size:12px}.template-version-option[aria-pressed="true"]{border-color:#35afb7;background:#eaf8f8;box-shadow:0 0 0 2px rgba(20,166,175,.09)}.template-version-option:hover{border-color:#48b6bd}.template-admin-grid{display:grid;grid-template-columns:minmax(0,.9fr) minmax(0,1.1fr);align-items:start;gap:19px}.template-admin-grid .host-card{min-width:0}.template-admin-grid .form-stack .button{align-self:flex-start}.template-field-help{display:block;margin:-16px 0 19px;color:#8b9bab;font-size:11px;line-height:1.55}.template-import-status{margin:0 0 14px;padding:10px 12px;border-radius:8px;background:#edf8f8;color:#317c85;font-size:11px;line-height:1.6}.template-admin-list{display:grid;gap:10px}.template-admin-list>.muted{margin:0}.template-admin-row{display:grid;grid-template-columns:minmax(0,1fr) auto;gap:9px 11px;align-items:end;padding:14px;border:1px solid #e0e9ee;border-radius:10px;background:#fbfdfd}.template-admin-row-heading{grid-column:1/-1;display:flex;align-items:center;gap:9px;margin-bottom:3px;color:#34495c;font-size:12px}.template-admin-icon{display:flex;align-items:center;justify-content:center;width:27px;height:27px;border-radius:7px;background:#e3f6f3;color:#138d8f;font-weight:800}.template-admin-row label{grid-column:1/-1;margin:0;color:#75899b;font-size:11px;font-weight:700}.template-admin-row input{width:100%;min-width:0;height:37px;padding:0 10px;border:1px solid #dce4eb;border-radius:7px;background:#fff;color:#20364a;font-size:12px}.template-admin-row .button{min-height:37px}.template-admin-row .form-error{grid-column:1/-1;margin:0} .template-family-icon.system,.template-admin-icon.system{background:transparent;border:0;box-shadow:none;color:inherit;text-shadow:none}.template-system-logo{display:block;width:100%;height:100%;object-fit:contain}.template-version-option{display:flex;align-items:center;justify-content:center;text-align:center}.template-version-option strong{overflow-wrap:anywhere} -.template-family-footer{display:flex;align-items:center;justify-content:center;gap:8px;width:100%;min-height:25px;margin-top:1px}.template-family-selection{display:block;max-width:calc(100% - 20px);min-height:23px;padding:4px 9px;overflow:hidden;border-radius:999px;background:#e3f5f5;color:#137f88;font-size:11px;font-weight:800;line-height:15px;text-overflow:ellipsis;white-space:nowrap}.template-family-selection:empty{padding-right:0;padding-left:0;background:transparent;color:#7c8f9e;font-weight:700}.template-family-selection:empty::before{content:"选择版本"} +.template-family-footer{display:flex;align-items:center;justify-content:center;gap:8px;width:100%;min-height:25px;margin-top:1px}.template-family-selection{display:block;max-width:calc(100% - 20px);min-height:23px;padding:4px 9px;overflow:hidden;border-radius:999px;background:#e3f5f5;color:#137f88;font-size:11px;font-weight:800;line-height:15px;text-overflow:ellipsis;white-space:nowrap}.template-family-selection:empty{display:none} .template-versions{gap:0;padding:5px 12px}.template-version-option{min-height:44px;padding:11px 4px;border:0;border-bottom:1px solid #e4ecef;border-radius:0;background:transparent;box-shadow:none;color:#344e60}.template-version-option:last-child{border-bottom:0}.template-version-option:hover{border-color:#e4ecef;background:#f0f9f9;color:#167f88}.template-version-option:focus-visible{outline:2px solid #35afb7;outline-offset:-2px;background:#f0f9f9}.template-version-option[aria-pressed="true"]{border-color:#e4ecef;background:#eaf8f8;box-shadow:none;color:#137f88} .cloud-fields{grid-column:1/-1;border-top:1px solid #e7edf2;padding-top:18px}.cloud-fields-heading{margin-bottom:17px}.cloud-fields-heading strong{display:block;color:#34445a;font-size:13px}.cloud-fields-heading small{display:block;color:#8798a7;font-size:10px;line-height:1.6;margin-top:6px} .input-suffix{position:relative}.input-suffix input{padding-right:48px}.input-suffix span{position:absolute;right:13px;top:13px;color:#97a4b2;font-size:12px} diff --git a/web/resources/views/venix/cloud/pages/deploy.tpl b/web/resources/views/venix/cloud/pages/deploy.tpl index 2897c178..b412ceb0 100644 --- a/web/resources/views/venix/cloud/pages/deploy.tpl +++ b/web/resources/views/venix/cloud/pages/deploy.tpl @@ -73,7 +73,7 @@
4

实例信息

-
SSH 公钥(可选)
{if empty($cloud_deploy_ssh_keys)}

暂无公钥,可先到“公钥管理”添加。不选公钥也会生成强密码。

{else}{foreach $cloud_deploy_ssh_keys as $key}{/foreach}{/if}
管理我的公钥
留空时生成 32 位完全随机密码;自行设置需为 12–128 位不含空格的英文可打印字符,包含大写、小写、数字和符号。
+
SSH 公钥(可选)
{if empty($cloud_deploy_ssh_keys)}

暂无公钥,可先到“公钥管理”添加。不选公钥也会生成强密码。

{else}{foreach $cloud_deploy_ssh_keys as $key}{/foreach}{/if}
管理我的公钥
留空时生成 32 位完全随机密码;自行设置需为 12–128 位不含空格的英文可打印字符,包含大写、小写、数字和符号。
diff --git a/web/resources/views/venix/cloud/pages/reinstall.tpl b/web/resources/views/venix/cloud/pages/reinstall.tpl index 271fd919..c7edb8be 100644 --- a/web/resources/views/venix/cloud/pages/reinstall.tpl +++ b/web/resources/views/venix/cloud/pages/reinstall.tpl @@ -10,7 +10,7 @@

沿用首次创建的公网网络信息:{if !empty($cloud_reinstall_vm.public_ip)}{$cloud_reinstall_vm.public_ip|escape:"html"}{elseif !empty($cloud_reinstall_vm.public_ip_cidr)}{$cloud_reinstall_vm.public_ip_cidr|escape:"html"}{else}未记录{/if}。网桥、MAC、网关和 DNS 也会保持原配置。

重装镜像 *
{if empty($cloud_reinstall_template_groups)}

{if !empty($cloud_reinstall_catalog_unavailable)}系统镜像目录暂时无法读取,请稍后刷新。{else}暂无可用云镜像,请联系管理员导入模板。{/if}

{else}{foreach $cloud_reinstall_template_groups as $group}
{$group.family|escape:"html"}
{foreach $group.templates as $template}{/foreach}
{/foreach}{/if}
点击系统图标下方的箭头展开版本,选择全局云镜像版本。
-
SSH 公钥(可选)
{if empty($cloud_reinstall_ssh_keys)}

暂无公钥,可先到“公钥管理”添加。不选公钥也会生成强密码。

{else}{foreach $cloud_reinstall_ssh_keys as $key}{/foreach}{/if}
直接选择“公钥管理”中保存的公钥;再次点击已选公钥可取消。填写密码时可与公钥同时使用。管理我的公钥
+
SSH 公钥(可选)
{if empty($cloud_reinstall_ssh_keys)}

暂无公钥,可先到“公钥管理”添加。不选公钥也会生成强密码。

{else}{foreach $cloud_reinstall_ssh_keys as $key}{/foreach}{/if}
直接选择“公钥管理”中保存的公钥;再次点击已选公钥可取消。填写密码时可与公钥同时使用。管理我的公钥
留空时生成 32 位完全随机密码,即使选择了公钥;自行设置需为 12–128 位不含空格的英文可打印字符,包含大写、小写、数字和符号。
diff --git a/web/resources/views/venix/layout_assets.tpl b/web/resources/views/venix/layout_assets.tpl index 33aa6488..3c9f7779 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='2026092822' scope='global'} +{assign var=venix_asset_version value='2026092823' scope='global'} diff --git a/web/tests/CloudDeploymentPageSsrContractTest.php b/web/tests/CloudDeploymentPageSsrContractTest.php index a7d0dabc..b6af5bcf 100644 --- a/web/tests/CloudDeploymentPageSsrContractTest.php +++ b/web/tests/CloudDeploymentPageSsrContractTest.php @@ -58,10 +58,20 @@ $assert(str_contains($deployController, 'CloudAccess::actor(false)') 'Deployment controller must build one complete, actor-scoped first-paint payload.'); $assert(str_contains($sshKeyOptions, "'id' => \$key['id']") && str_contains($sshKeyOptions, "'name' => \$key['name']") + && str_contains($sshKeyOptions, "'fingerprint' => \$key['fingerprint']") && str_contains($sshKeyOptions, 'CloudDeploymentPageService::sshKeys($userId)') - && !str_contains($sshKeyOptions, 'fingerprint') - && !str_contains($sshKeyOptions, 'created_at'), - 'Deployment bootstraps must expose only the saved key identifier and display name.'); + && !str_contains($sshKeyOptions, "'public_key'") + && !str_contains($sshKeyOptions, "'created_at'"), + 'Deployment bootstraps must expose only safe SSH key display metadata.'); +$assert(str_contains($deployTemplate, 'class="mdi mdi-key-variant ssh-key-choice-icon"') + && str_contains($deployTemplate, 'class="ssh-key-choice-fingerprint"') + && str_contains($deployTemplate, 'class="ssh-key-choice-check"') + && str_contains($deployTemplate, ',指纹 {$key.fingerprint|escape:"html"}') + && str_contains($reinstallTemplate, 'class="mdi mdi-key-variant ssh-key-choice-icon"') + && str_contains($reinstallTemplate, 'class="ssh-key-choice-fingerprint"') + && str_contains($reinstallTemplate, 'class="ssh-key-choice-check"') + && str_contains($reinstallTemplate, ',指纹 {$key.fingerprint|escape:"html"}'), + 'Deployment and reinstall first paint must render the compact SSH key picker consistently.'); $assert(str_contains($service, "->orderBy('sort')->orderBy('id')") && str_contains($service, "->where('enabled', 1)") && str_contains($service, 'if ((int) $plan->stock === 0)') diff --git a/web/tests/VirtualizationAssetsTest.php b/web/tests/VirtualizationAssetsTest.php index 14aeb647..820d8201 100644 --- a/web/tests/VirtualizationAssetsTest.php +++ b/web/tests/VirtualizationAssetsTest.php @@ -134,6 +134,19 @@ $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($baseStyles, + '.ssh-key-picker{display:grid;grid-template-columns:repeat(auto-fill,minmax(240px,320px));') + && str_contains($baseStyles, + '.ssh-key-picker .ssh-key-option{display:grid;grid-template-columns:34px minmax(0,1fr) 20px;') + && str_contains($baseStyles, '.ssh-key-choice-fingerprint{display:block;') + && str_contains($clientScript, + "const fingerprintLabel = makeElement('small', 'ssh-key-choice-fingerprint'") + && str_contains($clientScript, "button.dataset.keyId = keyId;") + && str_contains($clientScript, "button.dataset.keyFingerprint = fingerprint;") + && str_contains($clientScript, ",指纹 \${fingerprint || '未记录'}") + && str_contains($clientScript, + "container.querySelectorAll('.ssh-key-option').forEach((option) =>"), + 'Deploy and reinstall SSH key choices must stay compact, show fingerprints and update selection in place.'); $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($sharedSidebar, 'href="/user/cloud/iso-images"') @@ -366,6 +379,8 @@ $assert(str_contains($baseStyles, '.template-family-arrow{display:block;flex:none;width:8px;height:8px;border-right:2px solid #718795;border-bottom:2px solid #718795;') && str_contains($baseStyles, '.template-family-selection{display:block;') && str_contains($baseStyles, + '.template-family-selection:empty{display:none}') + && !str_contains($baseStyles, '.template-family-selection:empty::before{content:"选择版本"}') && str_contains($baseStyles, '.template-family-summary{min-height:140px;padding:13px 8px 10px}') @@ -418,7 +433,7 @@ $assert($catalogRenderer !== '' && str_contains($catalogRenderer, 'selectedEntry?.version || "");') && str_contains($catalogRenderer, 'card.append(summary, versions);') && str_contains($runtimeDeployScript, - 'label.textContent = selected ? (versionLabel ? `版本 ${versionLabel}` : "已选择") : "";') + 'label.textContent = selected ? versionLabel : "";') && str_contains($runtimeDeployScript, '? `${family},已选择 ${selectedName},展开更改版本`') && str_contains($runtimeDeployScript,