Fix SSH password focus loss in WOL and traffic panels

This commit is contained in:
kzolotarev95 committed 2026-08-13 01:12:08 +04:00
1 parent 9f23c6b9ce
commit 88afddaa86
1 file changed
+28 -19
+28 -19
View File
@@ -2941,10 +2941,19 @@ function consumeWolPointerAction(kind, routerId, extra = '') {{
function flushDeferredRouterRender() {{ function flushDeferredRouterRender() {{
if (!pendingRouterRender) return; if (!pendingRouterRender) return;
if (shouldDeferRouterRender()) return;
pendingRouterRender = false; pendingRouterRender = false;
renderRouterView(); renderRouterView();
}} }}
function requestRouterRender() {{
if (shouldDeferRouterRender()) {{
pendingRouterRender = true;
return;
}}
renderRouterView();
}}
function selectedRouter(routerId = activeDiagnosticRouterId) {{ function selectedRouter(routerId = activeDiagnosticRouterId) {{
const key = String(routerId || ''); const key = String(routerId || '');
return (window.ROUTERS || []).find((router) => String(router.id || '') === key) || null; return (window.ROUTERS || []).find((router) => String(router.id || '') === key) || null;
@@ -5175,7 +5184,7 @@ async function loadWolDevices(routerId, force = false) {{
const state = getWolState(key); const state = getWolState(key);
if (state.loading || (state.loaded && !force)) return; if (state.loading || (state.loaded && !force)) return;
setWolState(key, {{loading: true, error: '', message: ''}}); setWolState(key, {{loading: true, error: '', message: ''}});
renderRouterView(); requestRouterRender();
try {{ try {{
const res = await fetch('/api/router/' + encodeURIComponent(key) + '/wol/devices', {{ const res = await fetch('/api/router/' + encodeURIComponent(key) + '/wol/devices', {{
method: 'POST', method: 'POST',
@@ -5204,7 +5213,7 @@ async function loadWolDevices(routerId, force = false) {{
error: err && err.message ? err.message : 'Не удалось получить список устройств' error: err && err.message ? err.message : 'Не удалось получить список устройств'
}}); }});
}} }}
renderRouterView(); requestRouterRender();
}} }}
async function loadTrafficClients(routerId, force = false, options = {{}}) {{ async function loadTrafficClients(routerId, force = false, options = {{}}) {{
@@ -5215,7 +5224,7 @@ async function loadTrafficClients(routerId, force = false, options = {{}}) {{
const silent = Boolean(options && options.silent); const silent = Boolean(options && options.silent);
if (state.loading || (state.loaded && !force)) return; if (state.loading || (state.loaded && !force)) return;
setTrafficState(key, silent ? {{loading: true, error: ''}} : {{loading: true, error: '', message: ''}}); setTrafficState(key, silent ? {{loading: true, error: ''}} : {{loading: true, error: '', message: ''}});
if (!silent) renderRouterView(); if (!silent) requestRouterRender();
try {{ try {{
const res = await fetch('/api/router/' + encodeURIComponent(key) + '/traffic/clients', {{ const res = await fetch('/api/router/' + encodeURIComponent(key) + '/traffic/clients', {{
method: 'POST', method: 'POST',
@@ -5252,7 +5261,7 @@ async function loadTrafficClients(routerId, force = false, options = {{}}) {{
error: err && err.message ? err.message : 'Не удалось получить клиентов и трафик' error: err && err.message ? err.message : 'Не удалось получить клиентов и трафик'
}}); }});
}} }}
renderRouterView(); requestRouterRender();
}} }}
async function loadTrafficClients(routerId, force = false, options = {{}}) {{ async function loadTrafficClients(routerId, force = false, options = {{}}) {{
@@ -5263,7 +5272,7 @@ async function loadTrafficClients(routerId, force = false, options = {{}}) {{
const silent = Boolean(options && options.silent); const silent = Boolean(options && options.silent);
if (state.loading || (state.loaded && !force)) return; if (state.loading || (state.loaded && !force)) return;
setTrafficState(key, silent ? {{loading: true, error: ''}} : {{loading: true, error: '', message: ''}}); setTrafficState(key, silent ? {{loading: true, error: ''}} : {{loading: true, error: '', message: ''}});
if (!silent) renderRouterView(); if (!silent) requestRouterRender();
try {{ try {{
const res = await fetch('/api/router/' + encodeURIComponent(key) + '/traffic/clients', {{ const res = await fetch('/api/router/' + encodeURIComponent(key) + '/traffic/clients', {{
method: 'POST', method: 'POST',
@@ -5301,7 +5310,7 @@ async function loadTrafficClients(routerId, force = false, options = {{}}) {{
error: err && err.message ? err.message : 'Не удалось получить клиентов и трафик' error: err && err.message ? err.message : 'Не удалось получить клиентов и трафик'
}}); }});
}} }}
renderRouterView(); requestRouterRender();
}} }}
async function resetTrafficClients(routerId) {{ async function resetTrafficClients(routerId) {{
@@ -5313,7 +5322,7 @@ async function resetTrafficClients(routerId) {{
const confirmed = window.confirm('Сбросить счётчики трафика на роутере? Это очистит conntrack и может оборвать текущие подключения.'); const confirmed = window.confirm('Сбросить счётчики трафика на роутере? Это очистит conntrack и может оборвать текущие подключения.');
if (!confirmed) return; if (!confirmed) return;
setTrafficState(key, {{loading: true, error: '', message: 'Сбрасываю conntrack и трафик...'}}); setTrafficState(key, {{loading: true, error: '', message: 'Сбрасываю conntrack и трафик...'}});
renderRouterView(); requestRouterRender();
try {{ try {{
const res = await fetch('/api/router/' + encodeURIComponent(key) + '/traffic/reset', {{ const res = await fetch('/api/router/' + encodeURIComponent(key) + '/traffic/reset', {{
method: 'POST', method: 'POST',
@@ -5345,7 +5354,7 @@ async function resetTrafficClients(routerId) {{
error: err && err.message ? err.message : 'Не удалось сбросить трафик' error: err && err.message ? err.message : 'Не удалось сбросить трафик'
}}); }});
}} }}
renderRouterView(); requestRouterRender();
}} }}
async function wakeSelectedDevice(routerId) {{ async function wakeSelectedDevice(routerId) {{
@@ -5354,11 +5363,11 @@ async function wakeSelectedDevice(routerId) {{
const selected = (Array.isArray(state.devices) ? state.devices : []).find((device) => String(device.mac || '') === String(state.selectedMac || '')); const selected = (Array.isArray(state.devices) ? state.devices : []).find((device) => String(device.mac || '') === String(state.selectedMac || ''));
if (!selected) {{ if (!selected) {{
setWolState(key, {{error: 'Сначала выбери устройство из списка.', message: ''}}); setWolState(key, {{error: 'Сначала выбери устройство из списка.', message: ''}});
renderRouterView(); requestRouterRender();
return; return;
}} }}
setWolState(key, {{waking: true, error: '', message: ''}}); setWolState(key, {{waking: true, error: '', message: ''}});
renderRouterView(); requestRouterRender();
try {{ try {{
const res = await fetch('/api/router/' + encodeURIComponent(key) + '/wol', {{ const res = await fetch('/api/router/' + encodeURIComponent(key) + '/wol', {{
method: 'POST', method: 'POST',
@@ -5386,7 +5395,7 @@ async function wakeSelectedDevice(routerId) {{
error: err && err.message ? err.message : 'Не удалось отправить Wake-on-LAN пакет' error: err && err.message ? err.message : 'Не удалось отправить Wake-on-LAN пакет'
}}); }});
}} }}
renderRouterView(); requestRouterRender();
}} }}
function nextEntryPort(list) {{ function nextEntryPort(list) {{
@@ -5731,7 +5740,7 @@ cards.addEventListener('change', (ev) => {{
clearPendingWolBlurFlush(); clearPendingWolBlurFlush();
const mac = String(ev.target.value || ''); const mac = String(ev.target.value || '');
setWolState(routerId, {{selectedMac: mac, pickerOpen: false, error: '', message: ''}}); setWolState(routerId, {{selectedMac: mac, pickerOpen: false, error: '', message: ''}});
renderRouterView(); requestRouterRender();
flushDeferredRouterRender(); flushDeferredRouterRender();
}}); }});
@@ -5756,7 +5765,7 @@ cards.addEventListener('pointerup', (ev) => {{
const mac = wolPickButton.dataset.wolMac || ''; const mac = wolPickButton.dataset.wolMac || '';
rememberWolPointerAction('pick', routerId, mac); rememberWolPointerAction('pick', routerId, mac);
setWolState(routerId, {{selectedMac: mac, pickerOpen: false, error: '', message: ''}}); setWolState(routerId, {{selectedMac: mac, pickerOpen: false, error: '', message: ''}});
renderRouterView(); requestRouterRender();
flushDeferredRouterRender(); flushDeferredRouterRender();
return; return;
}} }}
@@ -5769,7 +5778,7 @@ cards.addEventListener('pointerup', (ev) => {{
const state = getWolState(wolPickerToggle); const state = getWolState(wolPickerToggle);
const pickerOpen = !state.pickerOpen; const pickerOpen = !state.pickerOpen;
setWolState(wolPickerToggle, {{pickerOpen}}); setWolState(wolPickerToggle, {{pickerOpen}});
renderRouterView(); requestRouterRender();
if (!pickerOpen) flushDeferredRouterRender(); if (!pickerOpen) flushDeferredRouterRender();
}} }}
}}); }});
@@ -5805,7 +5814,7 @@ cards.addEventListener('click', async (ev) => {{
const state = getWolState(wolToggleId); const state = getWolState(wolToggleId);
const open = !state.open; const open = !state.open;
setWolState(wolToggleId, {{open, pickerOpen: open ? state.pickerOpen : false, error: '', message: open ? state.message : ''}}); setWolState(wolToggleId, {{open, pickerOpen: open ? state.pickerOpen : false, error: '', message: open ? state.message : ''}});
renderRouterView(); requestRouterRender();
if (!open) flushDeferredRouterRender(); if (!open) flushDeferredRouterRender();
if (open) {{ if (open) {{
await loadWolDevices(wolToggleId, false); await loadWolDevices(wolToggleId, false);
@@ -5817,7 +5826,7 @@ cards.addEventListener('click', async (ev) => {{
const state = getTrafficState(trafficToggleId); const state = getTrafficState(trafficToggleId);
const open = !state.open; const open = !state.open;
setTrafficState(trafficToggleId, {{open, error: '', message: open ? state.message : ''}}); setTrafficState(trafficToggleId, {{open, error: '', message: open ? state.message : ''}});
renderRouterView(); requestRouterRender();
if (open) {{ if (open) {{
await loadTrafficClients(trafficToggleId, false); await loadTrafficClients(trafficToggleId, false);
}} }}
@@ -5832,7 +5841,7 @@ cards.addEventListener('click', async (ev) => {{
if (consumeWolPointerAction('pick', routerId, mac)) return; if (consumeWolPointerAction('pick', routerId, mac)) return;
clearPendingWolBlurFlush(); clearPendingWolBlurFlush();
setWolState(routerId, {{selectedMac: mac, pickerOpen: false, error: '', message: ''}}); setWolState(routerId, {{selectedMac: mac, pickerOpen: false, error: '', message: ''}});
renderRouterView(); requestRouterRender();
flushDeferredRouterRender(); flushDeferredRouterRender();
return; return;
}} }}
@@ -5844,7 +5853,7 @@ cards.addEventListener('click', async (ev) => {{
const state = getWolState(wolPickerToggle); const state = getWolState(wolPickerToggle);
const pickerOpen = !state.pickerOpen; const pickerOpen = !state.pickerOpen;
setWolState(wolPickerToggle, {{pickerOpen}}); setWolState(wolPickerToggle, {{pickerOpen}});
renderRouterView(); requestRouterRender();
if (!pickerOpen) flushDeferredRouterRender(); if (!pickerOpen) flushDeferredRouterRender();
return; return;
}} }}
@@ -6453,7 +6462,7 @@ reportClientHint();
updateNotifyButton(); updateNotifyButton();
initSeasonEffects(); initSeasonEffects();
syncRouterSearchToggleState(); syncRouterSearchToggleState();
renderRouterView(); requestRouterRender();
fillRouterForm(true); fillRouterForm(true);
waitNotificationsLoop(); waitNotificationsLoop();
setInterval(loadRouters, 5000); setInterval(loadRouters, 5000);