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 @@
集中查看实例、服务期限和运行异常;电源状态异步更新,不影响列表加载。