✨feature: Adjust machine info style and machine list sort
This commit is contained in:
@@ -78,6 +78,31 @@ function deviceTitle(d) {
|
||||
return d.hostname ? `${d.hostname} (${d.ip})` : d.ip;
|
||||
}
|
||||
|
||||
function parseIPv4(ip) {
|
||||
if (typeof ip !== 'string') return null;
|
||||
const parts = ip.trim().split('.');
|
||||
if (parts.length !== 4) return null;
|
||||
const nums = parts.map((p) => Number(p));
|
||||
if (nums.some((n) => !Number.isInteger(n) || n < 0 || n > 255)) return null;
|
||||
return nums;
|
||||
}
|
||||
|
||||
function compareIpNumeric(a, b) {
|
||||
const pa = parseIPv4(a.ip);
|
||||
const pb = parseIPv4(b.ip);
|
||||
|
||||
if (pa && pb) {
|
||||
for (let i = 0; i < 4; i += 1) {
|
||||
if (pa[i] !== pb[i]) return pa[i] - pb[i];
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (pa) return -1;
|
||||
if (pb) return 1;
|
||||
return String(a.ip || '').localeCompare(String(b.ip || ''));
|
||||
}
|
||||
|
||||
function renderDeviceList() {
|
||||
deviceListEl.innerHTML = '';
|
||||
|
||||
@@ -153,6 +178,10 @@ Headers:\n${headers}
|
||||
|
||||
async function loadDevices() {
|
||||
devices = await api('/api/devices');
|
||||
devices.sort((a, b) => {
|
||||
if (a.is_active !== b.is_active) return b.is_active - a.is_active;
|
||||
return compareIpNumeric(a, b);
|
||||
});
|
||||
renderDeviceList();
|
||||
|
||||
if (!selectedDeviceId && devices.length) {
|
||||
|
||||
Reference in New Issue
Block a user