diff --git a/web/public/cloud/admin-instance-directory.js b/web/public/cloud/admin-instance-directory.js index c54ea9e7..c7032e31 100644 --- a/web/public/cloud/admin-instance-directory.js +++ b/web/public/cloud/admin-instance-directory.js @@ -1,4 +1,4 @@ -const columns = ['实例', '用户', '所在位置', '公网 IP', '配置', '状态', '用量与期限', '操作']; +const columns = ['实例', '用户', '位置与网络', '配置', '状态', '流量与期限', '操作']; const filterNames = ['q', 'user_id', 'host_id', 'service_status', 'expiry', 'attention', 'sort', 'per_page']; function el(tag, className = '', text) { @@ -135,11 +135,15 @@ export function createAdminInstanceDirectory({ if (vm.service_expires_at && vm.service_status !== 'exempt') { usage.append(el('span', '', `到期 ${date(vm.service_expires_at, true)}`)); } + const location = stack( + text(vm.host_name, `宿主机 #${vm.host_id}`), + text(vm.region, '地区未记录'), + ); + location.append(ip); const cells = [ stack(text(vm.name), `#${vm.id} · ${text(vm.os_name, '系统未记录')}`), stack(vm.user_url ? safeLink(vm.user_url, text(vm.user_name, `用户 #${vm.user_id}`)) : text(vm.user_name), `ID ${vm.user_id}`), - stack(text(vm.host_name, `宿主机 #${vm.host_id}`), text(vm.region, '地区未记录')), - ip, stack(vm.display?.configuration, text(vm.plan_name, '无关联套餐')), + location, stack(vm.display?.configuration, text(vm.plan_name, '无关联套餐')), statuses, usage, detail, ]; cells.forEach((content, index) => { @@ -185,6 +189,19 @@ export function createAdminInstanceDirectory({ } control.value = value || ({ expiry: 'all', attention: 'all', sort: 'newest' })[name] || ''; } + const advancedActive = String(form.elements.namedItem('user_id').value || '') !== '' + || form.elements.namedItem('expiry').value !== 'all' + || form.elements.namedItem('attention').value !== 'all' + || form.elements.namedItem('sort').value !== 'newest' + || String(form.elements.namedItem('per_page').value) !== '20'; + const advanced = byId('instances-advanced'); + if (advanced) advanced.open = advancedActive; + const activeQuick = form.elements.namedItem('attention').value === 'network' ? 'network' + : (form.elements.namedItem('attention').value === 'jobs' ? 'jobs' + : (form.elements.namedItem('expiry').value === 'soon' ? 'expiry' : '')); + for (const card of root.querySelectorAll('[data-instance-quick-filter]')) { + card.setAttribute('aria-pressed', String(card.dataset.instanceQuickFilter === activeQuick)); + } } function applyPayload(payload, replaceRows = true) { @@ -317,6 +334,21 @@ export function createAdminInstanceDirectory({ previous: () => { void reload(formUrl(state.pagination.page - 1)); }, next: () => { void reload(formUrl(state.pagination.page + 1)); }, click: event => { + const quick = event.target.closest('[data-instance-quick-filter]'); + if (quick) { + const value = quick.dataset.instanceQuickFilter; + if (value === 'all') { + void reload(new URL(location.pathname, location.origin)); + return; + } + const form = byId('instances-filter'); + form.elements.namedItem('expiry').value = value === 'expiry' ? 'soon' : 'all'; + form.elements.namedItem('attention').value = ['network', 'jobs'].includes(value) ? value : 'all'; + const advanced = byId('instances-advanced'); + if (advanced) advanced.open = true; + void reload(formUrl()); + return; + } const detail = event.target.closest('[data-instance-detail]'); if (detail) onOpenDetail?.(detail.dataset.instanceDetail, detail); const button = event.target.closest('[data-copy]'); diff --git a/web/public/theme/venix/css/admin-home.css b/web/public/theme/venix/css/admin-home.css index 712a5494..f8aa03e9 100644 --- a/web/public/theme/venix/css/admin-home.css +++ b/web/public/theme/venix/css/admin-home.css @@ -206,10 +206,91 @@ html.admin-sidebar-scroll-locked { min-height: 116px; } -/* VM inventory uses the existing Venix cards and table; only layout is scoped here. */ +/* VM inventory keeps the Venix visual language while exposing common filters first. */ +[data-admin-instances] .admin-instance-summary-card { + appearance: none; + border-color: var(--bs-border-color, #e8eef5); + color: inherit; + cursor: pointer; + transition: border-color .16s ease, box-shadow .16s ease, transform .16s ease; +} + +[data-admin-instances] .admin-instance-summary-card:hover, +[data-admin-instances] .admin-instance-summary-card:focus-visible { + border-color: rgba(24, 168, 127, .45); + box-shadow: 0 10px 24px rgba(0, 32, 48, .08); + transform: translateY(-1px); + outline: 0; +} + +[data-admin-instances] .admin-instance-summary-card[aria-pressed="true"] { + border-color: #18a87f; + box-shadow: 0 0 0 3px rgba(24, 168, 127, .12); +} + +[data-admin-instances] .admin-instance-summary-card small { + display: block; + margin-top: 6px; + color: #7d8a9c; + font-size: 11px; + font-weight: 600; +} + +[data-admin-instances] .admin-instance-advanced { + border: 1px solid var(--bs-border-color, #e2e8f0); + border-radius: 10px; + background: #f8fafc; +} + +[data-admin-instances] .admin-instance-advanced summary { + display: flex; + align-items: center; + justify-content: space-between; + gap: 12px; + padding: 12px 14px; + color: #344054; + cursor: pointer; + font-size: 13px; + font-weight: 700; + list-style: none; +} + +[data-admin-instances] .admin-instance-advanced summary::-webkit-details-marker { + display: none; +} + +[data-admin-instances] .admin-instance-advanced summary::after { + content: "\F0140"; + margin-left: auto; + color: #7d8a9c; + font: normal normal normal 20px/1 "Material Design Icons"; + transition: transform .16s ease; +} + +[data-admin-instances] .admin-instance-advanced[open] summary::after { + transform: rotate(180deg); +} + +[data-admin-instances] .admin-instance-advanced summary small { + color: #7d8a9c; + font-weight: 500; +} + +[data-admin-instances] .admin-instance-advanced > .row { + margin: 0; + padding: 0 10px 14px; + border-top: 1px solid var(--bs-border-color, #e2e8f0); +} + +[data-admin-instances] .admin-instance-filter-actions { + display: flex; + justify-content: flex-end; + gap: 10px; +} + [data-admin-instances] .admin-instances-table, [data-admin-operations] .admin-operations-table { - min-width: 1120px; + min-width: 1040px; } [data-admin-instances] .admin-instances-table td, @@ -238,6 +319,10 @@ html.admin-sidebar-scroll-locked { width: auto; } +[data-admin-instances] .admin-checkout-user > .admin-instance-ip { + margin-top: 3px; +} + /* Global legal-content editor. */ .legal-admin-selector { display: flex; @@ -696,6 +781,22 @@ html.admin-instance-detail-open body { min-height: 96px; } + [data-admin-instances] .admin-instance-summary-card .card-body { + padding: 14px; + } + + [data-admin-instances] .admin-instance-summary-card small { + margin-top: 4px; + } + + [data-admin-instances] .admin-instance-advanced summary small { + display: none; + } + + [data-admin-instances] .admin-instance-filter-actions .btn { + flex: 1 1 0; + } + [data-admin-instance-drawer] .admin-instance-drawer-header, [data-admin-instance-drawer] .admin-instance-drawer-footer, [data-admin-instance-drawer] .admin-instance-drawer-body { diff --git a/web/resources/views/venix/admin/cloud/instances.tpl b/web/resources/views/venix/admin/cloud/instances.tpl index 15c37c7e..86d038b2 100644 --- a/web/resources/views/venix/admin/cloud/instances.tpl +++ b/web/resources/views/venix/admin/cloud/instances.tpl @@ -10,41 +10,42 @@

虚拟机管理

集中查看实例、服务期限和运行异常;电源状态异步更新,不影响列表加载。

{if $instance_error}{$instance_error|escape}{else}已读取 {$instance_page.pagination.total|escape} 台实例{/if}
-
-

在管实例

{$instance_page.summary.total|escape}
-

7 天内到期

{$instance_page.summary.expiring|escape}
-

网络受限

{$instance_page.summary.network_restricted|escape}
-

异常任务实例

{$instance_page.summary.attention|escape}
+
+
+
+
+
-
-

查找实例

摘要和列表均按当前条件统计。失败任务不会自动重新提交;效果可能已发生时资源保持锁定。
-
- - +
+

查找实例

常用条件始终可见;更多业务状态收纳在高级筛选中。失败任务不会自动重新提交。
+
+ - - - - - -
清空条件
+ +
高级筛选用户、期限、异常、排序和分页
+ + + + + +
+
清空条件

实例列表

电源状态尚未获取
共 {$instance_page.pagination.total|escape} 台
-
+
管理员虚拟机列表
实例用户所在位置公网 IP配置状态用量与期限操作
{foreach $instance_page.items as $vm} - - + - + - {foreachelse}{/foreach} + {foreachelse}{/foreach}
管理员虚拟机列表
实例用户位置与网络配置状态流量与期限操作
{$vm.name|escape}#{$vm.id|escape} · {$vm.os_name|default:'系统未记录'|escape} {if $vm.user_url}{$vm.user_name|escape}{else}{$vm.user_name|escape}{/if}ID {$vm.user_id|escape}{$vm.host_name|escape}{$vm.region|default:'地区未记录'|escape}{$vm.public_ip|default:'未记录'|escape}{if $vm.public_ip}{/if}{$vm.host_name|escape}{$vm.region|default:'地区未记录'|escape}{$vm.public_ip|default:'未记录'|escape}{if $vm.public_ip}{/if} {$vm.display.configuration|escape}{$vm.plan_name|default:'无关联套餐'|escape}
电源:待获取服务:{$vm.display.service|escape}网络:{$vm.display.network|escape}{if $vm.active_job}任务 #{$vm.active_job.id|escape} · {if isset($vm.active_job.completed) && !$vm.active_job.completed && $vm.active_job.status == 'active'}执行中{elseif isset($vm.active_job.completed) && $vm.active_job.completed && $vm.active_job.status == 'succeeded'}已成功{elseif isset($vm.active_job.completed) && $vm.active_job.completed && $vm.active_job.status == 'failed'}已失败{if $vm.active_job.blocks_mutation|default:false}{if $vm.active_job.recovery.pending|default:false} · 资源安全锁定,仍会继续自动核对{else} · 资源安全锁定,需管理员人工处理{/if}{/if}{else}任务状态协议错误 · 资源安全锁定{/if}{/if}
{$vm.display.traffic|escape}{$vm.display.expiry|escape}{if $vm.service_expires_at && $vm.service_status != 'exempt'}到期 {$vm.service_expires_at|date_format:'%Y-%m-%d'|escape}{/if}{$vm.display.traffic|escape}{$vm.display.expiry|escape}{if $vm.service_expires_at && $vm.service_status != 'exempt'}到期 {$vm.service_expires_at|date_format:'%Y-%m-%d'|escape}{/if}
{if $instance_error}实例暂时无法读取,请点击刷新重试。{else}没有符合条件的实例。{/if}
{if $instance_error}实例暂时无法读取,请点击刷新重试。{else}没有符合条件的实例。{/if}
diff --git a/web/resources/views/venix/layout_assets.tpl b/web/resources/views/venix/layout_assets.tpl index 9b77e4fd..01866ab0 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='2026103110' scope='global'} +{assign var=venix_asset_version value='2026103111' scope='global'} diff --git a/web/tests/AdminInstanceViewTest.php b/web/tests/AdminInstanceViewTest.php index 3486f5fd..378681a9 100644 --- a/web/tests/AdminInstanceViewTest.php +++ b/web/tests/AdminInstanceViewTest.php @@ -181,6 +181,11 @@ libxml_use_internal_errors(true); $dom->loadHTML('' . $html); $xpath = new DOMXPath($dom); $assert($xpath->query('//tbody//tr')->length === 3, 'SSR did not render all fixture rows.'); +$assert($xpath->query('//*[@data-instance-quick-filter]')->length === 4 + && $xpath->query('//table[contains(@class, "admin-instances-table")]//thead//th')->length === 7 + && $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(str_contains($dom->textContent, '192.0.2.101') && str_contains($dom->textContent, '20 GiB / 100 GiB') && str_contains($dom->textContent, '香港宿主机 A')