diff --git a/web/css/app.css b/web/css/app.css index 6852534..bfd7e2a 100644 --- a/web/css/app.css +++ b/web/css/app.css @@ -4,12 +4,11 @@ html.light,body.light{color-scheme:light;--bg:#f6f7f9;--bg-alt:#ffffff;--surface html,body{margin:0;padding:0;font-family:var(--font);background:var(--bg);color:var(--text);-webkit-font-smoothing:antialiased} html{min-height:100%} body{min-height:100vh} -html.light{background:var(--bg);color-scheme:light} +html.light{background:var(--bg)} body,button{font-size:14px;line-height:1.35} a{color:var(--accent);text-decoration:none} a:hover{color:var(--accent-glow)} .topbar{position:sticky;top:0;z-index:20;display:flex;align-items:center;gap:1rem;padding:.75rem 1.25rem;background:var(--bg-alt);border-bottom:1px solid var(--border)} -.brand{font-weight:600;letter-spacing:.5px;font-size:15px} .nav{display:flex;gap:.5rem} .nav button{background:var(--surface-soft);border:1px solid var(--border);color:var(--text-dim);padding:.45rem .9rem;border-radius:var(--radius-sm);cursor:pointer;display:flex;align-items:center;gap:.35rem;transition:var(--trans);font-weight:600} .nav button.active,.nav button:hover{color:#fff;background:var(--accent);border-color:var(--accent);box-shadow:0 0 0 1px var(--accent-glow),0 4px 10px -2px rgba(0,0,0,.5)} @@ -22,7 +21,7 @@ a:hover{color:var(--accent-glow)} .panel{display:none;flex-direction:column;gap:.75rem;animation:fade .4s ease} .panel.active{display:flex} .table-wrap{overflow:auto;border:1px solid var(--border);border-radius:var(--radius);background:var(--bg-alt);box-shadow:var(--shadow)} -table.data{width:100%;border-collapse:separate;border-spacing:0;min-width:960px} +table.data{width:100%;border-collapse:separate;border-spacing:0} table.data thead th{position:sticky;top:0;background:var(--surface-soft);font-weight:700;text-align:left;font-size:12px;text-transform:uppercase;letter-spacing:.5px;color:var(--text-dim);padding:.7rem .75rem;border-bottom:1px solid var(--border);white-space:nowrap} table.data tbody td{padding:.55rem .75rem;border-bottom:1px solid var(--border);font-size:13px;vertical-align:middle;white-space:nowrap} /* 防止数值变化导致列抖动 */ @@ -30,7 +29,6 @@ table.data th,table.data td{font-variant-numeric:tabular-nums} /* 月流量胶囊 */ .caps-traffic{display:inline-flex;align-items:center;gap:6px;background:linear-gradient(145deg,var(--bg),var(--bg-alt));border:1px solid var(--border);padding:3px 12px 3px 10px;border-radius:999px;font-size:12px;line-height:1;font-weight:500;position:relative;box-shadow:0 2px 4px -2px rgba(0,0,0,.35),0 0 0 1px rgba(255,255,255,.03);} .caps-traffic:before{content:"";position:absolute;inset:0;border-radius:inherit;background:radial-gradient(circle at 20% 20%,rgba(255,255,255,.06),transparent 70%);pointer-events:none;} -.caps-traffic.sm{padding:2px 8px 2px 7px;font-size:11px;gap:5px;} /* 双色胶囊 */ .caps-traffic.duo{background:none;border:0;gap:0;padding:0;box-shadow:none;position:relative;border-radius:999px;overflow:hidden;font-size:12px;} /* 宽度按内容自适应，每半边仅为其文本 + padding */ @@ -54,7 +52,6 @@ table.data tbody tr:hover{background:rgba(59,130,246,.045)} .footer a{color:var(--text-dim)} .footer a:hover{color:var(--accent)} .muted{color:var(--text-dim)} -/* 旧状态文字样式已不再使用（采用 pill） */ @media (max-width:1100px){.nav{flex-wrap:wrap}.table-wrap{border-radius:8px}} @keyframes fade{from{opacity:0;transform:translateY(4px)}to{opacity:1;transform:translateY(0)}} @@ -95,8 +92,6 @@ body.light .gauge-half path.arc{filter:none} .proto-signal{display:inline-grid;grid-template-columns:1fr 1fr;width:18px;height:18px;border-radius:50%;overflow:hidden;vertical-align:middle;border:1px solid color-mix(in srgb,var(--border) 80%,transparent);box-shadow:0 2px 5px -2px rgba(0,0,0,.55),0 0 0 1px rgba(255,255,255,.04)} .proto-signal i{display:block;min-width:0;background:color-mix(in srgb,var(--text-dim) 42%,var(--bg-alt));} .proto-signal[data-v4="1"] .v4,.proto-signal[data-v6="1"] .v6{background:#22c55e} -.proto-signal[data-state="ipv4"] .v4{background:#22c55e} -.proto-signal[data-state="ipv6"] .v6{background:#22c55e} .proto-signal[data-state="offline"] .v4,.proto-signal[data-state="offline"] .v6{background:var(--danger)} body.light .proto-signal{border-color:color-mix(in srgb,var(--border) 92%,#94a3b8);box-shadow:0 1px 3px rgba(15,23,42,.12)} body.light .proto-signal i{background:#cbd5e1} @@ -125,7 +120,6 @@ body.light .load-core-bubble{background:color-mix(in srgb,var(--accent) 8%,#fff) /* 响应式隐藏非关键列，保持可读性 */ @media (max-width:1100px){ - #serversTable{min-width:100%;} #serversTable thead th:nth-child(3), #serversTable tbody td:nth-child(3), /* 节点 */ #serversTable thead th:nth-child(4), @@ -141,8 +135,6 @@ body.light .load-core-bubble{background:color-mix(in srgb,var(--accent) 8%,#fff) .buckets{gap:6px;min-width:100px} } @media (max-width:640px){ - #serversTable thead th:nth-child(4), - #serversTable tbody td:nth-child(4) /* 位置 */ {display:none} .topbar{flex-wrap:wrap;padding:.6rem .8rem} .actions{width:100%;justify-content:flex-end;margin-top:.4rem} .wrapper{padding:0 .7rem} @@ -196,10 +188,6 @@ table.data tbody tr.alert-critical:hover{background:rgba(239,68,68,.21) !importa table.data tbody tr.alert-warning{background:rgba(245,158,11,.12) !important;} table.data tbody tr.alert-warning:hover{background:rgba(245,158,11,.14) !important;} -/* SSL 域名告警底色：与高负载相同 */ -#sslTable td.alert-domain{background:rgba(239,68,68,.18) !important;} -#sslTable tr:hover td.alert-domain{background:rgba(239,68,68,.26) !important;} - /* OS 着色（更明显）： 1) 为各 OS 类定义 --os-color 变量 2) 行左侧使用 inset box-shadow 画 4px 彩条 @@ -208,8 +196,6 @@ table.data tbody tr.alert-warning:hover{background:rgba(245,158,11,.14) !importa table.data tbody tr[class*="os-"]{box-shadow:inset 4px 0 0 0 var(--os-color, transparent);background:linear-gradient(180deg, color-mix(in srgb, var(--os-color, transparent) 10%, transparent), transparent 60%);} table.data tbody tr[class*="os-"]:hover{background:linear-gradient(180deg, color-mix(in srgb, var(--os-color, transparent) 12%, transparent), transparent 65%);} .cards .card[class*="os-"]{border-color:color-mix(in srgb, var(--os-color, var(--accent)) 60%, transparent);box-shadow:0 0 0 1px color-mix(in srgb, var(--os-color, var(--accent)) 40%, transparent),0 4px 16px -6px color-mix(in srgb, var(--os-color, #000) 35%, transparent);} -/* 弹窗 OS 着色：左侧彩条 + 渐变与卡片一致 */ -/* 取消弹窗背景着色，改为仅在标题展示系统胶囊 */ .os-chip{display:inline-flex;align-items:center;padding:2px 8px;margin-left:.5rem;border-radius:999px;font-size:12px;font-weight:600;line-height:1.2;background:var(--os-color, var(--border));color:#fff;border:0;white-space:nowrap;} .spec-chip{display:inline-flex;align-items:center;padding:2px 8px;margin-left:.4rem;border-radius:999px;font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:12px;font-weight:750;line-height:1.2;background:color-mix(in srgb,var(--accent) 16%,var(--bg-alt));color:color-mix(in srgb,var(--accent) 72%,#fff);border:1px solid color-mix(in srgb,var(--accent) 38%,var(--border));white-space:nowrap;} body.light .spec-chip{background:color-mix(in srgb,var(--accent) 10%,#fff);color:color-mix(in srgb,var(--accent) 78%,#111827)} @@ -234,10 +220,6 @@ body.light .cpu-model-chip{background:color-mix(in srgb,var(--text-dim) 9%,#fff) .os-bsd{--os-color: rgba(166,31,47,.9);} /* BSD 系统一般跟 FreeBSD 接近 */ .os-darwin{--os-color: rgba(29,29,31,.95);} /* macOS 深空灰 (#1d1d1f) */ .os-windows{--os-color: rgba(0,120,215,.95);} /* Windows 蓝 (#0078d7) */ - - - -/* 旧进度条相关样式已清理 */ .cards .card-header{display:flex;align-items:center;justify-content:space-between;gap:.5rem;} .cards .card-title{display:flex;align-items:center;flex-wrap:wrap;gap:.24rem .34rem;min-width:0;font-weight:600;font-size:.95rem;} .cards .card-spec-chip{display:inline-flex;align-items:center;justify-content:center;height:16px;padding:0 6px;border-radius:999px;border:1px solid color-mix(in srgb,var(--accent) 34%,var(--border));background:color-mix(in srgb,var(--accent) 13%,var(--bg-alt));color:color-mix(in srgb,var(--accent) 74%,#fff);font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:10px;font-weight:800;line-height:1;letter-spacing:0;white-space:nowrap} @@ -250,11 +232,6 @@ body.light .cards .card-spec-chip{background:color-mix(in srgb,var(--accent) 8%, .cards .kvlist div{display:flex;flex-direction:column;} .cards .kvlist span.key{opacity:.6;} .cards .buckets{margin-top:.25rem;} -/* 证书卡片：域名告警底色（与高负载卡片风格一致） */ -.cards .kvlist .alert-domain{background:rgba(239,68,68,.18);border:1px solid rgba(239,68,68,.35);border-radius:8px;padding:.4rem .5rem;} -.cards .kvlist .alert-domain .key{opacity:.85} -/* 移除移动端卡片展开箭头与展开区域（已按需简化交互） */ -/* 旧移动端 latency spark 样式移除 */ /* 简易信号格，用于服务连通性延迟展示 */ .sig{display:inline-flex;gap:2px;vertical-align:baseline;margin:0 4px 0 6px;align-items:flex-end;line-height:1} @@ -339,8 +316,6 @@ th[data-sort].sorted-desc:after{border-top-color:var(--accent);opacity:1} .detail-section .mono{display:block;white-space:normal;overflow-wrap:anywhere;word-break:break-word;line-height:1.45} .detail-inline{display:inline-flex;align-items:center;justify-content:flex-end;gap:.45rem;white-space:nowrap!important} .detail-inline .mono{display:inline!important;white-space:nowrap!important;line-height:1} -.detail-values{display:flex;flex-wrap:wrap;justify-content:flex-end;gap:.15rem .55rem} -.detail-values span{white-space:nowrap!important} .resource-section{gap:.5rem} .resource-meter{display:flex;flex-direction:column;gap:.26rem;min-width:0} .resource-meter-head,.resource-mini{display:flex;align-items:center;justify-content:space-between;gap:.55rem;font-size:12px;min-width:0} @@ -373,7 +348,11 @@ th[data-sort].sorted-desc:after{border-top-color:var(--accent);opacity:1} .admin-status.err{border-color:rgba(239,68,68,.45);color:var(--danger)} .admin-login,.config-actions,.form-actions{display:flex;align-items:end;gap:.65rem;flex-wrap:wrap} .config-tabs{align-self:flex-start;max-width:100%} -.config-list{display:flex;flex-direction:column;gap:.5rem} +.config-list-tools{display:flex;align-items:end;gap:.75rem} +.config-search-field{flex:1;min-width:0} +.config-search-field input{width:100%;min-width:0} +.config-search-count{flex:none;padding-bottom:.55rem;color:var(--text-dim);font-size:12px;font-variant-numeric:tabular-nums;white-space:nowrap} +.config-list{display:flex;flex-direction:column;gap:.5rem;max-height:clamp(360px,55vh,640px);overflow-y:auto;overscroll-behavior:contain;scrollbar-gutter:stable;padding-right:.25rem} .config-row{display:grid;grid-template-columns:1fr auto;gap:.75rem;align-items:center;border:1px solid var(--border);border-radius:8px;background:var(--bg);padding:.7rem;cursor:pointer} .config-row:hover,.config-row.active{border-color:var(--accent)} .config-row .name{font-weight:700} @@ -387,10 +366,16 @@ th[data-sort].sorted-desc:after{border-top-color:var(--accent);opacity:1} .config-form .form-actions{grid-column:1/-1} .config-form input[name=password],.config-form textarea[name=rule]{font-family:ui-monospace,SFMono-Regular,Menlo,monospace} .config-form button:disabled{opacity:.5;cursor:not-allowed} +.config-editor-card{scroll-margin-top:70px} + +@media (min-width:981px){ + .config-editor-card{position:sticky;top:70px;max-height:calc(100dvh - 86px);overflow-y:auto;scrollbar-gutter:stable} +} @media (max-width:980px){ .ops-overview{grid-template-columns:repeat(2,minmax(0,1fr))} .config-grid{grid-template-columns:1fr} + .config-list{max-height:clamp(320px,50dvh,560px)} .search-field input{min-width:220px} } @media (max-width:700px){ @@ -402,6 +387,9 @@ th[data-sort].sorted-desc:after{border-top-color:var(--accent);opacity:1} .segmented button{flex:1;padding:0 .35rem} .section-head{flex-direction:column} .section-actions{width:100%;justify-content:stretch} + .config-list-tools{align-items:stretch;flex-direction:column;gap:.35rem} + .config-search-count{padding:0} + .config-list{max-height:45dvh} .detail-grid,.config-fields{grid-template-columns:1fr} .detail-drawer{width:100vw;height:100dvh;max-height:100dvh;padding:calc(.95rem + env(safe-area-inset-top)) .95rem calc(.95rem + env(safe-area-inset-bottom));} .detail-drawer .modal-content{max-height:none;overflow:visible;} diff --git a/web/index.html b/web/index.html index d0c9d8a..fa844a5 100644 --- a/web/index.html +++ b/web/index.html @@ -6,7 +6,7 @@ 云监控 - +
@@ -144,7 +144,6 @@
-
正在检测管理 API...
@@ -165,13 +164,20 @@ +
+ + +
-
+

新增节点

-

保存后会写入 config.json，并由 Go 服务热重载。

+

保存后会写入 config.json，并由服务热重载。

@@ -201,6 +207,6 @@ ServerStatus中文版 - + diff --git a/web/js/app.js b/web/js/app.js index c52f53b..b52ed9b 100644 --- a/web/js/app.js +++ b/web/js/app.js @@ -30,6 +30,8 @@ const S = { config: null, selectedType: 'servers', selectedIndex: -1, + queries: { servers:'', monitors:'', sslcerts:'', watchdog:'' }, + queryHeights: { servers:0, monitors:0, sslcerts:0, watchdog:0 }, saving: false } }; @@ -182,18 +184,15 @@ function metrics(s){ const traffic = monthIn + monthOut; const losses = lossValues(s); const loss = Math.max(...losses); - const lossBadCount = losses.filter(p => p >= 40).length; - const lossWarnCount = losses.filter(p => p >= 30).length; const blocked = online && losses.every(p => p >= 100); const resourceCritical = online && (num(s.cpu) >= 90 || memPct >= 90 || hddPct >= 90); const resourceWarning = online && (num(s.cpu) >= 75 || memPct >= 80 || hddPct >= 85); - const trafficWarning = online && traffic >= 1000 * 1000 * 1000 * 1000; const lossCritical = online && loss >= 40; const lossWarning = online && !lossCritical && loss >= 30; const critical = online && (resourceCritical || blocked || lossCritical); const warning = online && (resourceWarning || lossWarning); const rowLevel = !online || critical ? 'critical' : (resourceWarning || lossWarning ? 'warning' : ''); - return { online, memPct, hddPct, monthIn, monthOut, traffic, loss, lossBadCount, lossWarnCount, blocked, resourceCritical, resourceWarning, trafficWarning, lossCritical, lossWarning, critical, warning, alert: critical || warning, highlight: !!rowLevel, rowLevel }; + return { online, memPct, hddPct, monthIn, monthOut, traffic, loss, blocked, alert: critical || warning, rowLevel }; } async function fetchData(){ @@ -583,7 +582,6 @@ function renderMonitors(){ } function renderMonitorsCards(){ const wrap = $('monitorsCards'); - if(window.innerWidth > 700){ wrap.innerHTML = ''; return; } wrap.innerHTML = S.servers.map(s => `
${esc(s.name || '-')} ${esc(s.location || '-')}
${protoPill(s)}
监测内容${monitorItems(s)}
`).join('') || '
无数据
'; } function renderSSL(){ @@ -597,7 +595,6 @@ function renderSSL(){ } function renderSSLCards(){ const wrap = $('sslCards'); - if(window.innerWidth > 700){ wrap.innerHTML = ''; return; } wrap.innerHTML = S.ssl.map(c => { const cls = c.mismatch || c.expire_days <= 0 ? 'err' : c.expire_days <= 7 ? 'warn' : 'ok'; const status = c.mismatch ? '域名不匹配' : c.expire_days <= 0 ? '已过期' : c.expire_days <= 7 ? '将到期' : '正常'; @@ -844,7 +841,9 @@ const CONFIG_TYPES = { label: '节点', addLabel: '新增节点', empty: '暂无节点配置', - hint: '客户端登录使用 username/password，保存后 Go 服务会热重载并让客户端自动重连。', + searchPlaceholder: '节点名 / 用户名 / 位置 / 主机名', + searchFields: ['name','username','location','type','host'], + hint: '客户端登录使用 username/password，保存后服务会热重载并让客户端自动重连。', fields: [ { name:'username', label:'用户名', required:true, max:120 }, { name:'name', label:'节点名', required:true, max:120 }, @@ -863,6 +862,8 @@ const CONFIG_TYPES = { label: '监测', addLabel: '新增监测', empty: '暂无服务监测', + searchPlaceholder: '名称 / 地址 / 类型', + searchFields: ['name','host','type'], hint: '服务监测会写入 config.json 的 monitors 数组。', fields: [ { name:'name', label:'名称', required:true, max:120 }, @@ -878,6 +879,8 @@ const CONFIG_TYPES = { label: '证书', addLabel: '新增证书', empty: '暂无证书配置', + searchPlaceholder: '名称 / 域名', + searchFields: ['name','domain'], hint: '证书配置会写入 config.json 的 sslcerts 数组。', fields: [ { name:'name', label:'名称', required:true, max:120 }, @@ -894,6 +897,8 @@ const CONFIG_TYPES = { label: '告警', addLabel: '新增告警', empty: '暂无告警规则', + searchPlaceholder: '名称 / 规则', + searchFields: ['name','rule'], hint: '告警规则会写入 config.json 的 watchdog 数组。', fields: [ { name:'name', label:'名称', required:true, max:160 }, @@ -923,25 +928,56 @@ function configItems(){ if(!Array.isArray(S.admin.config[key])) S.admin.config[key] = []; return S.admin.config[key]; } +function activeConfigQuery(){ + return S.admin.queries[S.admin.selectedType] || ''; +} +function filteredConfigItems(items, def){ + const terms = activeConfigQuery().trim().toLocaleLowerCase().split(/\s+/).filter(Boolean); + return items.map((item, index) => ({ item, index })).filter(({ item }) => { + if(!terms.length) return true; + const haystack = def.searchFields.map(field => String(item?.[field] ?? '')).join('\n').toLocaleLowerCase(); + return terms.every(term => haystack.includes(term)); + }); +} function renderConfigList(){ const list = $('configItemList'); const def = activeConfigDef(); const items = configItems(); + const visibleItems = filteredConfigItems(items, def); + const query = activeConfigQuery(); + const lockedHeight = query.trim() ? S.admin.queryHeights[S.admin.selectedType] : 0; if(S.admin.selectedIndex >= items.length) S.admin.selectedIndex = -1; $('addConfigItemBtn').textContent = def.addLabel; + const search = $('configSearch'); + search.disabled = !S.admin.connected; + search.placeholder = def.searchPlaceholder; + if(search.value !== query) search.value = query; + $('configSearchCount').textContent = query.trim() ? `匹配 ${visibleItems.length} / 共 ${items.length} 项` : `共 ${items.length} 项`; + list.style.height = lockedHeight > 0 ? `${lockedHeight}px` : ''; document.querySelectorAll('#configTypeTabs button').forEach(btn => btn.classList.toggle('active', btn.dataset.type === S.admin.selectedType)); - list.innerHTML = items.map((item, index) => { + list.innerHTML = visibleItems.map(({ item, index }) => { const badge = def.badge(item, index); return `
${esc(def.title(item, index))}
${esc(def.meta(item, index))}
${esc(badge.text)}
`; - }).join('') || `
${def.empty}
`; + }).join('') || `
${query.trim() ? `未找到匹配的${def.label}配置` : def.empty}
`; list.querySelectorAll('.config-row').forEach(row => row.addEventListener('click', () => selectConfigItem(Number(row.dataset.index)))); } +function scrollConfigEditorIntoView(){ + if(!window.matchMedia('(max-width: 980px)').matches) return; + const behavior = window.matchMedia('(prefers-reduced-motion: reduce)').matches ? 'auto' : 'smooth'; + requestAnimationFrame(() => { + const editor = $('configEditorCard'); + const topbarHeight = document.querySelector('.topbar')?.getBoundingClientRect().height || 0; + const top = window.scrollY + editor.getBoundingClientRect().top - topbarHeight - 10; + window.scrollTo({ top:Math.max(0, top), behavior }); + }); +} function selectConfigItem(index){ const item = configItems()[index]; if(!item) return; S.admin.selectedIndex = index; renderConfigList(); renderConfigEditor(item); + scrollConfigEditorIntoView(); } function renderConfigEditor(item){ const def = activeConfigDef(); @@ -1065,18 +1101,27 @@ function bindAdmin(){ renderConfigList(); renderConfigEditor(); }); - $('addConfigItemBtn').addEventListener('click', clearConfigForm); + $('configSearch').addEventListener('input', e => { + const key = S.admin.selectedType; + const list = $('configItemList'); + const wasSearching = !!S.admin.queries[key].trim(); + const isSearching = !!e.target.value.trim(); + if(!wasSearching && isSearching) S.admin.queryHeights[key] = list.getBoundingClientRect().height; + if(wasSearching && !isSearching) S.admin.queryHeights[key] = 0; + S.admin.queries[key] = e.target.value; + list.scrollTop = 0; + renderConfigList(); + }); + $('addConfigItemBtn').addEventListener('click', () => { + clearConfigForm(); + scrollConfigEditorIntoView(); + }); $('resetConfigFormBtn').addEventListener('click', clearConfigForm); $('resetTrafficBtn').addEventListener('click', () => resetServerTraffic(S.admin.selectedIndex)); $('adminReload').addEventListener('click', async () => { try{ await api('/api/reload', { method:'POST' }); setAdminStatus('配置重载已触发。', 'ok'); } catch(err){ setAdminStatus('重载失败：' + err.message, 'err'); } }); - $('adminRestart').addEventListener('click', async () => { - if(!confirm('重启采集运行时？客户端会短暂断开后自动重连。')) return; - try{ await api('/api/restart', { method:'POST' }); setAdminStatus('采集运行时已在进程内重启，客户端正在自动重连。', 'ok'); } - catch(err){ setAdminStatus('重启失败：' + err.message, 'err'); } - }); $('configForm').addEventListener('submit', async e => { e.preventDefault(); const def = activeConfigDef(); @@ -1085,6 +1130,7 @@ function bindAdmin(){ const index = S.admin.selectedIndex; try{ await saveConfigItem(key, index, item); + if(index < 0) S.admin.queries[key] = ''; S.admin.selectedIndex = index >= 0 ? index : configItems().length - 1; renderConfigList(); renderConfigEditor(configItems()[S.admin.selectedIndex]);