refactor(web-test): извлечены DOM-скрипты filter.mjs в dom/filter.mjs

Все 17 inline page.evaluate в engine/table/filter.mjs вынесены в именованные dom-генераторы. Engine-модуль стал чистым orchestrator-ом. Новое в dom/forms.mjs (shared с будущим S3 select-value): - findSearchInputScript(formNum) — поиск SearchString/ПоискаСтроки input - findNamedButtonScript(text) — кнопка a.press по innerText (Найти, OK) - findCompareTypeRadioScript(form, idx) — радио CompareType#N#radio - isFormVisibleScript(form) — есть ли видимые элементы form{N} Новое в dom/filter.mjs: - findFirstGridCellCoordsScript — координаты первой клетки грида - findColumnFirstCellCoordsScript — клетка по имени колонки (fuzzy header match с needDlb-fallback) - readFieldSelectorInfoScript — FieldSelector value + DLB coords - pickFieldInSelectorDropdownScript — выбор поля в FieldSelector DLB-edd - readFilterDialogInfoScript — Pattern id+value+isDate+isRef - findFilterBadgeCloseScript — × badge по имени поля - findFirstFilterBadgeCloseScript — × первого видимого badge (для clear-all) Попутно: добавлен импорт readSubmenuScript (был pre-existing broken import в Еще-fallback ветке Alt+F). Метрики filter.mjs: 390 → 256 LOC (−134, −34%), inline page.evaluate 17 → 0. Регресс 09-filter / 02-crud / 05-table — зелёный. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-07-29 16:11:01 +03:00 · 2026-05-26 20:16:23 +03:00
parent 85003782db
commit 7f7ab2f217
4 changed files with 520 additions and 392 deletions
@@ -0,0 +1,187 @@
+// web-test dom/filter v1.0 — DOM scripts for filterList / unfilterList
+// Source: https://github.com/Nikolay-Shirokov/cc-1c-skills
+
+/**
+ * Find the first grid cell on the form and return its center coords.
+ * Used as a fallback target for Alt+F when there's no search input.
+ *
+ * Returns `{ x, y } | null`.
+ */
+export function findFirstGridCellCoordsScript(formNum) {
+  return `(() => {
+    const p = 'form${formNum}_';
+    const grid = [...document.querySelectorAll('[id^="' + p + '"].grid, [id^="' + p + '"] .grid')]
+      .find(g => g.offsetWidth > 0);
+    if (!grid) return null;
+    const rows = [...grid.querySelectorAll('.gridBody .gridLine')];
+    if (!rows.length) return null;
+    const cells = [...rows[0].querySelectorAll('.gridBox')];
+    if (!cells.length) return null;
+    const r = cells[0].getBoundingClientRect();
+    return { x: Math.round(r.x + r.width / 2), y: Math.round(r.y + r.height / 2) };
+  })()`;
+}
+
+/**
+ * Find the grid cell of the first row in the column whose header text matches `field`
+ * (fuzzy: exact → startsWith → includes; normalizes ё/е and NBSP).
+ *
+ * If the column isn't in the grid, returns coords of the first cell + `needDlb: true`
+ * so the caller can use DLB to switch FieldSelector after opening the dialog.
+ *
+ * Returns:
+ *   - `{ x, y, needDlb? } `      — coords to click (advanced search target)
+ *   - `{ error }`                — `'no_grid' | 'no_rows' | 'no_cells' | 'cell_not_found'`
+ */
+export function findColumnFirstCellCoordsScript(formNum, field) {
+  return `(() => {
+    const p = 'form${formNum}_';
+    const grid = [...document.querySelectorAll('[id^="' + p + '"].grid, [id^="' + p + '"] .grid')]
+      .find(g => g.offsetWidth > 0);
+    if (!grid) return { error: 'no_grid' };
+    const targetField = ${JSON.stringify(field)};
+    const headers = [...grid.querySelectorAll('.gridHead .gridBox')];
+    let colIndex = -1;
+    let startsWithIdx = -1;
+    let includesIdx = -1;
+    for (let i = 0; i < headers.length; i++) {
+      const t = headers[i].innerText?.trim().replace(/\\u00a0/g, ' ');
+      if (!t) continue;
+      const ny = s => s.replace(/ё/gi, 'е').replace(/\\u00a0/g, ' ');
+      const tl = ny(t.toLowerCase()), fl = ny(targetField.toLowerCase());
+      if (tl === fl) { colIndex = i; break; }
+      if (startsWithIdx < 0 && tl.startsWith(fl)) { startsWithIdx = i; }
+      else if (includesIdx < 0 && tl.includes(fl)) { includesIdx = i; }
+    }
+    if (colIndex < 0) colIndex = startsWithIdx >= 0 ? startsWithIdx : includesIdx;
+    const rows = [...grid.querySelectorAll('.gridBody .gridLine')];
+    if (!rows.length) return { error: 'no_rows' };
+    if (colIndex < 0) {
+      const cells = [...rows[0].querySelectorAll('.gridBox')];
+      if (!cells.length) return { error: 'no_cells' };
+      const r = cells[0].getBoundingClientRect();
+      return { x: Math.round(r.x + r.width / 2), y: Math.round(r.y + r.height / 2), needDlb: true };
+    }
+    const cells = [...rows[0].querySelectorAll('.gridBox')];
+    if (colIndex >= cells.length) return { error: 'cell_not_found' };
+    const r = cells[colIndex].getBoundingClientRect();
+    return { x: Math.round(r.x + r.width / 2), y: Math.round(r.y + r.height / 2) };
+  })()`;
+}
+
+/**
+ * Read FieldSelector input + its DLB button coords on the advanced search dialog.
+ * Returns `{ current, dlbX, dlbY }` (zero coords if DLB not visible).
+ */
+export function readFieldSelectorInfoScript(dialogForm) {
+  return `(() => {
+    const p = 'form' + ${JSON.stringify(String(dialogForm))} + '_';
+    const fsInput = [...document.querySelectorAll('input.editInput[id^="' + p + '"]')]
+      .find(el => el.offsetWidth > 0 && /FieldSelector/i.test(el.id));
+    const dlb = document.getElementById(p + 'FieldSelector_DLB');
+    return {
+      current: fsInput?.value?.trim() || '',
+      dlbX: dlb && dlb.offsetWidth > 0 ? Math.round(dlb.getBoundingClientRect().x + dlb.getBoundingClientRect().width / 2) : 0,
+      dlbY: dlb && dlb.offsetWidth > 0 ? Math.round(dlb.getBoundingClientRect().y + dlb.getBoundingClientRect().height / 2) : 0
+    };
+  })()`;
+}
+
+/**
+ * Pick a field name in the FieldSelector EDD dropdown (fuzzy: exact → includes,
+ * normalizes ё/е and NBSP).
+ *
+ * Returns:
+ *   - `{ x, y, name }`           — coords + matched name to click
+ *   - `{ error, available? }`    — `'no_dropdown'` or `'field_not_found'` with list of available names
+ */
+export function pickFieldInSelectorDropdownScript(field) {
+  return `(() => {
+    const edd = document.getElementById('editDropDown');
+    if (!edd || edd.offsetWidth === 0) return { error: 'no_dropdown' };
+    const ny = s => s.replace(/ё/gi, 'е').replace(/\\u00a0/g, ' ');
+    const target = ny(${JSON.stringify(field.toLowerCase())});
+    const items = [...edd.querySelectorAll('div')].filter(el =>
+      el.offsetWidth > 0 && el.innerText?.trim() && !el.innerText.includes('\\n'));
+    const match = items.find(el => ny(el.innerText.trim().toLowerCase()) === target)
+      || items.find(el => ny(el.innerText.trim().toLowerCase()).includes(target));
+    if (!match) return { error: 'field_not_found', available: items.map(el => el.innerText.trim()) };
+    const r = match.getBoundingClientRect();
+    return { x: Math.round(r.x + r.width / 2), y: Math.round(r.y + r.height / 2), name: match.innerText.trim() };
+  })()`;
+}
+
+/**
+ * Read advanced search dialog state — FieldSelector value, Pattern input id+value,
+ * and field type flags (isDate via iCalendB button, isRef via iDLB button on Pattern).
+ *
+ * Returns `{ fieldSelector, patternValue, patternId, isDate, isRef }`.
+ */
+export function readFilterDialogInfoScript(dialogForm) {
+  return `(() => {
+    const p = 'form' + ${JSON.stringify(String(dialogForm))} + '_';
+    const fsInput = [...document.querySelectorAll('input.editInput[id^="' + p + '"]')]
+      .find(el => el.offsetWidth > 0 && /FieldSelector/i.test(el.id));
+    const ptInput = [...document.querySelectorAll('input.editInput[id^="' + p + '"]')]
+      .find(el => el.offsetWidth > 0 && /Pattern/i.test(el.id));
+    const ptLabel = ptInput?.closest('label');
+    const btns = ptLabel ? [...ptLabel.querySelectorAll('span.btn')].map(b => b.className) : [];
+    const isDate = btns.some(c => c.includes('iCalendB'));
+    const isRef = !isDate && btns.some(c => c.includes('iDLB'));
+    return {
+      fieldSelector: fsInput?.value?.trim() || '',
+      patternValue: ptInput?.value?.trim() || '',
+      patternId: ptInput?.id || '',
+      isDate,
+      isRef
+    };
+  })()`;
+}
+
+/**
+ * Find the × close button on the filter badge whose title matches `field`
+ * (exact → includes; normalizes ё/е and NBSP).
+ *
+ * Returns:
+ *   - `{ x, y, field }`          — coords + actual field title from the badge
+ *   - `{ error, available }`     — `'not_found'` with list of available badge titles
+ */
+export function findFilterBadgeCloseScript(formNum, field) {
+  return `(() => {
+    const p = 'form${formNum}_';
+    const norm = s => s?.trim().replace(/\\u00a0/g, ' ').replace(/:$/, '').replace(/\\n/g, ' ') || '';
+    const ny = s => s.replace(/ё/gi, 'е').replace(/\\u00a0/g, ' ');
+    const target = ny(${JSON.stringify(field.toLowerCase())});
+    const items = [...document.querySelectorAll('[id^="' + p + '"].trainItem')].filter(el => el.offsetWidth > 0);
+    for (const item of items) {
+      const titleEl = item.querySelector('.trainName');
+      const title = ny(norm(titleEl?.innerText).toLowerCase());
+      if (title === target || title.includes(target)) {
+        const close = item.querySelector('.trainClose');
+        if (close) {
+          const r = close.getBoundingClientRect();
+          return { x: Math.round(r.x + r.width / 2), y: Math.round(r.y + r.height / 2), field: norm(titleEl?.innerText) };
+        }
+      }
+    }
+    const available = items.map(item => norm(item.querySelector('.trainName')?.innerText));
+    return { error: 'not_found', available };
+  })()`;
+}
+
+/**
+ * Find the × close button on the FIRST visible filter badge (for clear-all loop).
+ * Returns `{ x, y } | null`.
+ */
+export function findFirstFilterBadgeCloseScript(formNum) {
+  return `(() => {
+    const p = 'form${formNum}_';
+    const item = [...document.querySelectorAll('[id^="' + p + '"].trainItem')]
+      .find(el => el.offsetWidth > 0);
+    if (!item) return null;
+    const close = item.querySelector('.trainClose');
+    if (!close) return null;
+    const r = close.getBoundingClientRect();
+    return { x: Math.round(r.x + r.width / 2), y: Math.round(r.y + r.height / 2) };
+  })()`;
+}
@@ -1,4 +1,4 @@
-// web-test dom/forms v1.1 — form detection, content read, click-target/field-button resolution
+// web-test dom/forms v1.2 — form detection, content read, click-target/field-button resolution
 // Source: https://github.com/Nikolay-Shirokov/cc-1c-skills
 import { DETECT_FORM_FN, READ_FORM_FN } from './_shared.mjs';

