feat(annotate): payload v3.1——主目标改用光标下字符的Text节点(caretPositionFromPoint)+父元素真实样式;新增整行内容(height≤44祖先innerText);候选保留

This commit is contained in:
Aisland
2026-09-02 01:29:07 +08:00
parent e9d1d577eb
commit 29665dac78
2 changed files with 71 additions and 34 deletions
+35 -15
View File
@@ -16899,23 +16899,42 @@ function boxPayload(x0, y0, x1, y1) {
const cx = (L + R) / 2; const cx = (L + R) / 2;
const cy = (T2 + B) / 2; const cy = (T2 + B) / 2;
let primary = null; let primary = null;
let textParent = null;
try { try {
const stack = document.elementsFromPoint(cx, cy); const pd = document;
for (const el of stack) { const pos = pd.caretPositionFromPoint ? pd.caretPositionFromPoint(cx, cy) : pd.caretRangeFromPoint ? pd.caretRangeFromPoint(cx, cy) : null;
const tag = el.tagName.toLowerCase(); const textNode = pos ? pos.offsetNode ?? pos.startContainer ?? null : null;
if (tag === "script" || tag === "style" || tag === "svg" || tag === "path" || tag === "br" || tag === "template" || tag === "iframe") continue; if (textNode) {
if (el === document.body || el === document.documentElement) continue; const parent = textNode.parentElement;
const rect = el.getBoundingClientRect(); if (parent) {
if (rect.width <= 0 || rect.height <= 0) continue; textParent = parent;
if (rect.right < L || rect.left > R || rect.bottom < T2 || rect.top > B) continue; const text2 = (textNode.textContent || "").trim().replace(/\s+/g, " ").slice(0, 60);
const text2 = (el.textContent || "").trim().replace(/\s+/g, " "); if (text2) {
if (!text2) continue; const cs = getComputedStyle(parent);
const cs = getComputedStyle(el); primary = { text: text2, fontSize: cs.fontSize, lineHeight: cs.lineHeight, color: cs.color };
primary = { text: text2.slice(0, 60), fontSize: cs.fontSize, lineHeight: cs.lineHeight, color: cs.color }; }
break; }
} }
} catch { } catch {
} }
let line = "";
if (textParent) {
try {
let el = textParent;
while (el && el !== document.body) {
const r = el.getBoundingClientRect();
if (r.height >= 8 && r.height <= 44 && r.width > 0) {
const t = (el.innerText || "").replace(/\s+/g, " ").trim();
if (t) {
line = t.slice(0, 120);
break;
}
}
el = el.parentElement;
}
} catch {
}
}
const seen = /* @__PURE__ */ new Set(); const seen = /* @__PURE__ */ new Set();
if (primary) seen.add(primary.text); if (primary) seen.add(primary.text);
const candidates = []; const candidates = [];
@@ -16932,7 +16951,7 @@ function boxPayload(x0, y0, x1, y1) {
candidates.push(text2); candidates.push(text2);
if (candidates.length >= 4) break; if (candidates.length >= 4) break;
} }
return { primary, candidates }; return { primary, line, candidates };
} }
function fillHostInput(text2) { function fillHostInput(text2) {
try { try {
@@ -17023,7 +17042,8 @@ function AnnotationOverlay() {
} }
const hit = boxPayload(L, T2, R, B); const hit = boxPayload(L, T2, R, B);
if (hit.primary) stat += "\uFF0C\u4E3B\u76EE\u6807\uFF1A" + hit.primary.text + "\uFF08\u5B57\u53F7 " + hit.primary.fontSize + "\uFF0C\u884C\u9AD8 " + hit.primary.lineHeight + "\uFF09"; if (hit.primary) stat += "\uFF0C\u4E3B\u76EE\u6807\uFF1A" + hit.primary.text + "\uFF08\u5B57\u53F7 " + hit.primary.fontSize + "\uFF0C\u884C\u9AD8 " + hit.primary.lineHeight + "\uFF09";
if (hit.candidates.length > 0) stat += "\uFF0C\u5019\u9009\uFF1A" + hit.candidates.map((t, i) => "[" + (i + 1) + "]" + t).join(" "); if (hit.line) stat += "\uFF1B\u6574\u884C\uFF1A" + hit.line;
if (hit.candidates.length > 0) stat += "\uFF1B\u5019\u9009\uFF1A" + hit.candidates.map((t, i) => "[" + (i + 1) + "]" + t).join(" ");
} else { } else {
stat = "\u5C4F\u5E55\u5750\u6807 (" + Math.round(e.clientX) + ", " + Math.round(e.clientY) + ")"; stat = "\u5C4F\u5E55\u5750\u6807 (" + Math.round(e.clientX) + ", " + Math.round(e.clientY) + ")";
if (paneEl) { if (paneEl) {
+36 -19
View File
@@ -378,10 +378,10 @@ function ctxOf(t: EventTarget | null): string {
return out return out
} }
/** 框选 payload v3:主目标 = 框中心点处最具体的可见元素(elementsFromPoint 顶层优先), /** 框选 payload v3.1:主目标 = 框中心点【光标下的字符】所在的 Text 节点(caretPositionFromPoint,
* 直接带出它的文字与 computed style(字号/行高/颜色——「字号多少」类问题直接给答案); * 标签即使不是独立元素也能取到真正的词/段);样式取该 Text 节点的父元素(真实渲染值);
* 候选 = 与框相交的独立短文本(去重,最多 4)。 */ * 整行 = 最近的高度≤44px 祖先的内容(供「这行字是什么」类问题);候选 = 相交的独立短文本。 */
function boxPayload(x0: number, y0: number, x1: number, y1: number): { primary: { text: string; fontSize: string; lineHeight: string; color: string } | null; candidates: string[] } { function boxPayload(x0: number, y0: number, x1: number, y1: number): { primary: { text: string; fontSize: string; lineHeight: string; color: string } | null; line: string; candidates: string[] } {
const L = Math.min(x0, x1) const L = Math.min(x0, x1)
const T = Math.min(y0, y1) const T = Math.min(y0, y1)
const R = Math.max(x0, x1) const R = Math.max(x0, x1)
@@ -389,22 +389,38 @@ function boxPayload(x0: number, y0: number, x1: number, y1: number): { primary:
const cx = (L + R) / 2 const cx = (L + R) / 2
const cy = (T + B) / 2 const cy = (T + B) / 2
let primary: { text: string; fontSize: string; lineHeight: string; color: string } | null = null let primary: { text: string; fontSize: string; lineHeight: string; color: string } | null = null
let textParent: HTMLElement | null = null
try { try {
const stack = document.elementsFromPoint(cx, cy) const pd = document as any
for (const el of stack) { const pos = pd.caretPositionFromPoint ? pd.caretPositionFromPoint(cx, cy) : (pd.caretRangeFromPoint ? pd.caretRangeFromPoint(cx, cy) : null)
const tag = el.tagName.toLowerCase() const textNode: Node | null = pos ? (pos.offsetNode ?? pos.startContainer ?? null) : null
if (tag === 'script' || tag === 'style' || tag === 'svg' || tag === 'path' || tag === 'br' || tag === 'template' || tag === 'iframe') continue if (textNode) {
if (el === document.body || el === document.documentElement) continue const parent = textNode.parentElement
const rect = el.getBoundingClientRect() if (parent) {
if (rect.width <= 0 || rect.height <= 0) continue textParent = parent
if (rect.right < L || rect.left > R || rect.bottom < T || rect.top > B) continue const text = (textNode.textContent || '').trim().replace(/\s+/g, ' ').slice(0, 60)
const text = (el.textContent || '').trim().replace(/\s+/g, ' ') if (text) {
if (!text) continue const cs = getComputedStyle(parent)
const cs = getComputedStyle(el) primary = { text, fontSize: cs.fontSize, lineHeight: cs.lineHeight, color: cs.color }
primary = { text: text.slice(0, 60), fontSize: cs.fontSize, lineHeight: cs.lineHeight, color: cs.color } }
break }
} }
} catch {} } catch {}
// 整行:从文本父元素向上找最近的高度 ≤44px 的祖先
let line = ''
if (textParent) {
try {
let el: HTMLElement | null = textParent
while (el && el !== document.body) {
const r = el.getBoundingClientRect()
if (r.height >= 8 && r.height <= 44 && r.width > 0) {
const t = (el.innerText || '').replace(/\s+/g, ' ').trim()
if (t) { line = t.slice(0, 120); break }
}
el = el.parentElement
}
} catch {}
}
const seen = new Set<string>() const seen = new Set<string>()
if (primary) seen.add(primary.text) if (primary) seen.add(primary.text)
const candidates: string[] = [] const candidates: string[] = []
@@ -421,7 +437,7 @@ function boxPayload(x0: number, y0: number, x1: number, y1: number): { primary:
candidates.push(text) candidates.push(text)
if (candidates.length >= 4) break if (candidates.length >= 4) break
} }
return { primary, candidates } return { primary, line, candidates }
} }
/** 注入宿主对话框输入框(不发送);失败返回 false */ /** 注入宿主对话框输入框(不发送);失败返回 false */
@@ -512,7 +528,8 @@ function AnnotationOverlay() {
} }
const hit = boxPayload(L, T, R, B) const hit = boxPayload(L, T, R, B)
if (hit.primary) stat += ',主目标:' + hit.primary.text + '(字号 ' + hit.primary.fontSize + ',行高 ' + hit.primary.lineHeight + ')' if (hit.primary) stat += ',主目标:' + hit.primary.text + '(字号 ' + hit.primary.fontSize + ',行高 ' + hit.primary.lineHeight + ')'
if (hit.candidates.length > 0) stat += ',候选:' + hit.candidates.map((t, i) => '[' + (i + 1) + ']' + t).join(' ') if (hit.line) stat += ';整行:' + hit.line
if (hit.candidates.length > 0) stat += ';候选:' + hit.candidates.map((t, i) => '[' + (i + 1) + ']' + t).join(' ')
} else { } else {
stat = '屏幕坐标 (' + Math.round(e.clientX) + ', ' + Math.round(e.clientY) + ')' stat = '屏幕坐标 (' + Math.round(e.clientX) + ', ' + Math.round(e.clientY) + ')'
if (paneEl) { if (paneEl) {