diff --git a/web/public/cloud/runtime.js b/web/public/cloud/runtime.js index 8a41cdee..0eb5a77b 100644 --- a/web/public/cloud/runtime.js +++ b/web/public/cloud/runtime.js @@ -2001,10 +2001,26 @@ function closeTemplateVersionMenus(except = null) { function bindTemplateVersionMenu(card, container) { card.addEventListener("toggle", () => { - if (!card.open) return; + const family = String(card.dataset.family || "系统镜像"); + const summary = card.querySelector("summary"); + const selection = card.querySelector(".template-family-selection"); + if (!card.open) { + const selectedName = String(selection?.title || ""); + summary?.setAttribute("aria-label", selectedName + ? `${family},已选择 ${selectedName},展开更改版本` + : `${family},展开选择版本`); + return; + } + summary?.setAttribute("aria-label", `${family},收起版本列表`); container.querySelectorAll(".template-family-card[open]").forEach((other) => { if (other !== card) other.open = false; }); + requestAnimationFrame(() => { + if (!card.open) return; + const option = card.querySelector('.template-version-option[aria-pressed="true"]') + || card.querySelector(".template-version-option"); + option?.focus({ preventScroll: true }); + }); }); } diff --git a/web/public/cloud/styles.css b/web/public/cloud/styles.css index bcde01b0..3c38e72c 100644 --- a/web/public/cloud/styles.css +++ b/web/public/cloud/styles.css @@ -255,4 +255,4 @@ tbody tr:hover{background:#fcfefe} .plan-option>:nth-child(5)::before{content:"每月流量"} .plan-option>:nth-child(6)::before{content:"价格"} } -@media(max-width:510px){.deployment-step{padding-bottom:23px;margin-bottom:22px}.deployment-step-heading{margin-bottom:16px}.region-picker,.user-iso-picker{grid-template-columns:1fr}.region-option{min-height:66px}.template-family-card{border:0;border-radius:0;background:transparent;box-shadow:none;transition:none}.template-family-summary{border:1px solid #dce7ec;border-radius:12px;background:#fff;transition:border-color .18s ease,background-color .18s ease,box-shadow .18s ease}.template-family-card[open]{z-index:70;border-color:transparent;box-shadow:none}.template-family-card[open] .template-family-summary{border-color:#a8dadd;box-shadow:0 12px 28px rgba(30,66,82,.14)}.template-family-card.has-selection{border-color:transparent;background:transparent}.template-family-card.has-selection .template-family-summary{border-color:#2eabb4;background:#f5fbfb}.template-versions{position:relative;top:auto;right:auto;bottom:auto;left:0;z-index:80;width:calc(200% + 9px);margin-top:8px;max-height:min(50vh,360px);max-height:min(50dvh,360px);padding:5px 12px;overscroll-behavior:contain;-webkit-overflow-scrolling:touch}.template-family-card:nth-child(even) .template-versions{right:auto;left:calc(-100% - 9px)}.user-iso-row{align-items:flex-start;flex-direction:column}.user-iso-row .row-button{width:100%}.user-iso-empty{align-items:flex-start;flex-direction:column}} +@media(max-width:510px){.deployment-step{padding-bottom:23px;margin-bottom:22px}.deployment-step-heading{margin-bottom:16px}.region-picker,.user-iso-picker{grid-template-columns:1fr}.region-option{min-height:66px}.template-family-card{height:140px;min-height:140px;border:1px solid #dce7ec;border-radius:12px;background:#fff;overflow:hidden;box-shadow:none}.template-family-summary{height:100%;min-height:100%;border:0;border-radius:inherit;background:transparent}.template-family-card[open]{z-index:70;border-color:#a8dadd;box-shadow:0 12px 28px rgba(30,66,82,.14)}.template-family-card.has-selection{border-color:#2eabb4;background:#f5fbfb}.template-versions{position:absolute;inset:0;z-index:80;width:auto;height:auto;max-height:none;margin:0;padding:6px 8px 40px;overflow-y:auto;border:0;border-radius:inherit;background:#fbfdfd;box-shadow:none;overscroll-behavior:contain;-webkit-overflow-scrolling:touch}.template-family-card[open] .template-family-footer{position:absolute;right:7px;bottom:7px;z-index:90;width:32px;min-height:32px;border-radius:999px;background:#eaf8f8}.template-family-card[open] .template-family-selection{display:none}.user-iso-row{align-items:flex-start;flex-direction:column}.user-iso-row .row-button{width:100%}.user-iso-empty{align-items:flex-start;flex-direction:column}} diff --git a/web/resources/views/venix/layout_assets.tpl b/web/resources/views/venix/layout_assets.tpl index d7cc403a..e92ade3c 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='2026092817' scope='global'} +{assign var=venix_asset_version value='2026092818' scope='global'} diff --git a/web/tests/VirtualizationAssetsTest.php b/web/tests/VirtualizationAssetsTest.php index 78a9acbf..5a6d0642 100644 --- a/web/tests/VirtualizationAssetsTest.php +++ b/web/tests/VirtualizationAssetsTest.php @@ -256,27 +256,30 @@ $assert(str_contains($baseStyles, && str_contains($baseStyles, 'max-height:min(260px,50vh);') && str_contains($baseStyles, 'overflow-y:auto;') && str_contains($mobileDeploymentStyles, - '.template-family-card{border:0;border-radius:0;background:transparent;box-shadow:none;transition:none}') + '.template-family-card{height:140px;min-height:140px;border:1px solid #dce7ec;border-radius:12px;background:#fff;overflow:hidden;box-shadow:none}') && str_contains($mobileDeploymentStyles, - '.template-family-summary{border:1px solid #dce7ec;border-radius:12px;background:#fff;transition:') + '.template-family-summary{height:100%;min-height:100%;border:0;border-radius:inherit;background:transparent}') && str_contains($mobileDeploymentStyles, - '.template-family-card[open]{z-index:70;border-color:transparent;box-shadow:none}') + '.template-family-card[open]{z-index:70;border-color:#a8dadd;box-shadow:') && str_contains($mobileDeploymentStyles, - '.template-family-card[open] .template-family-summary{border-color:#a8dadd;box-shadow:') + '.template-family-card.has-selection{border-color:#2eabb4;background:#f5fbfb}') && str_contains($mobileDeploymentStyles, - '.template-family-card.has-selection .template-family-summary{border-color:#2eabb4;background:#f5fbfb}') + '.template-versions{position:absolute;inset:0;z-index:80;width:auto;height:auto;max-height:none;margin:0;') && str_contains($mobileDeploymentStyles, - '.template-versions{position:relative;top:auto;right:auto;bottom:auto;left:0;') + 'padding:6px 8px 40px;overflow-y:auto;border:0;border-radius:inherit;background:#fbfdfd;box-shadow:none;') && str_contains($mobileDeploymentStyles, - 'width:calc(200% + 9px);margin-top:8px;') + '.template-family-card[open] .template-family-footer{position:absolute;right:7px;bottom:7px;z-index:90;width:32px;min-height:32px;') && str_contains($mobileDeploymentStyles, - '.template-family-card:nth-child(even) .template-versions{right:auto;left:calc(-100% - 9px)}') - && str_contains($mobileDeploymentStyles, 'max-height:min(50dvh,360px);') + '.template-family-card[open] .template-family-selection{display:none}') && str_contains($mobileDeploymentStyles, 'overscroll-behavior:contain;') && !str_contains($mobileDeploymentStyles, '.template-versions{position:fixed;') && !str_contains($mobileDeploymentStyles, - '.template-versions{position:absolute;') + '.template-versions{position:relative;') + && !str_contains($mobileDeploymentStyles, 'width:calc(200%') + && !str_contains($mobileDeploymentStyles, 'left:calc(-100%') + && !str_contains($mobileDeploymentStyles, + '.template-family-card:nth-child(even) .template-versions') && !str_contains($baseStyles, 'width:min(280px,calc(100vw - 66px))') && str_contains($baseStyles, '.template-versions{gap:0;padding:5px 12px}') && str_contains($baseStyles, @@ -316,7 +319,7 @@ $assert(str_contains($baseStyles, && !str_contains($reinstallTemplate, '⌄') && str_contains($deployTemplate, 'class="template-family-selection" aria-hidden="true"') && str_contains($reinstallTemplate, 'class="template-family-selection" aria-hidden="true"'), - 'Image cards must stay compact and mobile version menus must reserve flow space without covering the following step.'); + 'Image cards must stay fixed while mobile version menus scroll inside the selected card.'); $assert($catalogRenderer !== '' && str_contains($runtimeDeployScript, 'function bindTemplateVersionMenu(card, container)') && str_contains($runtimeDeployScript, 'const TEMPLATE_FAMILY_ORDER = new Map([') @@ -329,6 +332,11 @@ $assert($catalogRenderer !== '' && str_contains($runtimeDeployScript, 'container.querySelectorAll(".template-family-card[open]")') && str_contains($runtimeDeployScript, 'if (other !== card) other.open = false;') + && str_contains($runtimeDeployScript, + 'summary?.setAttribute("aria-label", `${family},收起版本列表`);') + && str_contains($runtimeDeployScript, + 'card.querySelector(\'.template-version-option[aria-pressed="true"]\')') + && str_contains($runtimeDeployScript, 'option?.focus({ preventScroll: true });') && str_contains($catalogRenderer, 'card.setAttribute("name", `${inputId}-family`);') && str_contains($catalogRenderer, 'card.open = opened.has(family);')