@@ -422,3 +422,64 @@ export function detectNewFormScript(prevFormNum, { strict = false } = {}) {
    return nums.length > 0 ? Math.max(...nums) : null;
  })()`;
 }
+
+/**
+ * Find the search input on a list form (matches `SearchString` / `ПоискаСтроки` id).
+ * Returns `{ id, value } | null`.
+ */
+export function findSearchInputScript(formNum) {
+  return `(() => {
+    const p = 'form${formNum}_';
+    const el = [...document.querySelectorAll('input.editInput[id^="' + p + '"]')]
+      .find(el => el.offsetWidth > 0 && /Строк[аи]Поиска|SearchString/i.test(el.id));
+    return el ? { id: el.id, value: el.value || '' } : null;
+  })()`;
+}
+
+/**
+ * Find a visible `a.press` button by its exact innerText (after trim).
+ * Returns `{ x, y } | null` for `page.mouse.click(x, y)`.
+ *
+ * Used for modal dialog buttons (Найти, OK) where page.click may be blocked.
+ */
+export function findNamedButtonScript(buttonText) {
+  return `(() => {
+    const btns = [...document.querySelectorAll('a.press')].filter(el => el.offsetWidth > 0);
+    const btn = btns.find(el => el.innerText?.trim() === ${JSON.stringify(buttonText)});
+    if (!btn) return null;
+    const r = btn.getBoundingClientRect();
+    return { x: Math.round(r.x + r.width / 2), y: Math.round(r.y + r.height / 2) };
+  })()`;
+}
+
+/**
+ * Find a CompareType radio button by index (1 = "contains", 2 = "exact", etc.)
+ * on a search/filter dialog.
+ *
+ * Returns:
+ *   - `{ already: true }`        — the group is disabled OR the radio is already selected
+ *   - `{ x, y } | null`          — coords to click, or null if radio not present
+ */
+export function findCompareTypeRadioScript(dialogForm, radioIndex) {
+  return `(() => {
+    const p = 'form' + ${JSON.stringify(String(dialogForm))} + '_';
+    const group = document.getElementById(p + 'CompareType');
+    if (group && group.classList.contains('disabled')) return { already: true };
+    const el = document.getElementById(p + 'CompareType#' + ${JSON.stringify(String(radioIndex))} + '#radio');
+    if (!el || el.offsetWidth === 0) return null;
+    if (el.classList.contains('select')) return { already: true };
+    const r = el.getBoundingClientRect();
+    return { x: Math.round(r.x + r.width / 2), y: Math.round(r.y + r.height / 2) };
+  })()`;
+}
+
+/**
+ * Is any element of `form{dialogForm}_` currently visible?
+ * Used to poll dialog dismissal after Escape.
+ */
+export function isFormVisibleScript(dialogForm) {
+  return `(() => {
+    const p = 'form${dialogForm}_';
+    return [...document.querySelectorAll('[id^="' + p + '"]')].some(el => el.offsetWidth > 0);
+  })()`;
+}