diff --git a/web/public/cloud/runtime.js b/web/public/cloud/runtime.js index 253f2e95..4f7f520f 100644 --- a/web/public/cloud/runtime.js +++ b/web/public/cloud/runtime.js @@ -395,8 +395,12 @@ function resetInstallChoices() { state.resourceController = null; state.resources = null; state.templates = []; - byId('vm-template').value = ''; - renderTemplateCatalog('vm-template'); + const templateInput = byId('vm-template'); + const templateCatalog = byId('vm-template-catalog'); + templateInput.value = ''; + templateInput.disabled = true; + templateCatalog.removeAttribute('aria-busy'); + templateCatalog.replaceChildren(); byId('vm-name').disabled = true; byId('vm-root-password').disabled = true; setDeploymentStepEnabled('vm-source-step', false); @@ -491,19 +495,26 @@ async function loadPlanResources() { resetInstallChoices(); state.resourceController = new AbortController(); if (!plan) return; + renderTemplateCatalogStatus('vm-template', '正在加载系统镜像…', true); + setDeploymentStepEnabled('vm-source-step', true); try { const resources = await api(`/api/v1/resources?plan_id=${encodeURIComponent(planId)}`, { signal: state.resourceController.signal }); if (epoch !== state.formEpoch || byId('vm-plan').value !== planId || String(plan.host_id) !== state.selectedRegionHostId) return; state.resources = resources; state.templates = items(resources.templates || resources.cloud_templates); renderTemplateCatalog('vm-template'); - byId('vm-template').disabled = false; + byId('vm-template').disabled = !state.templates.some(item => item?.id); byId('vm-name').disabled = false; byId('vm-root-password').disabled = false; setDeploymentStepEnabled('vm-source-step', true); setDeploymentStepEnabled('vm-config-step', true); updateCreateAvailability(); - } catch (error) { if (epoch === state.formEpoch && error.name !== 'AbortError') showError('create-error', error.message); } + } catch (error) { + if (epoch === state.formEpoch && error.name !== 'AbortError') { + renderTemplateCatalogStatus('vm-template', '系统镜像加载失败,请重新选择实例规格。'); + showError('create-error', error.message); + } + } } function provisionInvoiceStorageKey() { return `${PROVISION_INVOICE_STORAGE_PREFIX}${state.userId || 'unknown'}`; } async function provisionInvoiceFingerprint(body) { @@ -1879,9 +1890,22 @@ function templateIcon(family, className) { return icon; } +function renderTemplateCatalogStatus(inputId, message, busy = false) { + const input = byId(inputId); + const container = byId(inputId === "vm-template" ? "vm-template-catalog" : "reinstall-template-catalog"); + if (!input || !container) return; + input.value = ""; + input.disabled = true; + container.setAttribute("aria-busy", String(busy)); + const status = makeElement("p", "template-catalog-status", message); + status.setAttribute("role", "status"); + container.replaceChildren(status); +} + function renderTemplateCatalog(inputId) { const input = byId(inputId); const container = byId(inputId === "vm-template" ? "vm-template-catalog" : "reinstall-template-catalog"); + container.removeAttribute("aria-busy"); const opened = new Set(Array.from(container.querySelectorAll("details[open]"), (detail) => detail.dataset.family)); const groups = new Map(); for (const item of state.templates) { diff --git a/web/public/cloud/styles.css b/web/public/cloud/styles.css index 31278714..e2a940c3 100644 --- a/web/public/cloud/styles.css +++ b/web/public/cloud/styles.css @@ -142,7 +142,7 @@ tbody tr:hover{background:#fcfefe} .workspace-form-page{width:min(100%,900px);margin:0 auto 48px}#create-view.workspace-form-page,#reinstall-view.workspace-form-page{width:100%;margin-left:0;margin-right:0}.workspace-form-back{padding-left:0;margin-bottom:15px;min-height:34px}.workspace-form-heading{margin-bottom:22px}.workspace-form-heading h1{margin-top:8px}.workspace-form-card{overflow:hidden}.workspace-form-body{padding:28px clamp(22px,3vw,36px) 32px}.workspace-form-actions{display:flex;justify-content:flex-end;flex-wrap:wrap;gap:10px;padding:18px clamp(22px,3vw,36px);border-top:1px solid #edf1f5;background:#fbfdfe}.workspace-form-actions .button{min-width:120px}.workspace-form-body>.form-error{margin:18px 0 0} .form-grid{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:18px 17px}.field.full{grid-column:1/-1}.field label{display:block}.field label span{color:#dc5965}.field small{display:block;color:#a1adbb;font-size:10px;margin-top:7px;line-height:1.5}.field select{appearance:none;background-image:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='14' height='14' viewBox='0 0 24 24' fill='none' stroke='%2393a1ae' stroke-width='2'%3E%3Cpath d='m6 9 6 6 6-6'/%3E%3C/svg%3E");background-repeat:no-repeat;background-position:right 12px center;padding-right:35px} .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));gap:14px}.template-catalog-empty{grid-column:1/-1;margin:0;padding:17px;border:1px dashed #cbdbe3;border-radius:10px;background:#f8fbfc;color:#698094;font-size:12px}.template-family-card{min-width:0;border:1px solid #dce7ec;border-radius:12px;background:#fff;overflow:hidden}.template-family-card[open]{border-color:#46b6ba;box-shadow:0 0 0 2px rgba(20,166,175,.07)}.template-family-summary{display:flex;align-items:center;flex-direction:column;gap:9px;min-height:153px;padding:20px 13px 13px;cursor:pointer;text-align:center;list-style:none}.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:13px}.template-family-icon{display:flex;align-items:center;justify-content:center;width:65px;height:65px;border-radius:17px;background:linear-gradient(145deg,#2a6385,#173d58);color:#fff;font-size:31px;font-weight:800;box-shadow:0 6px 16px rgba(24,68,90,.15)}.template-family-arrow{color:#258f9b;font-size:20px;line-height:1;transition:transform .2s}.template-family-card[open] .template-family-arrow{transform:rotate(180deg)}.template-versions{display:grid;gap:7px;padding:12px;border-top:1px solid #e7edf2;background:#fbfdfd}.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-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));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{min-width:0;border:1px solid #dce7ec;border-radius:12px;background:#fff;overflow:hidden}.template-family-card[open]{border-color:#46b6ba;box-shadow:0 0 0 2px rgba(20,166,175,.07)}.template-family-summary{display:flex;align-items:center;flex-direction:column;gap:9px;min-height:153px;padding:20px 13px 13px;cursor:pointer;text-align:center;list-style:none}.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:13px}.template-family-icon{display:flex;align-items:center;justify-content:center;width:65px;height:65px;border-radius:17px;background:linear-gradient(145deg,#2a6385,#173d58);color:#fff;font-size:31px;font-weight:800;box-shadow:0 6px 16px rgba(24,68,90,.15)}.template-family-arrow{color:#258f9b;font-size:20px;line-height:1;transition:transform .2s}.template-family-card[open] .template-family-arrow{transform:rotate(180deg)}.template-versions{display:grid;gap:7px;padding:12px;border-top:1px solid #e7edf2;background:#fbfdfd}.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} .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/layout_assets.tpl b/web/resources/views/venix/layout_assets.tpl index 5adae964..655d48cc 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='2026092806' scope='global'} +{assign var=venix_asset_version value='2026092807' scope='global'} diff --git a/web/tests/VirtualizationAssetsTest.php b/web/tests/VirtualizationAssetsTest.php index 5adcb8c2..b3301517 100644 --- a/web/tests/VirtualizationAssetsTest.php +++ b/web/tests/VirtualizationAssetsTest.php @@ -135,6 +135,46 @@ $assert(str_contains($planRenderer, "'plan-table-head'") && !str_contains($cloudTemplate, 'id="create-cloud-tip"') && !str_contains($cloudTemplate, 'id="create-iso-tip"'), 'Deployment plans must use selectable specification rows without obsolete helper panels.'); +$runtimeDeployScript = file_get_contents($public . '/runtime.js'); +$resetStart = strpos($runtimeDeployScript, 'function resetInstallChoices()'); +$resetEnd = $resetStart === false ? false + : strpos($runtimeDeployScript, 'function renderRegionPicker()', $resetStart); +$resetInstall = $resetStart === false || $resetEnd === false ? '' + : substr($runtimeDeployScript, $resetStart, $resetEnd - $resetStart); +$resourcesStart = strpos($runtimeDeployScript, 'async function loadPlanResources()'); +$resourcesEnd = $resourcesStart === false ? false + : strpos($runtimeDeployScript, 'function provisionInvoiceStorageKey()', $resourcesStart); +$resourceLoader = $resourcesStart === false || $resourcesEnd === false ? '' + : substr($runtimeDeployScript, $resourcesStart, $resourcesEnd - $resourcesStart); +$statusStart = strpos($runtimeDeployScript, 'function renderTemplateCatalogStatus('); +$statusEnd = $statusStart === false ? false + : strpos($runtimeDeployScript, 'function renderTemplateCatalog(', $statusStart); +$templateStatus = $statusStart === false || $statusEnd === false ? '' + : substr($runtimeDeployScript, $statusStart, $statusEnd - $statusStart); +$loadingPosition = strpos($resourceLoader, + "renderTemplateCatalogStatus('vm-template', '正在加载系统镜像…', true)"); +$requestPosition = strpos($resourceLoader, + 'const resources = await api(`/api/v1/resources?plan_id='); +$templatesPosition = strpos($resourceLoader, + 'state.templates = items(resources.templates || resources.cloud_templates)'); +$catalogPosition = strpos($resourceLoader, "renderTemplateCatalog('vm-template')"); +$assert($resetInstall !== '' + && !str_contains($resetInstall, "renderTemplateCatalog('vm-template')") + && str_contains($resetInstall, 'templateInput.disabled = true') + && str_contains($resetInstall, 'templateCatalog.replaceChildren()') + && $loadingPosition !== false && $requestPosition !== false + && $templatesPosition !== false && $catalogPosition !== false + && $loadingPosition < $requestPosition + && $requestPosition < $templatesPosition + && $templatesPosition < $catalogPosition + && str_contains($templateStatus, 'container.setAttribute("aria-busy", String(busy))') + && str_contains($templateStatus, '"template-catalog-status"') + && !str_contains($templateStatus, 'template-catalog-empty') + && str_contains($resourceLoader, '系统镜像加载失败,请重新选择实例规格。') + && str_contains($resourceLoader, + "epoch === state.formEpoch && error.name !== 'AbortError'") + && str_contains($runtimeDeployScript, '暂无可用云镜像,请联系管理员导入模板。'), + 'Plan changes must distinguish the cloud-image loading, failure and true-empty states.'); $assert(str_contains($baseStyles, '.deployment-step') && str_contains($baseStyles, '.region-option') && str_contains($baseStyles, '.plan-option')