diff --git a/web/public/cloud/admin-instance-detail.js b/web/public/cloud/admin-instance-detail.js index b23c2f13..351f0f35 100644 --- a/web/public/cloud/admin-instance-detail.js +++ b/web/public/cloud/admin-instance-detail.js @@ -1,4 +1,4 @@ -const tabs = ['basic', 'service', 'backups', 'jobs', 'invoices']; +const tabs = ['overview', 'service', 'configuration', 'backups', 'jobs']; function el(tag, className = '', text) { const node = document.createElement(tag); @@ -118,10 +118,10 @@ export function createAdminInstanceDetail({ const uuid = el('span', 'admin-instance-ip text-break'); uuid.append(el('span', 'admin-mono', text(vm.uuid))); if (vm.uuid) uuid.append(copyButton(vm.uuid, '复制 UUID')); - const basic = byId('instance-panel-basic'); + const overview = byId('instance-panel-overview'); const configuration = typeof renderConfiguration === 'function' ? renderConfiguration(vm) : []; - basic.replaceChildren(infoList([ + overview.replaceChildren(infoList([ ['实例编号', `#${vm.id}`], ['UUID', uuid], ['Agent 标识', text(vm.agent_name, '未记录')], ['生命周期', vm.display?.lifecycle], ['所属用户', text(vm.user_name, `用户 #${vm.user_id}`)], ['用户 ID', vm.user_id], ['宿主机', text(vm.host_name)], ['地区', text(vm.region, '未记录')], @@ -130,8 +130,10 @@ export function createAdminInstanceDetail({ ['DNS', Array.isArray(vm.dns_servers) ? text(vm.dns_servers.join('、'), '未记录') : text(vm.dns_servers, '未记录')], ['带宽上限', vm.bandwidth_mbps ? `${vm.bandwidth_mbps} Mbps` : '未记录'], ['创建时间', date(vm.created_at)], - ]), ...configuration); - byId('instance-panel-service').replaceChildren(infoList([ + ])); + byId('instance-panel-configuration').replaceChildren(...configuration); + const service = byId('instance-panel-service'); + service.replaceChildren(infoList([ ['套餐', text(vm.plan_name, '无关联套餐')], ['服务状态', vm.display?.service], ['网络状态', vm.display?.network], ['服务到期', vm.service_status === 'exempt' ? '免计费' : date(vm.service_expires_at)], ['剩余期限', vm.display?.expiry], ['本周期用量', vm.display?.traffic], @@ -154,7 +156,11 @@ export function createAdminInstanceDetail({ } if (!payload.jobs?.length) jobs.append(el('p', 'text-muted py-3', '暂无任务记录。')); if (payload.jobs_truncated) jobs.append(el('p', 'text-muted fs-12', '仅展示最近的任务记录。')); - const invoices = byId('instance-panel-invoices'); invoices.replaceChildren(); + const invoiceSection = el('section', 'admin-instance-invoices mt-4 pt-4 border-top'); + invoiceSection.append(el('div', 'd-flex align-items-center justify-content-between gap-2 mb-3')); + invoiceSection.firstChild.append(el('h3', 'h6 fw-semibold mb-0', '关联账单'), + el('span', 'badge text-bg-light', `${(payload.invoices || []).length} 笔`)); + const invoices = el('div'); for (const invoice of payload.invoices || []) { const card = el('article', 'card mb-3'); const body = el('div', 'card-body'); const purpose = ({ provision: '实例开通', renewal: '实例续费', upgrade: '实例升级' })[invoice.purpose] @@ -169,6 +175,7 @@ export function createAdminInstanceDetail({ } if (!payload.invoices?.length) invoices.append(el('p', 'text-muted py-3', '暂无关联账单;导入或免计费实例可能没有开通账单。')); if (payload.invoices_truncated) invoices.append(el('p', 'text-muted fs-12', '仅展示最近的关联账单。')); + invoiceSection.append(invoices); service.append(invoiceSection); const control = byId('instance-control-link'); if (control instanceof HTMLAnchorElement && vm.detail_url) { const link = safeLink(vm.detail_url, ''); @@ -234,7 +241,7 @@ export function createAdminInstanceDetail({ byId('instance-detail-title').textContent = `实例 #${id}`; const control = byId('instance-control-link'); if (control) control.hidden = true; tabs.forEach(tab => byId(`instance-panel-${tab}`).replaceChildren()); - chooseTab('basic'); notice('正在读取详情…'); + chooseTab('overview'); notice('正在读取详情…'); if (!dialog.open) { lockScroll(); window.VenixDrawerMotion.openDrawerWithMotion(dialog); } try { const payload = await read(`/api/v1/admin/instances/${id}`, controller); diff --git a/web/public/theme/venix/css/admin-home.css b/web/public/theme/venix/css/admin-home.css index f8aa03e9..d388074a 100644 --- a/web/public/theme/venix/css/admin-home.css +++ b/web/public/theme/venix/css/admin-home.css @@ -460,7 +460,7 @@ html.admin-instance-detail-open body { [data-admin-instance-drawer] { position: fixed; inset: 0 0 0 auto; - width: min(640px, 100%); + width: min(760px, 100%); max-width: 100%; height: 100vh; height: 100dvh; @@ -536,10 +536,17 @@ html.admin-instance-detail-open body { } [data-admin-instance-drawer] .admin-instance-tabs { + position: sticky; + top: -20px; + z-index: 3; display: flex; gap: 6px; - margin-bottom: 24px; + margin: 0 -2px 24px; + padding: 16px 2px 12px; + background: var(--bs-body-bg, #fff); + border-bottom: 1px solid var(--bs-border-color, #e8eef5); overflow-x: auto; + scrollbar-width: thin; } [data-admin-instance-drawer] .admin-instance-tabs .btn { @@ -556,6 +563,10 @@ html.admin-instance-detail-open body { grid-template-columns: 116px minmax(0, 1fr); gap: 16px 12px; margin: 0; + padding: 18px; + border: 1px solid var(--bs-border-color, #e8eef5); + border-radius: 12px; + background: var(--bs-tertiary-bg, #f8fafc); font-size: 14px; } @@ -569,6 +580,17 @@ html.admin-instance-detail-open body { overflow-wrap: anywhere; } +[data-admin-instance-drawer] .admin-instance-invoices .card { + border-color: var(--bs-border-color, #e8eef5); + box-shadow: none; +} + +[data-admin-instance-drawer] #instance-panel-configuration > .admin-instance-network-settings:first-child { + margin-top: 0 !important; + padding-top: 0; + border-top: 0; +} + [data-admin-instance-drawer] .admin-instance-network-settings { padding-top: 20px; border-top: 1px solid var(--bs-border-color, #e8eef5); @@ -809,8 +831,16 @@ html.admin-instance-detail-open body { align-items: stretch; } + [data-admin-instance-drawer] .admin-instance-tabs { + top: -20px; + margin-left: -2px; + margin-right: -2px; + } + [data-admin-instance-drawer] .admin-instance-details { grid-template-columns: 94px minmax(0, 1fr); + gap: 14px 10px; + padding: 14px; } [data-admin-instance-drawer] .admin-instance-network-current { diff --git a/web/resources/views/venix/admin/cloud/instances.tpl b/web/resources/views/venix/admin/cloud/instances.tpl index 86d038b2..6ca294c9 100644 --- a/web/resources/views/venix/admin/cloud/instances.tpl +++ b/web/resources/views/venix/admin/cloud/instances.tpl @@ -53,8 +53,8 @@

实例详情

虚拟机

正在读取详情…

-
-
+
+
diff --git a/web/resources/views/venix/layout_assets.tpl b/web/resources/views/venix/layout_assets.tpl index 01866ab0..ed3c103b 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='2026103111' scope='global'} +{assign var=venix_asset_version value='2026103112' scope='global'} diff --git a/web/tests/AdminInstanceViewTest.php b/web/tests/AdminInstanceViewTest.php index 378681a9..3a6e8d7d 100644 --- a/web/tests/AdminInstanceViewTest.php +++ b/web/tests/AdminInstanceViewTest.php @@ -186,6 +186,14 @@ $assert($xpath->query('//*[@data-instance-quick-filter]')->length === 4 && $xpath->query('//details[@id="instances-advanced"]')->length === 1 && str_contains($directoryScript, "event.target.closest('[data-instance-quick-filter]')"), 'The compact directory must expose four quick filters, seven columns and one advanced filter surface.'); +$assert($xpath->query('//*[@data-admin-instance-drawer]//*[@data-instance-tab]')->length === 5 + && $xpath->query('//*[@data-admin-instance-drawer]//*[@role="tabpanel"]')->length === 5 + && str_contains($detailScript, + "const tabs = ['overview', 'service', 'configuration', 'backups', 'jobs']") + && str_contains($detailScript, "chooseTab('overview')") + && !str_contains($html, 'instance-panel-basic') + && !str_contains($html, 'instance-panel-invoices'), + 'The instance workspace must expose five cohesive sections and open on the overview tab.'); $assert(str_contains($dom->textContent, '192.0.2.101') && str_contains($dom->textContent, '20 GiB / 100 GiB') && str_contains($dom->textContent, '香港宿主机 A') diff --git a/web/tests/CloudPortableBackupAdminUiContractTest.php b/web/tests/CloudPortableBackupAdminUiContractTest.php index 2b086af1..4ee35d66 100644 --- a/web/tests/CloudPortableBackupAdminUiContractTest.php +++ b/web/tests/CloudPortableBackupAdminUiContractTest.php @@ -134,7 +134,7 @@ $assert(str_contains($template, 'id="instances-backup-library"') $assert(str_contains($template, 'data-instance-tab="backups"') && str_contains($template, 'id="instance-panel-backups"') - && str_contains($runtime, "const tabs = ['basic', 'service', 'backups', 'jobs', 'invoices']") + && str_contains($runtime, "const tabs = ['overview', 'service', 'configuration', 'backups', 'jobs']") && str_contains($runtime, "if (name === 'backups'") && str_contains($runtime, 'async function load(vmId, force = false)'), 'Administrator instance detail must expose a lazy portable-backup panel.');