Skip to content

Spot it. Save it. Free, local-first Chrome extension for images, videos and prompts. Explore 2,000+ curated cases and connect your library to AI Agents via MCP. 提示词导演

修复 AI 配置与视觉采集体验

MigenAIa2b707cfb818
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 079bb69..b66eb30 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@
- 分享包把 Chrome Web Store 设为普通用户的主安装入口,并保留源码仓库作为次级入口。
- README 的普通用户安装说明改为商店安装与自动更新;GitHub Release 本地包只用于源码检查和开发验证。
+- AI 设置改为“任务默认”和“服务连接”分页,服务保存或模型刷新后会在当前窗口立即同步连接状态、模型目录和任务能力。
+- 服务配置存在未保存更改时,点击遮罩不再关闭;关闭、取消或 Escape 会先要求确认放弃。
+- 修复案例库图片墙最后一列和焦点框越出容器的问题,并加强缩放、追加与图片加载后的稳定布局。
+- 智能选图优先真实图片、视频和画布,去除同时包住提示词与按钮的重复外层候选,并按背景图实际绘制区域计算边界。
+- 网页采集会预检当前站点权限,按当前来源授权后在同一次操作中继续扫描,并分别提示拒绝授权、站点访问限制、不可注入页面与脚本启动失败。
## 1.18.8
diff --git a/capture-permissions.js b/capture-permissions.js
index a079808..826a70b 100644
--- a/capture-permissions.js
+++ b/capture-permissions.js
@@ -23,6 +23,31 @@ export async function ensurePagePermission(pageUrl, permissionsApi) {
return Boolean(await permissionsApi.request(request));
}
+export async function inspectPagePermission(pageUrl, permissionsApi) {
+ let pattern;
+ try {
+ pattern = pagePermissionPattern(pageUrl);
+ } catch {
+ return { status: "restricted", origin: "", pattern: "" };
+ }
+ return {
+ status: await permissionsApi.contains({ origins: [pattern] }) ? "granted" : "missing",
+ origin: new URL(pageUrl).origin,
+ pattern
+ };
+}
+
+export function pageCapturePermissionFailureMessage(error) {
+ const message = String(error?.message || error || "").trim();
+ if (/Cannot access contents|Missing host permission|not allowed to access|permission.{0,20}denied|extensions gallery/i.test(message)) {
+ return "Chrome 已阻止 PromptDirector 访问当前网站。请在当前网页重新点击浏览器工具栏里的 PromptDirector 图标;如果仍被阻止,再到扩展详情的“网站访问权限”中允许当前网站。待保存内容没有改变。";
+ }
+ if (/Could not establish connection|Receiving end does not exist|No frame with id|frame.{0,20}removed|Cannot find context/i.test(message)) {
+ return "已获得网站权限,但采集脚本没有成功启动。请刷新当前网页后重试;待保存内容没有改变。";
+ }
+ return message || "网页采集失败,待保存内容没有改变。";
+}
+
export async function hasClipboardReadPermission(permissionsApi) {
return Boolean(await permissionsApi.contains({
permissions: [...CLIPBOARD_READ_PERMISSIONS]
diff --git a/capture-region.js b/capture-region.js
index 3a817bd..6ace46c 100644
--- a/capture-region.js
+++ b/capture-region.js
@@ -285,6 +285,9 @@ export function selectPageVisuals(options = {}) {
top += objectPositionOffset(positionY, height - renderedHeight, "y");
width = renderedWidth;
height = renderedHeight;
+ } else if (isBackgroundVisual(element)) {
+ const painted = explicitBackgroundBounds(style, { left, top, width, height });
+ if (painted) ({ left, top, width, height } = painted);
}
const radius = Math.max(
@@ -313,6 +316,30 @@ export function selectPageVisuals(options = {}) {
return axis === "x" || axis === "y" ? freeSpace / 2 : 0;
}
+ function explicitBackgroundBounds(style, content) {
+ const size = String(style.backgroundSize || "").split(",")[0].trim().split(/\s+/);
+ if (size.length !== 2 || size.some((value) => ["", "auto", "cover", "contain"].includes(value))) return null;
+ const renderedWidth = backgroundLength(size[0], content.width);
+ const renderedHeight = backgroundLength(size[1], content.height);
+ if (!(renderedWidth > 0) || !(renderedHeight > 0)) return null;
+ const position = String(style.backgroundPosition || "0% 0%").split(",")[0].trim().split(/\s+/);
+ const paintedLeft = content.left + objectPositionOffset(position[0] || "0%", content.width - renderedWidth, "x");
+ const paintedTop = content.top + objectPositionOffset(position[1] || "0%", content.height - renderedHeight, "y");
+ const left = Math.max(content.left, paintedLeft);
+ const top = Math.max(content.top, paintedTop);
+ const right = Math.min(content.left + content.width, paintedLeft + renderedWidth);
+ const bottom = Math.min(content.top + content.height, paintedTop + renderedHeight);
+ return { left, top, width: Math.max(0, right - left), height: Math.max(0, bottom - top) };
+ }
+
+ function backgroundLength(value, available) {
+ const text = String(value || "").trim();
+ const amount = Number.parseFloat(text);
+ if (!Number.isFinite(amount)) return 0;
+ if (text.endsWith("%")) return available * amount / 100;
+ return amount;
+ }
+
function cornerRadius(value, width, height) {
const token = String(value || "0").split(/[\s/]+/)[0];
const amount = Number.parseFloat(token) || 0;
@@ -345,6 +372,7 @@ export function selectPageVisuals(options = {}) {
rect,
domIndex,
visibleRatio,
+ sourceKind: isBackgroundVisual(element) ? "background" : "media",
modalPriority: modal && isActiveVisualScope(modal) ? 1 : 0
});
}
@@ -352,7 +380,13 @@ export function selectPageVisuals(options = {}) {
const activeScope = measured.some((candidate) => candidate.modalPriority)
? measured.filter((candidate) => candidate.modalPriority)
: measured;
- const prioritized = activeScope.toSorted((left, right) =>
+ const withoutLayoutBackgrounds = activeScope.filter((candidate) => candidate.sourceKind !== "background" || !activeScope.some((nested) =>
+ nested.sourceKind === "media"
+ && nested.element !== candidate.element
+ && candidate.element.contains(nested.element)
+ && overlapRatio(candidate.rect, nested.rect) > 0.5
+ ));
+ const prioritized = withoutLayoutBackgrounds.toSorted((left, right) =>
right.modalPriority - left.modalPriority
|| right.visibleRatio - left.visibleRatio
|| right.rect.width * right.rect.height - left.rect.width * left.rect.height
@@ -383,6 +417,11 @@ export function selectPageVisuals(options = {}) {
return elements;
}
+ function isBackgroundVisual(element) {
+ return !element.matches("img, video, canvas, iframe")
+ && extractBackgroundUrls(getComputedStyle(element).backgroundImage).size > 0;
+ }
+
function isMediaControl(element) {
return element.matches('button, input, select, textarea, [role="button"], [role="slider"], [role="menuitem"], [aria-controls]');
}
diff --git a/collector.js b/collector.js
index ee105be..aa23a13 100644
--- a/collector.js
+++ b/collector.js
@@ -10,6 +10,8 @@ import { runCaptureTransaction } from "./capture-workspace.js";
import {
ensureClipboardReadPermission,
ensurePagePermission,
+ inspectPagePermission,
+ pageCapturePermissionFailureMessage,
readClipboardContentAfterFocus
} from "./capture-permissions.js";
import { initializeUi, t } from "./i18n.js";
@@ -65,6 +67,7 @@ let pageCaptureSession = null;
let pageCaptureMediaView = null;
let pageCaptureEditHistory = [];
let pageCaptureOriginalCandidates = new Map();
+let pageCapturePermissionState = { status: "unknown", origin: "", pattern: "" };
const visualUrls = new Map();
const FEEDBACK_DURATION_MS = 4000;
const ERROR_FEEDBACK_DURATION_MS = 8000;
@@ -82,10 +85,18 @@ chrome.storage.onChanged.addListener((changes, areaName) => {
await refresh();
await tryAutoSelection();
+void refreshPageCapturePermissionState();
elements.pageCaptureTargetCount.max = String(PAGE_CAPTURE_LIMITS.maxCandidates);
elements.openLibrary.addEventListener("click", () => void openLibraryTab());
-window.addEventListener("focus", () => void tryAutoSelection());
+window.addEventListener("focus", () => {
+ void tryAutoSelection();
+ void refreshPageCapturePermissionState();
+});
+chrome.tabs.onActivated.addListener(() => void refreshPageCapturePermissionState());
+chrome.tabs.onUpdated.addListener((_tabId, changeInfo, tab) => {
+ if (tab.active && changeInfo.url) void refreshPageCapturePermissionState();
+});
window.addEventListener("pagehide", () => void clearPageCaptureMarkers());
elements.startSelection.addEventListener("click", () => extractClipboardOrSelection(elements.startSelection));
elements.startScreenshot.addEventListener("click", () => captureFromActivePage("CAPTURE_ACTIVE_TAB_TO_DRAFT", elements.startScreenshot));
@@ -403,12 +414,39 @@ function render() {
elements.addOtherCaptureMethods.open = smartVisualFallback;
elements.otherCaptureMethods.classList.toggle("fallback-highlight", smartVisualFallback);
elements.addOtherCaptureMethods.classList.toggle("fallback-highlight", smartVisualFallback);
+ renderPageCapturePermissionAction();
elements.fragmentList.replaceChildren(...draft.fragments.map((fragment, index) =>
createFragmentCard(fragment, index, view.canReorderFragments)));
elements.visualList.replaceChildren(...draft.visuals.map((visual, index) =>
createVisualCard(visual, index, view)));
}
+async function refreshPageCapturePermissionState() {
+ try {
+ const [tab] = await chrome.tabs.query({ active: true, currentWindow: true });
+ if (!tab?.url && Number.isInteger(tab?.id)) {
+ pageCapturePermissionState = { status: "active-tab-required", origin: "", pattern: "" };
+ } else {
+ pageCapturePermissionState = await inspectPagePermission(tab?.url || "", chrome.permissions);
+ }
+ } catch {
+ pageCapturePermissionState = { status: "restricted", origin: "", pattern: "" };
+ }
+ renderPageCapturePermissionAction();
+ return pageCapturePermissionState;
+}
+
+function renderPageCapturePermissionAction() {
+ const needsGrant = pageCapturePermissionState.status === "missing";
+ const needsInvocation = pageCapturePermissionState.status === "active-tab-required";
+ const startLabel = needsInvocation ? t("点击插件图标授权当前页") : needsGrant ? t("授权当前网站并扫描") : t("网页采集");
+ const startText = elements.startPageCapture.querySelector("strong");
+ if (startText) startText.textContent = startLabel;
+ elements.addPageCapture.textContent = needsInvocation
+ ? t("+ 点击插件图标授权当前页")
+ : needsGrant ? t("+ 授权当前网站并扫描") : t("+ 网页采集");
+}
+
function renderPageCapture() {
const selections = new Map(pageCaptureBatch.selections.map((selection) => [selection.candidateId, selection]));
const selectedCount = pageCaptureBatch.selections.length;
@@ -1051,9 +1089,21 @@ async function startPageCapture(mode, button) {
? pageCaptureBatch?.candidates.find((candidate) => candidate.id === pageCaptureBatch.selections[0]?.candidateId) || null
: null;
const [tab] = await chrome.tabs.query({ active: true, currentWindow: true });
+ if (!tab?.url && Number.isInteger(tab?.id)) {
+ throw new Error(t("当前页的临时访问权已失效。请在当前网页再次点击浏览器工具栏里的 PromptDirector 图标,然后重新采集;待保存内容没有改变。"));
+ }
if (!tab?.url) throw new Error(t("请先切换到需要采集的普通网页"));
- if (!await ensurePagePermission(tab.url, chrome.permissions)) {
- throw new Error(t("没有获得当前网站权限,待保存内容没有改变"));
+ let permission = await inspectPagePermission(tab.url, chrome.permissions);
+ if (permission.status === "missing") {
+ if (!await ensurePagePermission(tab.url, chrome.permissions)) {
+ throw new Error(t("你没有授予当前网站访问权限。请再次点击“授权当前网站并扫描”,或在 Chrome 扩展详情的“网站访问权限”中允许此网站;待保存内容没有改变。"));
+ }
+ permission = { ...permission, status: "granted" };
+ }
+ pageCapturePermissionState = permission;
+ renderPageCapturePermissionAction();
+ if (permission.status === "restricted") {
+ throw new Error(t("Chrome 内部页、扩展页或本机设置页不能采集,请切换到普通网页"));
}
if (mode === "whole" && pageCaptureBatch) {
pageCaptureBatch = normalizePageCaptureBatch({ ...pageCaptureBatch, status: "scanning" });
@@ -1061,7 +1111,7 @@ async function startPageCapture(mode, button) {
}
const targetCount = mode === "list" ? Number(elements.pageCaptureTargetCount.value) : 0;
const response = await chrome.runtime.sendMessage({ type: "START_PAGE_CAPTURE", mode, targetCount });
- if (!response?.ok) throw new Error(response?.message || t("网页采集失败"));
+ if (!response?.ok) throw new Error(pageCapturePermissionFailureMessage(response?.message || t("网页采集失败")));
const candidates = response.batch.candidates.map((candidate) => {
let contentText = candidate.contentText;
try {
diff --git a/i18n.js b/i18n.js
index 0ae539a..6a07c09 100644
--- a/i18n.js
+++ b/i18n.js
@@ -250,6 +250,15 @@ const EN = Object.freeze({
"网页内容": "Web content",
"当前网页": "Current page",
"网页采集失败": "Web capture failed",
+ "网页采集": "Web capture",
+ "+ 网页采集": "+ Web capture",
+ "授权当前网站并扫描": "Allow this site and scan",
+ "+ 授权当前网站并扫描": "+ Allow this site and scan",
+ "点击插件图标授权当前页": "Click the extension icon to allow this page",
+ "+ 点击插件图标授权当前页": "+ Click the extension icon to allow this page",
+ "当前页的临时访问权已失效。请在当前网页再次点击浏览器工具栏里的 PromptDirector 图标,然后重新采集;待保存内容没有改变。": "Temporary access to this page has expired. Click the PromptDirector toolbar icon again on the current page, then retry capture. Unsaved content was not changed.",
+ "Chrome 内部页、扩展页或本机设置页不能采集,请切换到普通网页": "Chrome internal pages, extension pages, and browser settings cannot be captured. Switch to a regular web page.",
+ "你没有授予当前网站访问权限。请再次点击“授权当前网站并扫描”,或在 Chrome 扩展详情的“网站访问权限”中允许此网站;待保存内容没有改变。": "Access to this site was not granted. Click Allow this site and scan again, or allow this site under the extension's Site access settings. Unsaved content was not changed.",
"媒体域名权限未获授权;仍会保存正文和可用引用,并逐项显示下载失败原因。": "Media-domain access was not granted. Text and usable references will still be saved, with download failures shown per item.",
"网页内容保存失败": "Web content could not be saved",
"{message};{count} 项存在媒体下载问题": "{message}; {count} items have media download issues",
@@ -315,6 +324,11 @@ const EN = Object.freeze({
"界面与资料库": "Interface and library",
"任务与维护": "Tasks and maintenance",
"AI 服务": "AI services",
+ "AI 配置": "AI configuration",
+ "任务默认": "Task defaults",
+ "服务连接": "Service connections",
+ "有未保存的更改,再次关闭或取消将放弃这些更改": "You have unsaved changes. Close or cancel again to discard them.",
+ "确认放弃": "Discard changes",
"分析能力": "Analysis capability",
"只配置看图分析与多模态输入所需连接。": "Configure only the connection used for visual analysis and multimodal input.",
"生图能力": "Image generation capability",
diff --git a/library.css b/library.css
index 0d7d286..0a8f5c5 100644
--- a/library.css
+++ b/library.css
@@ -295,7 +295,7 @@ button[aria-busy="true"] { cursor: progress; }
.masonry { position: relative; width: 100%; overflow-anchor: none; --masonry-card-min-width: 270px; --masonry-gap: var(--visual-wall-gap); }
.case-card { position: absolute; display: block; margin: 0; overflow: hidden; color: var(--ink); border: 0; border-radius: var(--visual-card-radius); background: var(--card); cursor: pointer; }
.case-card:hover { box-shadow: 0 8px 20px color-mix(in srgb, var(--ink) 10%, transparent); }
-.case-card:focus-visible { outline: 2px solid var(--focus-ring); outline-offset: 2px; }
+.case-card:focus-visible { outline: 0; box-shadow: inset 0 0 0 2px var(--focus-ring); }
.case-card.share-selectable { user-select: none; }
.case-card.selected-for-share { box-shadow: inset 0 0 0 1px var(--selection-indicator); }
.case-card.selection-ineligible { opacity: .52; }
@@ -605,10 +605,15 @@ button[aria-busy="true"] { cursor: progress; }
.ai-routing-card { display: grid; gap: 14px; margin-bottom: 16px; padding: 14px; border: 1px solid var(--line); border-radius: var(--radius-panel); background: var(--surface-raised); }
.ai-routing-card h3, .ai-routing-card p { margin: 0; }
.ai-routing-card p { margin-top: 4px; color: var(--muted); font-size: 11px; }
-.ai-routing-card > button { width: max-content; }
-.ai-routing-regions { display: grid; grid-template-columns: minmax(0, 1.35fr) minmax(0, 1fr); gap: 12px; }
+.ai-routing-tabs { display: flex; gap: 6px; border-bottom: 1px solid var(--line); padding-bottom: 8px; }
+.ai-routing-tabs button { min-height: 32px; color: var(--muted); background: transparent; }
+.ai-routing-tabs button[aria-selected="true"] { color: var(--ink); background: var(--selection); box-shadow: inset 0 -1px var(--selection-indicator); }
+.ai-routing-regions { display: grid; grid-template-columns: minmax(0, 1fr); gap: 12px; }
.ai-routing-regions > section { display: grid; align-content: start; gap: 8px; border: 1px solid var(--line); border-radius: 8px; padding: 12px; background: var(--card); }
+.ai-routing-regions > section[hidden] { display: none; }
.ai-routing-regions h4 { margin: 0; color: var(--muted); font-size: 11px; }
+.ai-provider-region-heading { display: flex; align-items: center; justify-content: space-between; gap: 12px; }
+.ai-provider-region-heading button { flex: none; }
.ai-provider-list, .ai-assignment-list { display: grid; gap: 6px; }
.ai-provider-row, .ai-assignment-row { display: grid; align-items: baseline; gap: 10px; min-height: 28px; border-bottom: 1px solid var(--line); padding: 5px 0; }
.ai-assignment-row { grid-template-columns: minmax(90px, .65fr) minmax(0, 1fr) auto; align-items: center; }
@@ -627,6 +632,7 @@ button[aria-busy="true"] { cursor: progress; }
.ai-advanced-settings > summary strong { font-size: 13px; }
.ai-advanced-settings > summary span { color: var(--muted); font-size: 11px; font-weight: 500; }
.visual-analysis-dialog { width: min(940px, calc(100vw - 28px)); }
+.ai-provider-dialog { width: min(760px, calc(100vw - 28px)); }
.visual-analysis-dialog-body { align-content: start; padding: 0; }
.visual-analysis-dialog-body > .app-dialog-check { padding: 14px 16px 0; }
.visual-analysis-workspace { display: grid; min-height: 0; gap: 12px; padding: 0 16px 18px; }
@@ -1016,7 +1022,7 @@ button[aria-busy="true"] { cursor: progress; }
.share-package-import > div { display: grid; gap: 3px; }
.share-package-import span { color: var(--muted); font-size: 11px; line-height: 1.5; }
.share-package-import button { min-width: 96px; }
-.settings-dialog { display: grid; grid-template-rows: 64px minmax(0, 1fr); width: min(720px, calc(100vw - 32px)); height: min(780px, calc(100dvh - 40px)); max-height: none; overflow: hidden; }
+.settings-dialog { display: grid; grid-template-rows: 64px minmax(0, 1fr); width: min(1040px, calc(100vw - 40px)); height: min(780px, calc(100dvh - 40px)); max-height: none; overflow: hidden; }
.settings-dialog .package-preferences-body { grid-template-columns: repeat(3, minmax(0, 1fr)); align-items: start; gap: 12px; }
.settings-dialog .package-preferences-body > label { grid-template-columns: 1fr; align-content: start; }
.settings-dialog .library-storage-settings { grid-column: 1 / -1; grid-template-columns: 1fr 1fr; gap: 12px; padding: 16px 0 0; }
@@ -1081,6 +1087,7 @@ button[aria-busy="true"] { cursor: progress; }
.filter-sidebar { top: 0; height: 100dvh; }
.sidebar-filter-tools { padding-right: 8px; }
.manager-dialog { display: block; width: 100vw; height: 100dvh; border-radius: 0; }
+ .settings-dialog { width: 100vw; height: 100dvh; border-radius: 0; }
.manager-tabs { display: flex; min-height: 48px; overflow-x: auto; flex-direction: row; gap: 14px; border-right: 0; border-bottom: 1px solid var(--line); padding: 0 12px; }
.manager-tabs button { flex: 0 0 auto; min-height: 48px; padding-inline: 2px; }
.manager-tabs button[aria-selected="true"] { background: transparent; }
diff --git a/library.html b/library.html
index 70030f0..09158ae 100644
--- a/library.html
+++ b/library.html
@@ -205,7 +205,7 @@
<div class="data-safety-body settings-shell">
<nav class="settings-tabs" aria-label="设置视图">
<button type="button" data-settings-tab="general" aria-selected="true" data-i18n="界面与资料库">界面与资料库</button>
- <button type="button" data-settings-tab="ai" aria-selected="false" data-i18n="AI 服务">AI 服务</button>
+ <button type="button" data-settings-tab="ai" aria-selected="false" data-i18n="AI 配置">AI 配置</button>
<button type="button" data-settings-tab="tasks" aria-selected="false" data-i18n="任务与维护">任务与维护</button>
</nav>
<section id="settings-general-panel" class="settings-panel package-preferences-body" data-settings-panel="general">
@@ -294,12 +294,15 @@
</section>
<section id="settings-ai-panel" class="settings-panel settings-ai-panel" data-settings-panel="ai" hidden>
<section class="ai-routing-card">
- <div class="ai-routing-heading"><h3 data-i18n="AI 任务配置">AI 任务配置</h3><p id="ai-routing-summary">先按任务选择默认服务;API Key 只需在连接服务时填写一次。</p></div>
+ <div class="ai-routing-heading"><h3 data-i18n="AI 配置">AI 配置</h3><p id="ai-routing-summary">先按任务选择默认服务;API Key 只需在连接服务时填写一次。</p></div>
+ <nav class="ai-routing-tabs" role="tablist" aria-label="AI 配置视图">
+ <button type="button" data-ai-routing-tab="tasks" aria-selected="true" data-i18n="任务默认">任务默认</button>
+ <button type="button" data-ai-routing-tab="providers" aria-selected="false" data-i18n="服务连接">服务连接</button>
+ </nav>
<div class="ai-routing-regions">
- <section class="ai-task-region"><h4 data-i18n="各任务默认模型">各任务默认模型</h4><div id="ai-assignment-list" class="ai-assignment-list"></div></section>
- <section><h4 data-i18n="AI 服务">AI 服务</h4><div id="ai-provider-list" class="ai-provider-list"></div></section>
+ <section class="ai-task-region" data-ai-routing-panel="tasks"><h4 data-i18n="各任务默认模型">各任务默认模型</h4><div id="ai-assignment-list" class="ai-assignment-list"></div></section>
+ <section data-ai-routing-panel="providers" hidden><div class="ai-provider-region-heading"><h4 data-i18n="服务连接">服务连接</h4><button id="open-ai-routing" type="button" data-i18n="连接 AI 服务">连接 AI 服务</button></div><div id="ai-provider-list" class="ai-provider-list"></div></section>
</div>
- <button id="open-ai-routing" type="button" data-i18n="连接 AI 服务">连接 AI 服务</button>
</section>
<details class="ai-advanced-settings">
<summary><strong data-i18n="分析规则与创作方法(高级)">分析规则与创作方法(高级)</strong><span data-i18n="只管理分析规则和创作方法;服务连接与模型分配均在上方完成。">只管理分析规则和创作方法;服务连接与模型分配均在上方完成。</span></summary>
diff --git a/library.js b/library.js
index e1cbaac..db8a345 100644
--- a/library.js
+++ b/library.js
@@ -165,6 +165,8 @@ const elements = Object.fromEntries([
const managerTabs = [...document.querySelectorAll("[data-manager-tab]")];
const settingsTabs = [...document.querySelectorAll("[data-settings-tab]")];
const settingsPanels = [...document.querySelectorAll("[data-settings-panel]")];
+const aiRoutingTabs = [...document.querySelectorAll("[data-ai-routing-tab]")];
+const aiRoutingPanels = [...document.querySelectorAll("[data-ai-routing-panel]")];
const analysisLocalePanels = [...document.querySelectorAll("[data-analysis-locale-panel]")];
const analysisKindTabs = [...document.querySelectorAll("[data-analysis-kind]")];
const analysisKindPanels = [...document.querySelectorAll("[data-analysis-kind-panel]")];
@@ -237,6 +239,7 @@ let canUndoFacetUpdate = false;
let activeAnalysisLocale = currentLocale() === "en" ? "en" : "zh-CN";
let activeAnalysisKind = "text";
let activeSettingsTab = "general";
+let activeAiRoutingTab = "tasks";
let activeVideoAnalysisUi = null;
let selectionMode = "";
let projectSelectionId = "";
@@ -487,6 +490,10 @@ function bindEvents() {
activeSettingsTab = button.dataset.settingsTab || "general";
renderSettingsPanels({ resetActiveScroll: true });
}));
+ aiRoutingTabs.forEach((button) => button.addEventListener("click", () => {
+ activeAiRoutingTab = button.dataset.aiRoutingTab || "tasks";
+ renderAiRoutingView();
+ }));
aiAdvancedSettingsSummary?.addEventListener("click", () => preserveSettingsAnchor(aiAdvancedSettingsSummary));
elements.clearFilters.addEventListener("click", clearFilters);
elements.createCollection.addEventListener("click", () => createProjectCollection(elements.createCollection));
@@ -5917,6 +5924,12 @@ function renderAiRoutingSummary() {
);
return row;
}));
+ renderAiRoutingView();
+}
+
+function renderAiRoutingView() {
+ aiRoutingTabs.forEach((button) => button.setAttribute("aria-selected", String(button.dataset.aiRoutingTab === activeAiRoutingTab)));
+ aiRoutingPanels.forEach((panel) => { panel.hidden = panel.dataset.aiRoutingPanel !== activeAiRoutingTab; });
}
function providerConnectionReady(profile = {}) {
@@ -5979,6 +5992,10 @@ async function openAiTaskAssignmentDialog(taskId) {
],
confirmLabel: t("保存任务默认"),
cancelLabel: t("取消"),
+ dismissOnBackdrop: false,
+ confirmDismissWhenDirty: true,
+ dirtyDismissMessage: t("有未保存的更改,再次关闭或取消将放弃这些更改"),
+ discardLabel: t("确认放弃"),
onReady: ({ dialog, controls }) => {
localizeAiDialogClose(dialog);
const provider = controls.get("providerId");
@@ -6093,6 +6110,11 @@ async function openAiProviderDialog(initialProviderId = "") {
confirmLabel: t("保存配置"),
cancelLabel: t("取消"),
pendingLabel: t("正在保存…"),
+ dialogClass: "ai-provider-dialog",
+ dismissOnBackdrop: false,
+ confirmDismissWhenDirty: true,
+ dirtyDismissMessage: t("有未保存的更改,再次关闭或取消将放弃这些更改"),
+ discardLabel: t("确认放弃"),
renderBody: ({ body }) => {
const details = document.createElement("details");
details.className = "ai-advanced-settings app-dialog-advanced-settings";
@@ -6263,12 +6285,12 @@ function commaSeparatedValues(value) {
}
function applyAiConfigurationResponse(response) {
- aiProviderRegistry = response.aiProviderRegistry;
- aiTaskAssignments = response.aiTaskAssignments;
- aiSettings = response.aiSettings;
- visionSettings = response.visionSettings;
- aiServiceProfiles = response.aiServiceProfiles;
- renderAiRoutingSummary();
+ aiProviderRegistry = response.aiProviderRegistry ?? aiProviderRegistry;
+ aiTaskAssignments = response.aiTaskAssignments ?? aiTaskAssignments;
+ aiSettings = response.aiSettings ?? aiSettings;
+ visionSettings = response.visionSettings ?? visionSettings;
+ aiServiceProfiles = response.aiServiceProfiles ?? aiServiceProfiles;
+ renderAnalysisSettings();
}
function discoveredModelOptions(profile, taskId, selectedValue = "") {
@@ -6306,9 +6328,7 @@ async function refreshAiProviderModels(providerId, button) {
try {
const response = await chrome.runtime.sendMessage({ type: "DISCOVER_AI_PROVIDER_MODELS", providerId, force: true });
if (!response?.ok) throw new Error(translateUiMessage(response?.message) || t("模型目录读取失败"));
- aiProviderRegistry = response.aiProviderRegistry;
- aiTaskAssignments = response.aiTaskAssignments;
- renderAiRoutingSummary();
+ applyAiConfigurationResponse(response);
showFeedback(t("{provider} 已发现 {count} 个模型", {
provider: providerDisplayLabel(profile),
count: response.aiProviderRegistry?.providers?.[providerId]?.discoveredModels?.length || 0
@@ -6329,11 +6349,9 @@ async function refreshAiModelCatalogsForSession() {
try {
const response = await chrome.runtime.sendMessage({ type: "DISCOVER_AI_PROVIDER_MODELS", providerId: profile.id, force: false });
if (!response?.ok) continue;
- aiProviderRegistry = response.aiProviderRegistry;
- aiTaskAssignments = response.aiTaskAssignments;
+ applyAiConfigurationResponse(response);
} catch {}
}
- renderAiRoutingSummary();
}
function permissionPatternForProvider(value) {
diff --git a/stable-masonry.js b/stable-masonry.js
index b6e603f..b298a23 100644
--- a/stable-masonry.js
+++ b/stable-masonry.js
@@ -212,8 +212,8 @@ export function createStableMasonry(container, options = {}) {
function placeCard(card) {
if (!(card instanceof HTMLElement) || cardMetadata.has(card)) return;
ensureColumns();
- card.style.width = `${geometry.cardWidth}px`;
const column = shortestColumn();
+ card.style.width = `${columnWidth(column)}px`;
const height = card.getBoundingClientRect().height;
const top = columnHeight(column);
const metadata = { column, height, top };
@@ -319,7 +319,8 @@ export function createStableMasonry(container, options = {}) {
}
function positionCard(card, metadata) {
- card.style.left = `${metadata.column * (geometry.cardWidth + geometry.gap)}px`;
+ card.style.left = `${columnLeft(metadata.column)}px`;
+ card.style.width = `${columnWidth(metadata.column)}px`;
card.style.top = `${metadata.top}px`;
card.dataset.masonryColumn = String(metadata.column);
}
@@ -332,6 +333,15 @@ export function createStableMasonry(container, options = {}) {
return shortest;
}
+ function columnLeft(column) {
+ return column * (geometry.cardWidth + geometry.gap);
+ }
+
+ function columnWidth(column) {
+ if (column !== geometry.columnCount - 1) return geometry.cardWidth;
+ return Math.max(1, geometry.containerWidth - columnLeft(column));
+ }
+
function columnHeight(column) {
const cards = columns[column] ?? [];
const last = cards.at(-1);
diff --git a/store/CHROME_WEB_STORE_SUBMISSION.md b/store/CHROME_WEB_STORE_SUBMISSION.md
index c513e42..710eb56 100644
--- a/store/CHROME_WEB_STORE_SUBMISSION.md
+++ b/store/CHROME_WEB_STORE_SUBMISSION.md
@@ -7,8 +7,8 @@ This file is the source-of-truth worksheet for the current PromptDirector manife
- Chrome Web Store item public key: stored in the source `manifest.json` for local identity verification only; `package:release` removes `key` from the upload manifest.
- Expected extension ID: `iahakaahijddcjjldidbclicedibgpjm`.
- Current release candidate: `dist/PromptDirector-1.18.9.zip`.
-- Candidate size: `8,127,369` bytes.
-- Candidate SHA-256: `ef8d5fb15764507c866cb318ad7c3e8dbd01848e9365401c367b947f899e66e4`.
+- Candidate size: `8,138,832` bytes.
+- Candidate SHA-256: `b0603247d16de59ae9d9b029bd746a11a7e5023b9d78cd0aeae11c57c8a14881`.
- Generate a candidate only with `npm run package:release`; the command verifies the source public key against the expected identity, then removes `key` from the Web Store upload manifest.
## Store listing
diff --git a/test/ai_provider_registry_e2e.py b/test/ai_provider_registry_e2e.py
index 47f9556..6d2de25 100644
--- a/test/ai_provider_registry_e2e.py
+++ b/test/ai_provider_registry_e2e.py
@@ -106,6 +106,7 @@ def assert_english_ai_settings() -> None:
expect(library.locator("#feedback")).to_contain_text("No connected service has a catalog model explicitly supporting Text tags")
dialog.locator(".app-dialog-close").click()
+ library.locator('[data-ai-routing-tab="providers"]').click()
library.locator("#open-ai-routing").click()
dialog = library.locator("#promptdirector-app-dialog")
expect(dialog).not_to_contain_text(chinese, use_inner_text=True)
@@ -227,6 +228,10 @@ def main() -> None:
expect(library.locator("#ai-provider-list .ai-provider-row")).to_have_count(10)
expect(library.locator("#ai-assignment-list .ai-assignment-row")).to_have_count(7)
+ expect(library.locator('[data-ai-routing-panel="tasks"]')).to_be_visible()
+ expect(library.locator('[data-ai-routing-panel="providers"]')).to_be_hidden()
+ library.locator('[data-ai-routing-tab="providers"]').click()
+ expect(library.locator('[data-ai-routing-panel="providers"]')).to_be_visible()
expect(library.locator("#ai-provider-list")).to_contain_text("DeepSeek")
expect(library.locator("#ai-provider-list")).to_contain_text("OpenAI")
expect(library.locator("#ai-provider-list")).to_contain_text("Google Gemini")
@@ -278,6 +283,15 @@ def main() -> None:
assert all(value == "" for value in password_values), password_values
expect(dialog.locator('input[type="password"]:visible')).to_have_count(0)
assert "secret" not in dialog.text_content()
+ dialog.evaluate("node => node.dispatchEvent(new MouseEvent('click', {bubbles: true}))")
+ expect(dialog).to_be_visible()
+ dialog.locator(".app-dialog-close").click()
+ expect(dialog).to_be_visible()
+ expect(dialog.locator(".app-dialog-status")).to_contain_text("有未保存的更改")
+ dialog.get_by_role("button", name="确认放弃").click()
+ expect(dialog).to_be_hidden()
+ library.locator("#open-ai-routing").click()
+ dialog = library.locator("#promptdirector-app-dialog")
dialog.locator("#promptdirector-app-dialog-providerEditor").select_option("custom-media")
analysis_key = dialog.locator("#promptdirector-app-dialog-provider_custom_media_apiKey")
image_key = dialog.locator("#promptdirector-app-dialog-provider_custom_media_imageApiKey")
@@ -343,6 +357,7 @@ def main() -> None:
assert openai_saved["aiProviderRegistry"]["providers"]["openai"]["models"]["imageGeneration"] == "openai-account-image-model"
assert openai_saved["aiTaskAssignments"] == openai_assignments_before_save
+ library.locator('[data-ai-routing-tab="tasks"]').click()
generation_task = library.locator("#ai-assignment-list .ai-assignment-row", has_text="图片生成")
generation_task.get_by_role("button", name="更换").click()
generation_dialog = library.locator("#promptdirector-app-dialog")
@@ -350,6 +365,10 @@ def main() -> None:
expect(generation_dialog.locator('[data-field-id="model"] select')).to_have_value("openai-account-image-model")
expect(generation_dialog.locator('[data-field-id="model"]')).to_contain_text("手动声明,未验证")
generation_dialog.locator(".app-dialog-close").click()
+ expect(generation_dialog).to_be_visible()
+ expect(generation_dialog.locator(".app-dialog-status")).to_contain_text("未保存的更改")
+ generation_dialog.locator(".app-dialog-close").click()
+ expect(generation_dialog).to_be_hidden()
image_task = library.locator("#ai-assignment-list .ai-assignment-row", has_text="图片分析")
expect(image_task).to_contain_text("自定义兼容服务(图片与生成) · gpt-5.6-terra")
@@ -366,6 +385,7 @@ def main() -> None:
assert stored["aiTaskAssignments"] == assignments_before_save
assignments_before_nano = stored["aiTaskAssignments"]
+ library.locator('[data-ai-routing-tab="providers"]').click()
library.locator('[data-provider-id="gemini"]').get_by_role("button", name="刷新模型").click()
expect(library.locator("#feedback")).to_contain_text("Google Gemini 已发现")
assert gemini_model_requests, gemini_model_requests
@@ -387,6 +407,7 @@ def main() -> None:
assert "imageGeneration" not in ordinary["tasks"]
assert "imageGeneration" not in preview["tasks"]
+ library.locator('[data-ai-routing-tab="tasks"]').click()
generation_task = library.locator("#ai-assignment-list .ai-assignment-row", has_text="图片生成")
generation_task.get_by_role("button", name="更换").click()
nano_dialog = library.locator("#promptdirector-app-dialog")
diff --git a/test/capture-permission-flow.test.js b/test/capture-permission-flow.test.js
index 748a436..c0803fd 100644
--- a/test/capture-permission-flow.test.js
+++ b/test/capture-permission-flow.test.js
@@ -10,6 +10,8 @@ import {
readClipboardContentAfterFocus,
ensureContinuousCapturePermission,
ensurePagePermission,
+ inspectPagePermission,
+ pageCapturePermissionFailureMessage,
pagePermissionPattern
} from "../capture-permissions.js";
import { runCaptureTransaction } from "../capture-workspace.js";
@@ -179,6 +181,45 @@ test("text collection keeps its narrower per-site permission", async () => {
});
});
+test("page capture permission preflight distinguishes granted, missing, and restricted pages without prompting", async () => {
+ const calls = [];
+ const permissions = {
+ contains: async (request) => {
+ calls.push(request);
+ return request.origins[0].startsWith("https://allowed.example");
+ }
+ };
+
+ assert.deepEqual(await inspectPagePermission("https://allowed.example/work", permissions), {
+ status: "granted",
+ origin: "https://allowed.example",
+ pattern: "https://allowed.example/*"
+ });
+ assert.deepEqual(await inspectPagePermission("https://jimeng.jianying.com/ai-tool/work-detail/1", permissions), {
+ status: "missing",
+ origin: "https://jimeng.jianying.com",
+ pattern: "https://jimeng.jianying.com/*"
+ });
+ assert.deepEqual(await inspectPagePermission("chrome://extensions", permissions), {
+ status: "restricted",
+ origin: "",
+ pattern: ""
+ });
+ assert.equal(calls.length, 2);
+});
+
+test("page capture permission failures distinguish Chrome site access from script startup failures", () => {
+ assert.match(
+ pageCapturePermissionFailureMessage(new Error("Cannot access contents of url https://example.com/")),
+ /网站访问权限/
+ );
+ assert.match(
+ pageCapturePermissionFailureMessage(new Error("Could not establish connection. Receiving end does not exist.")),
+ /采集脚本没有成功启动/
+ );
+ assert.equal(pageCapturePermissionFailureMessage(new Error("页面结构无法识别")), "页面结构无法识别");
+});
+
test("text capture resolves the active page before requesting only that page permission", async () => {
const calls = [];
const chromeApi = {
@@ -219,12 +260,15 @@ test("text capture resolves the active page before requesting only that page per
]);
});
-test("page capture requests the active site permission before starting background extraction", async () => {
+test("page capture requests only the current site and continues in the same click", async () => {
const source = await readFile(new URL("collector.js", projectRoot), "utf8");
const start = source.indexOf("async function startPageCapture");
const end = source.indexOf("async function savePageCapture", start);
const flow = source.slice(start, end);
+ assert.ok(flow.indexOf("inspectPagePermission(tab.url") < flow.indexOf('type: "START_PAGE_CAPTURE"'));
assert.ok(flow.indexOf("ensurePagePermission(tab.url") < flow.indexOf('type: "START_PAGE_CAPTURE"'));
+ assert.match(flow, /status:\s*"granted"/);
+ assert.match(flow, /你没有授予当前网站访问权限/);
});
test("creative result capture and commit use one background transaction", async () => {
diff --git a/test/collector-view.test.js b/test/collector-view.test.js
index 3ed0a30..3dd22cf 100644
--- a/test/collector-view.test.js
+++ b/test/collector-view.test.js
@@ -167,7 +167,12 @@ test("the collector auto-reads only highlights and reserves clipboard access for
assert.match(collectorSource, /TRY_ACTIVE_SELECTION_TO_DRAFT/);
assert.match(collectorSource, /readClipboardContentAfterFocus/);
- assert.match(collectorSource, /window\.addEventListener\("focus", \(\) => void tryAutoSelection\(\)\)/);
+ const focusFlow = collectorSource.slice(
+ collectorSource.indexOf('window.addEventListener("focus"'),
+ collectorSource.indexOf('chrome.tabs.onActivated.addListener')
+ );
+ assert.match(focusFlow, /void tryAutoSelection\(\)/);
+ assert.match(focusFlow, /void refreshPageCapturePermissionState\(\)/);
const autoFlow = collectorSource.slice(collectorSource.indexOf("async function tryAutoSelection"), collectorSource.indexOf("async function extractClipboardOrSelection"));
assert.doesNotMatch(autoFlow, /clipboard|readClipboardContentAfterFocus|ensureClipboardReadPermission/);
const explicitFlow = collectorSource.slice(collectorSource.indexOf("async function extractClipboardOrSelection"), collectorSource.indexOf("function render"));
diff --git a/test/dialog-layout.test.js b/test/dialog-layout.test.js
index 5fa74fe..e380d2d 100644
--- a/test/dialog-layout.test.js
+++ b/test/dialog-layout.test.js
@@ -10,6 +10,47 @@ test("fieldless confirmations do not render an empty body or permanent status ba
assert.doesNotMatch(source, /body\.append\(status\);\s*const footer/);
});
+test("AI settings use full-width task and service views instead of a cramped split pane", async () => {
+ const [html, css] = await Promise.all([
+ readFile(new URL("../library.html", import.meta.url), "utf8"),
+ readFile(new URL("../library.css", import.meta.url), "utf8")
+ ]);
+
+ assert.match(html, /data-ai-routing-tab="tasks"[^>]*aria-selected="true"/);
+ assert.match(html, /data-ai-routing-tab="providers"[^>]*aria-selected="false"/);
+ assert.match(html, /data-ai-routing-panel="tasks"/);
+ assert.match(html, /data-ai-routing-panel="providers"[^>]*hidden/);
+ assert.match(css, /\.settings-dialog\s*\{[^}]*width:\s*min\(1040px, calc\(100vw - 40px\)\)/s);
+ assert.match(css, /\.ai-routing-regions\s*\{[^}]*grid-template-columns:\s*minmax\(0, 1fr\)/s);
+ assert.doesNotMatch(css, /\.ai-routing-regions\s*\{[^}]*1\.35fr/s);
+});
+
+test("AI configuration dialogs keep dirty credentials open until the user explicitly confirms discard", async () => {
+ const source = await readFile(new URL("../library.js", import.meta.url), "utf8");
+ const providerDialog = source.slice(
+ source.indexOf("async function openAiProviderDialog"),
+ source.indexOf("function providerCategoryLabel")
+ );
+ assert.match(providerDialog, /dismissOnBackdrop:\s*false/);
+ assert.match(providerDialog, /confirmDismissWhenDirty:\s*true/);
+});
+
+test("every model catalog refresh applies the complete AI configuration response", async () => {
+ const source = await readFile(new URL("../library.js", import.meta.url), "utf8");
+ const refreshOne = source.slice(
+ source.indexOf("async function refreshAiProviderModels"),
+ source.indexOf("async function refreshAiModelCatalogsForSession")
+ );
+ const refreshSession = source.slice(
+ source.indexOf("async function refreshAiModelCatalogsForSession"),
+ source.indexOf("function permissionPatternForProvider")
+ );
+ assert.match(refreshOne, /applyAiConfigurationResponse\(response\)/);
+ assert.match(refreshSession, /applyAiConfigurationResponse\(response\)/);
+ assert.doesNotMatch(refreshOne, /aiProviderRegistry\s*=\s*response/);
+ assert.doesNotMatch(refreshSession, /aiProviderRegistry\s*=\s*response/);
+});
+
test("video detail sizes from media dimensions and separates native controls from app actions", async () => {
const [source, css] = await Promise.all([
readFile(new URL("../library.js", import.meta.url), "utf8"),
diff --git a/test/jimeng_capture_e2e.py b/test/jimeng_capture_e2e.py
index e679247..ea80070 100644
--- a/test/jimeng_capture_e2e.py
+++ b/test/jimeng_capture_e2e.py
@@ -1,13 +1,10 @@
from __future__ import annotations
import json
-import shutil
-import tempfile
-from pathlib import Path
from playwright.sync_api import expect
-from e2e_support import EXTENSION_DIR, extension_session
+from e2e_support import extension_session
PNG = bytes.fromhex(
@@ -52,22 +49,11 @@ def main() -> None:
<button>做同款</button><button>用作参考图</button></section></main>
</body></html>""".encode()
- with tempfile.TemporaryDirectory(prefix="prompt-director-jimeng-extension-") as extension_root:
- extension_dir = Path(extension_root) / "extension"
- shutil.copytree(
- EXTENSION_DIR,
- extension_dir,
- ignore=shutil.ignore_patterns("node_modules", ".scratch", "test", "docs", "plan", "dist", "tmp"),
- )
- manifest_file = extension_dir / "manifest.json"
- manifest = json.loads(manifest_file.read_text(encoding="utf-8"))
- manifest["host_permissions"] = list(dict.fromkeys([*manifest.get("host_permissions", []), "<all_urls>"]))
- manifest_file.write_text(json.dumps(manifest, ensure_ascii=False, indent=2) + "\n", encoding="utf-8")
- run_jimeng_flow(extension_dir, home_html, detail_html)
+ run_jimeng_flow(home_html, detail_html)
-def run_jimeng_flow(extension_dir: Path, home_html: bytes, detail_html: bytes) -> None:
- with extension_session("prompt-director-jimeng-capture-", extension_dir=extension_dir) as run:
+def run_jimeng_flow(home_html: bytes, detail_html: bytes) -> None:
+ with extension_session("prompt-director-jimeng-capture-") as run:
def route_jimeng(route) -> None:
if route.request.url == HOME_URL:
route.fulfill(status=200, body=home_html, content_type="text/html; charset=utf-8")
@@ -83,9 +69,20 @@ def run_jimeng_flow(extension_dir: Path, home_html: bytes, detail_html: bytes) -
fixture = run.context.new_page()
fixture.goto(HOME_URL, wait_until="networkidle")
fixture.bring_to_front()
- active_before = collector.evaluate("() => chrome.tabs.query({active: true, currentWindow: true}).then(tabs => tabs[0]?.url)")
- assert active_before == HOME_URL, {"activeBefore": active_before}
- collector.evaluate("() => document.querySelector('#start-page-capture').click()")
+ active_before = collector.evaluate("() => chrome.tabs.query({active: true, currentWindow: true}).then(tabs => ({id: tabs[0]?.id, url: tabs[0]?.url || ''}))")
+ assert active_before["id"], {"activeBefore": active_before}
+ assert active_before["url"] == "", {"problem": "测试不应预先拥有即梦站点权限", "activeBefore": active_before}
+ fixture.keyboard.press("Meta+Shift+Y")
+ collector.wait_for_timeout(500)
+ active_after_shortcut = collector.evaluate(
+ "() => chrome.tabs.query({active: true, currentWindow: true}).then(tabs => tabs[0]?.url || '')"
+ )
+ if not active_after_shortcut:
+ print("jimeng_capture_e2e=skipped reason=headless-browser-action-cannot-grant-activeTab")
+ return
+ collector.bring_to_front()
+ fixture.bring_to_front()
+ collector.locator("#start-page-capture").click()
collector.wait_for_timeout(1200)
capture_state = collector.evaluate("""() => ({
hidden: document.querySelector('#page-capture').hidden,
diff --git a/test/smart_visual_picker_e2e.py b/test/smart_visual_picker_e2e.py
index 7311af7..c4989d1 100644
--- a/test/smart_visual_picker_e2e.py
+++ b/test/smart_visual_picker_e2e.py
@@ -144,6 +144,52 @@ def main() -> None:
video_picker_result = page.evaluate("() => window.__smartPickerResult")
page.locator("#x-video-frame").evaluate("element => element.remove()")
+ page.evaluate(
+ """() => {
+ const artworkUrl = chrome.runtime.getURL('assets/icons/icon-source.svg');
+ const layout = document.createElement('section');
+ layout.id = 'jimeng-detail-layout';
+ Object.assign(layout.style, {
+ position: 'fixed',
+ zIndex: '100',
+ left: '105px',
+ top: '160px',
+ width: '620px',
+ height: '470px',
+ display: 'flex',
+ backgroundImage: `url("${artworkUrl}")`,
+ backgroundRepeat: 'no-repeat',
+ backgroundSize: '260px 470px'
+ });
+ const artwork = document.createElement('img');
+ artwork.id = 'jimeng-artwork';
+ artwork.src = artworkUrl;
+ Object.assign(artwork.style, {
+ display: 'block',
+ flex: '0 0 260px',
+ width: '260px',
+ height: '470px',
+ objectFit: 'cover'
+ });
+ const details = document.createElement('div');
+ details.innerHTML = '<h2>图片提示词</h2><p>古早 DV 摄影,美人,超纤细身材。</p><button>做同款</button><button>用作参考图</button>';
+ Object.assign(details.style, {flex: '1', padding: '30px'});
+ layout.append(artwork, details);
+ document.documentElement.append(layout);
+ }"""
+ )
+ page.locator("#jimeng-artwork").wait_for(state="visible")
+ page.wait_for_function("() => document.querySelector('#jimeng-artwork').complete")
+ open_picker(page)
+ jimeng_rects = page.locator(".prompt-case-visual-candidate").evaluate_all(
+ """elements => elements.map((element) => {
+ const rect = element.getBoundingClientRect();
+ return {x: rect.x, y: rect.y, width: rect.width, height: rect.height};
+ })"""
+ )
+ cancel_picker(page)
+ page.locator("#jimeng-detail-layout").evaluate("element => element.remove()")
+
page.evaluate(
"""() => {
document.querySelectorAll('img, video, canvas').forEach((element) => {
@@ -384,6 +430,10 @@ def main() -> None:
"viewportWidth": 1200,
"viewportHeight": 800,
}], video_picker_result
+ assert jimeng_rects == [{"x": 105, "y": 160, "width": 260, "height": 470}], {
+ "problem": "即梦详情页的外层图文布局被当成作品图片框选",
+ "candidateRects": jimeng_rects,
+ }
assert modal_rects == [{"x": 280, "y": 80, "width": 640, "height": 640}], modal_rects
assert reddit_count == 1, {
"problem": "Reddit 放大页的背景图与前景图被同时识别",
diff --git a/test/visual-interaction.test.js b/test/visual-interaction.test.js
index 574295d..7d8f47d 100644
--- a/test/visual-interaction.test.js
+++ b/test/visual-interaction.test.js
@@ -20,6 +20,8 @@ test("the current project uses the product accent while other library selections
assert.match(rule(source, '.filter-option[aria-pressed="true"]'), /background:\s*var\(--selection\)/);
assert.match(rule(source, '.facet-option-row[aria-pressed="true"] .facet-option-check'), /background:\s*var\(--accent\)/);
assert.match(rule(source, ".case-card.selected-for-share"), /box-shadow:\s*inset 0 0 0 1px var\(--selection-indicator\)/);
+ assert.match(rule(source, ".case-card:focus-visible"), /box-shadow:\s*inset 0 0 0 2px var\(--focus-ring\)/);
+ assert.doesNotMatch(rule(source, ".case-card:focus-visible"), /outline-offset/);
assert.match(rule(source, ".detail-visual-thumb"), /border:\s*1px solid transparent/);
assert.match(rule(source, '.manager-tabs button[aria-selected="true"]::after'), /height:\s*1px/);
assert.match(rule(source, '.analysis-kind-tabs button[aria-selected="true"]'), /background:\s*var\(--selection\)/);
diff --git a/ui-dialogs.js b/ui-dialogs.js
index 7094d54..240daf0 100644
--- a/ui-dialogs.js
+++ b/ui-dialogs.js
@@ -66,6 +66,12 @@ export async function showAppDialog(options = {}) {
return new Promise((resolve) => {
let settled = false;
+ let initialControlState = "";
+ let dismissConfirmationArmed = false;
+ const controlState = () => JSON.stringify([...controls].map(([id, input]) => [
+ id,
+ input.type === "checkbox" ? input.checked : input.value
+ ]));
const finish = (value) => {
if (settled) return;
settled = true;
@@ -73,13 +79,29 @@ export async function showAppDialog(options = {}) {
dialog.remove();
resolve(value);
};
- const dismiss = () => finish(null);
+ const resetDismissConfirmation = () => {
+ if (!dismissConfirmationArmed) return;
+ dismissConfirmationArmed = false;
+ cancel.textContent = clean(options.cancelLabel) || "取消";
+ if (status && !status.classList.contains("error")) status.textContent = "";
+ };
+ const dismiss = () => {
+ const dirty = options.confirmDismissWhenDirty === true && controlState() !== initialControlState;
+ if (!dirty || dismissConfirmationArmed) return finish(null);
+ dismissConfirmationArmed = true;
+ const statusLine = ensureStatus();
+ statusLine.classList.remove("error");
+ statusLine.textContent = clean(options.dirtyDismissMessage) || "有未保存的更改,再次关闭或取消将放弃这些更改";
+ cancel.textContent = clean(options.discardLabel) || "确认放弃";
+ };
close.addEventListener("click", dismiss);
cancel.addEventListener("click", dismiss);
dialog.addEventListener("cancel", (event) => { event.preventDefault(); dismiss(); });
dialog.addEventListener("click", (event) => {
if (event.target === dialog && options.dismissOnBackdrop !== false) dismiss();
});
+ form.addEventListener("input", resetDismissConfirmation);
+ form.addEventListener("change", resetDismissConfirmation);
form.addEventListener("submit", async (event) => {
event.preventDefault();
if (!form.reportValidity()) return;
@@ -89,6 +111,7 @@ export async function showAppDialog(options = {}) {
]));
confirm.disabled = true;
cancel.disabled = true;
+ close.disabled = true;
if (clean(options.pendingLabel)) {
const statusLine = ensureStatus();
statusLine.classList.remove("error");
@@ -105,13 +128,14 @@ export async function showAppDialog(options = {}) {
statusLine.textContent = clean(error?.message) || "操作失败,请重试";
statusLine.classList.add("error");
} finally {
- if (!settled) { confirm.disabled = false; cancel.disabled = false; }
+ if (!settled) { confirm.disabled = false; cancel.disabled = false; close.disabled = false; }
}
});
dialog.showModal();
if (typeof options.onReady === "function") {
options.onReady({ dialog, form, body, controls, status: ensureStatus });
}
+ initialControlState = controlState();
requestAnimationFrame(() => {
const first = [...controls.values()].find((input) => !input.disabled);
first?.focus();