mirrors/pikasTech-unidesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: preserve monitor check catalog titles

Browse Source
This commit is contained in:
Codex
2026-07-08 08:14:52 +02:00
parent c772a4a351
commit 51d909c567
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/assets/web-probe-sentinel-monitor-web/monitor-web.js
+7 -1
View File
@@ -1767,7 +1767,7 @@ function safeDetailValue(value) {
function safeDisplayTitle(...values) {
for (const value of values) {
const title = safeUserText(value);
const title = safeTitleText(value);
if (title && title !== "未登记监测项") return title;
}
return "";
@@ -1820,6 +1820,12 @@ function safeUserText(value) {
return text;
}
function safeTitleText(value) {
const text = String(value || "").replace(/\s+/g, " ").trim();
if (text.length === 0 || text === "未登记监测项") return "";
return text;
}
function detailSummaryText(detail) {
return detailSummaryRows(detail).map((row) => `${row.label}: ${row.value}`).join("\n");
}
scripts/src/hwlab-node-web-sentinel-p5.ts
+7 -4
View File
@@ -1220,10 +1220,13 @@ if (expectedErrorId) {
const dialog = document.querySelector("[data-check-dialog='true']");
const dialogErrorId = dialog?.getAttribute("data-error-id") || "";
const title = String(document.querySelector("#check-dialog-title")?.textContent || "").replace(/\s+/g, " ").trim();
if (dialog instanceof HTMLElement && dialogErrorId === errorId && title && title !== "未登记监测项") return { requestedErrorId: errorId, ok: true, reason: "dialog-open-registered" };
const row = document.querySelector('[data-error-id="' + CSS.escape(errorId) + '"]');
if (row instanceof HTMLElement) row.click();
await wait(150);
const dialogMatches = dialog instanceof HTMLElement && dialogErrorId === errorId;
if (dialogMatches && title && title !== "未登记监测项") return { requestedErrorId: errorId, ok: true, reason: "dialog-open-registered" };
if (!dialogMatches) {
const row = document.querySelector('[data-error-id="' + CSS.escape(errorId) + '"]');
if (row instanceof HTMLElement) row.click();
}
await wait(250);
}
return { requestedErrorId: errorId, ok: false, reason: "dialog-missing" };
}, expectedErrorId).catch((error) => ({ requestedErrorId: expectedErrorId, ok: false, reason: "selection-error", error: String(error?.message || error).slice(0, 300) }));