diff --git a/frontend/src/canvas/Inspector.tsx b/frontend/src/canvas/Inspector.tsx index 0aeaede1..87708f18 100644 --- a/frontend/src/canvas/Inspector.tsx +++ b/frontend/src/canvas/Inspector.tsx @@ -12,8 +12,9 @@ import { datasourceTools, modelOptions, providerOfModel, useCatalog, useDatasour import { api } from '../api/client' import { IconButton, JsonInput, Modal, isComposing, useRadioGroup } from '../components/ui' import { formatShortcut } from '../lib/keys' -import { JUDGE_FIELD_LABEL, JUDGE_ON_UNSUPPORTED_HINT, JUDGE_ON_UNSUPPORTED_LABEL, JUDGE_SETTING_TEXT, MERGE_TEXT, NODE_TYPE_LABEL, SUBGRAPH_UPGRADE_HELP, judgeByModelText, upgradeNewerText } from '../lib/terms' +import { JUDGE_FIELD_LABEL, JUDGE_ON_UNSUPPORTED_HINT, JUDGE_ON_UNSUPPORTED_LABEL, JUDGE_SETTING_TEXT, MERGE_TEXT, CATALOG_UI_TEXT, NODE_TYPE_LABEL, SUBGRAPH_UPGRADE_HELP, judgeByModelText, upgradeNewerText } from '../lib/terms' import { TemplateText } from './TemplateText' +import { MERGE_ALIAS, isQueryNode, mergeAlias } from './mergeInputs' import type { NodeType, ValidationIssue, WorkflowVersion } from '../types' /** 检查器里一条落到字段上的问题 */ @@ -158,20 +159,13 @@ function mergeRowsOf(value: any): MergeRow[] { return Object.entries(value).map(([alias, node]) => ({ alias, node: typeof node === 'string' ? node : '' })) } -/** 和后端 engine/merge_query.alias_problem 的写法规则一致;关键字、sqlite_ 前缀这类由后端校验报出来 */ -const MERGE_ALIAS = /^[A-Za-z_][A-Za-z0-9_]{0,31}$/ - -/** 新加一行时的别名:从节点 id 取(q_sales → q_sales),不合法的退成 t1、t2…,和已有的不重名 */ -function freshAlias(nodeId: string, taken: Set): string { - const base = nodeId.toLowerCase().replace(/[^a-z0-9_]/g, '_').replace(/^(?=[0-9])/, 't') - const head = MERGE_ALIAS.test(base) ? base : 't' - if (head !== 't' && !taken.has(head)) return head - for (let n = 1; ; n += 1) if (!taken.has(`${head}${n}`)) return `${head}${n}` -} /** * 合并查询的输入:每一行一个别名(合并 SQL 里的表名)加一个上游查询节点。 * + * 查询节点连到合并查询时就自动加成一行(store 的 onConnect,别名按查询的主表起);连线时还没选工具、后来才选上的, + * 这里给一个「带出连着的 N 个查询节点」一次补齐。手动「添加输入」的别名也按主表起,不用节点 id。 + * * 只列上游的查询节点:选了数据库查询工具的「调用工具」节点和别的合并查询。Agent 查过的库、模型写的文字都不能合并 * (后端校验会报错),这里干脆不给选。已经选了、后来被删掉或挪到下游的节点照样显示成一行并说明,好让人看见并改掉。 * @@ -196,11 +190,7 @@ function MergeInputList({ nodeId, value, issues, onChange }: { stack.push(...(parents.get(id) ?? [])) } return nodes - .filter((n) => { - if (!seen.has(n.id)) return false - const tool = String((n.data?.config as Record | undefined)?.tool ?? '') - return n.data?.nodeType === 'merge' || (n.data?.nodeType === 'tool' && tool.startsWith('db_query__')) - }) + .filter((n) => seen.has(n.id) && isQueryNode(n)) .map((n) => { const label = String(n.data?.label || n.id) const tool = String((n.data?.config as Record | undefined)?.tool ?? '') @@ -231,11 +221,27 @@ function MergeInputList({ nodeId, value, issues, onChange }: { wrote.current = JSON.stringify(mergeRowsOf(obj)) onChange(obj) } + const nodeOf = (id: string) => nodes.find((n) => n.id === id) const add = () => { const used = new Set(rows.map((r) => r.node)) const pick = options.find((o) => !used.has(o.value)) ?? options[0] if (!pick) return - commit([...rows, { alias: freshAlias(pick.value, new Set(rows.map((r) => keyOf(r.alias)))), node: pick.value }]) + commit([...rows, { alias: mergeAlias(nodeOf(pick.value), new Set(rows.map((r) => keyOf(r.alias)))), node: pick.value }]) + } + // 直接连着、还不是输入的查询节点(连线时还没选工具的):一次带出来 + const connected = useMemo(() => { + const used = new Set(rows.map((r) => r.node)) + const direct = new Set(edges.filter((e) => e.target === nodeId).map((e) => e.source)) + return options.filter((o) => direct.has(o.value) && !used.has(o.value)).map((o) => o.value) + }, [edges, nodeId, options, rows]) + const addConnected = () => { + const taken = new Set(rows.map((r) => keyOf(r.alias))) + const added = connected.map((id) => { + const alias = mergeAlias(nodeOf(id), taken) + taken.add(alias) + return { alias, node: id } + }) + commit([...rows, ...added]) } return ( @@ -276,6 +282,11 @@ function MergeInputList({ nodeId, value, issues, onChange }: { ) })} + {connected.length > 0 && ( + + )} diff --git a/frontend/src/canvas/mergeInputs.ts b/frontend/src/canvas/mergeInputs.ts new file mode 100644 index 00000000..5f4d2055 --- /dev/null +++ b/frontend/src/canvas/mergeInputs.ts @@ -0,0 +1,103 @@ +// =========================================================================== +// 合并查询节点的输入:哪些节点能当输入、新加一个输入时别名怎么起、连线时自动带出。 +// +// 别名就是合并 SQL 里的表名,所以要起得有意义:先按这个查询的主表(FROM 后的第一张表,visits、orders),再按节点 +// 标题里的英文,都没有就用 q1、q2……;不用节点 id(tool_1fpq0 这种写进 SQL 里谁也认不出)。规则和后端 +// engine/merge_query.alias_problem 一致:英文字母、数字、下划线,不以数字开头,最多 32 个字符,不用 SQL 关键字, +// 不以 sqlite_ 开头;和已有的重名(不区分大小写)时加序号。 +// =========================================================================== + +/** 合法的别名(后端 merge_query._ALIAS)。关键字、sqlite_ 前缀另查 */ +export const MERGE_ALIAS = /^[A-Za-z_][A-Za-z0-9_]{0,31}$/ + +/** SQLite 的关键字(后端 merge_query._SQLITE_KEYWORDS):用作表名要加引号,别名不起这些 */ +const KEYWORDS = new Set(` +abort action add after all alter always analyze and as asc attach autoincrement before begin between by cascade case +cast check collate column commit conflict constraint create cross current current_date current_time current_timestamp +database default deferrable deferred delete desc detach distinct do drop each else end escape except exclude exclusive +exists explain fail filter first following for foreign from full generated glob group groups having if ignore immediate +in index indexed initially inner insert instead intersect into is isnull join key last left like limit match +materialized natural no not nothing notnull null nulls of offset on or order others outer over partition plan pragma +preceding primary query raise range recursive references regexp reindex release rename replace restrict returning +right rollback row rows savepoint select set table temp temporary then ties to transaction trigger unbounded union +unique update using vacuum values view virtual when where window with without true false`.split(/\s+/).filter(Boolean)) + +interface QueryNodeLike { + id: string + data?: { nodeType?: string; label?: string; config?: Record } +} + +/** 能当合并输入的节点:选了数据库查询工具的「调用工具」节点,或者另一个合并查询 */ +export function isQueryNode(n: QueryNodeLike | undefined): boolean { + if (!n) return false + const tool = String(n.data?.config?.tool ?? '') + return n.data?.nodeType === 'merge' || (n.data?.nodeType === 'tool' && tool.startsWith('db_query__')) +} + +/** 写成合法标识符:小写,别的字符换成下划线,去掉头尾和连续的下划线,数字开头补 t,截到 32 个字符。没有英文字母时为空 */ +function identOf(text: string): string { + const s = text.toLowerCase().replace(/[^a-z0-9_]+/g, '_').replace(/_+/g, '_').replace(/^_+|_+$/g, '') + if (!/[a-z]/.test(s)) return '' + return (/^[0-9]/.test(s) ? `t${s}` : s).slice(0, 32).replace(/_+$/, '') +} + +/** SQL 里的主表:FROM 后的第一张表(去掉库名、引号)。子查询、取不到时为空 */ +export function mainTableOf(sql: unknown): string { + if (typeof sql !== 'string') return '' + const text = sql.replace(/--[^\n]*/g, ' ').replace(/\/\*[\s\S]*?\*\//g, ' ') + const m = text.match(/\bfrom\s+((?:[`"[]?[\w$㐀-鿿]+[`"\]]?\s*\.\s*)*)[`"[]?([\w$㐀-鿿]+)[`"\]]?/i) + return m ? m[2] : '' +} + +/** 这个节点的别名底稿:主表 → 标题里的英文 → 空 */ +function aliasBase(n: QueryNodeLike | undefined): string { + if (!n) return '' + const fromSql = n.data?.nodeType === 'tool' ? identOf(mainTableOf(n.data?.config?.args?.sql)) : '' + return fromSql || identOf(String(n.data?.label ?? '')) +} + +/** + * 新输入的别名:有意义的短名,合法、不是关键字、不和 taken(已用的别名,小写)重名。重名时加序号(visits_2); + * 什么都取不到时用 q1、q2…… + */ +export function mergeAlias(n: QueryNodeLike | undefined, taken: Set): string { + let base = aliasBase(n) + if (base && (KEYWORDS.has(base) || base.startsWith('sqlite_'))) base = `${base.replace(/^sqlite_/, '')}_q`.replace(/^_/, '') + if (!base || !MERGE_ALIAS.test(base)) { + for (let k = 1; ; k += 1) if (!taken.has(`q${k}`)) return `q${k}` + } + if (!taken.has(base)) return base + for (let k = 2; ; k += 1) { + const tail = `_${k}` + const name = `${base.slice(0, 32 - tail.length)}${tail}` + if (!taken.has(name)) return name + } +} + +/** config.inputs({别名: 节点 id})里已经有哪些别名(小写)、哪些节点 */ +export function inputsOf(config: Record | undefined): { aliases: Set; nodes: Set; value: Record } { + const raw = config?.inputs + const value: Record = raw && typeof raw === 'object' && !Array.isArray(raw) ? raw : {} + return { + value, + aliases: new Set(Object.keys(value).map((a) => a.toLowerCase())), + nodes: new Set(Object.values(value).filter((v): v is string => typeof v === 'string')), + } +} + +/** + * 连线时自动带出输入:从查询节点连到合并查询,且还不是它的输入,就加一行(别名按 mergeAlias 起)。用户照样可以 + * 改别名、删掉这一行。不是这种连线返回 null。和连线算同一步:撤销时一起退回 + */ +export function connectMergeInput(nodes: T[], source: string | null, target: string | null): T[] | null { + if (!source || !target || source === target) return null + const to = nodes.find((n) => n.id === target) + const from = nodes.find((n) => n.id === source) + if (to?.data?.nodeType !== 'merge' || !isQueryNode(from)) return null + const { aliases, nodes: used, value } = inputsOf(to.data?.config) + if (used.has(source)) return null + const alias = mergeAlias(from, aliases) + return nodes.map((n) => (n.id === target + ? { ...n, data: { ...n.data, config: { ...(n.data?.config ?? {}), inputs: { ...value, [alias]: source } } } } + : n)) +} diff --git a/frontend/src/lib/terms.ts b/frontend/src/lib/terms.ts index 36434933..831dd0b8 100644 --- a/frontend/src/lib/terms.ts +++ b/frontend/src/lib/terms.ts @@ -2503,8 +2503,8 @@ export const CODES_TEXT = { } // =========================================================================== -// 数据目录界面的补充文案(2026-10 完整性走查 R2 之后补的:清单的「只看运行中查询过的表」、剖析报告的逐条结论、 -// 码值含义待填写时的确认、保存后的影响面提示……)。新增的都放在这里,上面几组的已有写法不动。 +// 数据目录及相关界面的补充文案(2026-10 完整性走查 R2 之后补的:清单的「只看运行中查询过的表」、剖析报告的逐条结论、 +// 码值含义待填写时的确认、保存后的影响面提示、合并查询带出输入……)。新增的都放在这里,上面几组的已有写法不动。 // =========================================================================== export const CATALOG_UI_TEXT = { @@ -2531,6 +2531,8 @@ export const CATALOG_UI_TEXT = { savedImpactDismiss: '收起这条提示', // ---- 助手「建议更新数据目录」卡片:服务端对一项的说明(新增的关联关系推算不出基数) patchNote: '说明', + // ---- 合并查询的输入:连线时还没选工具、后来才选上的查询节点,一次带出来 + mergeAddConnected: (n: number) => `带出连着的 ${formatNumber(n)} 个查询节点`, } // =========================================================================== diff --git a/frontend/src/store/studio.ts b/frontend/src/store/studio.ts index 01fdbe3b..60ea84e0 100644 --- a/frontend/src/store/studio.ts +++ b/frontend/src/store/studio.ts @@ -5,6 +5,7 @@ import { } from '@xyflow/react' import { api, streamCopilot, streamRun } from '../api/client' import { copilotReceipt, mergeNodeConfig, toolChangesOf } from '../canvas/copilotMerge' +import { connectMergeInput } from '../canvas/mergeInputs' import { contentSig, isMissingEndpoint, normalizeUpgrade } from '../canvas/issues' import { NODE_DEFS, sourceHandles } from '../canvas/nodeDefs' import { toast } from '../components/ui' @@ -1408,8 +1409,11 @@ export const useStudio = create((set, get) => ({ onConnect: (conn) => { if (locked(get)) return commit(set, get, '连线') + // 查询节点连到合并查询:顺手把它加成合并的输入(别名取有意义的短名),和连线同一步撤销 + const nodes = connectMergeInput(get().nodes, conn.source, conn.target) set({ edges: addEdge({ ...conn, type: 'flow' }, get().edges), + ...(nodes ? { nodes } : {}), dirty: true, }) void get().validate() diff --git a/scripts/check-studio.mjs b/scripts/check-studio.mjs index 78fdeb15..ec295233 100644 --- a/scripts/check-studio.mjs +++ b/scripts/check-studio.mjs @@ -2539,12 +2539,60 @@ await section('合并查询:节点库认得、卡片摘要、检查器从上 await box.getByRole('button', { name: '添加输入' }).click() await page.waitForTimeout(150) const added = JSON.parse(await config()) - check('添加输入:取一个上游查询节点,别名从节点 id 起、不重名', Object.keys(added).length === 3 - && Object.keys(added)[2] === 'q_sales', JSON.stringify(added)) - await box.getByRole('button', { name: '删除输入 q_sales' }).click() + check('添加输入:取一个上游查询节点,别名按查询的主表起(orders),不用节点 id', Object.keys(added).length === 3 + && Object.keys(added)[2] === 'orders' && added.orders === 'q_sales', JSON.stringify(added)) + await box.getByRole('button', { name: '删除输入 orders' }).click() await page.waitForTimeout(150) check('删除输入:那一行和配置里的那一项一起去掉', await config() === JSON.stringify({ s: 'q_sales', v: 'q_visits' }), await config()) + // 连好上游就自动带出输入:查询节点连到合并查询时加一行,别名按主表起、重名加序号;不是查询节点的不加;和连线同一步撤销 + const mid = await S(page, () => { + window.__studio.getState().addNode('merge', { x: 640, y: 620 }) + return window.__studio.getState().selectedId + }) + const connect = (source, target) => S(page, ([a, b]) => window.__studio.getState().onConnect({ source: a, target: b, sourceHandle: 'out', targetHandle: null }), [source, target]) + const inputsOf = (id) => S(page, (x) => JSON.stringify(window.__studio.getState().nodes.find((n) => n.id === x)?.data.config.inputs ?? {}), id) + await connect('q_sales', mid) + await connect('q_visits', mid) + await connect('think', mid) + check('连线即带出输入:两个查询节点各一行,别名按主表起(orders、visits);模型调用不加', await inputsOf(mid) === JSON.stringify({ orders: 'q_sales', visits: 'q_visits' }), + await inputsOf(mid)) + await S(page, () => window.__studio.getState().undo()) + await S(page, () => window.__studio.getState().undo()) + check('……撤销连线时这一行一起退回', await inputsOf(mid) === JSON.stringify({ orders: 'q_sales' }) + && !(await S(page, (x) => window.__studio.getState().edges.some((e) => e.source === 'q_visits' && e.target === x), mid)), await inputsOf(mid)) + const t1 = await S(page, () => { + const st = window.__studio.getState() + st.addNode('tool', { x: 300, y: 620 }) + const id = window.__studio.getState().selectedId + window.__studio.getState().updateNode(id, { config: { tool: 'db_query__shop', args: { sql: 'SELECT COUNT(*) AS n FROM shop.orders WHERE status = 1' } } }) + return id + }) + await connect(t1, mid) + check('……主表重名时加序号(orders_2)', await inputsOf(mid) === JSON.stringify({ orders: 'q_sales', orders_2: t1 }), await inputsOf(mid)) + // 连线时还没选工具:不加;选上工具后检查器给「带出连着的 1 个查询节点」,一次补齐 + const t2 = await S(page, () => { + window.__studio.getState().addNode('tool', { x: 300, y: 780 }) + return window.__studio.getState().selectedId + }) + await connect(t2, mid) + check('……连线时还没选数据库查询工具:先不加', await inputsOf(mid) === JSON.stringify({ orders: 'q_sales', orders_2: t1 })) + await S(page, (id) => window.__studio.getState().updateNode(id, { config: { tool: 'db_query__members', args: { sql: '-- 会员卡\nSELECT COUNT(*) AS n FROM "member_cards"' } } }), t2) + await S(page, (id) => window.__studio.getState().select(id), mid) + const bring = page.locator('[data-inspector-sheet] [data-merge-add-connected]') + await bring.waitFor({ timeout: 3000 }).catch(() => {}) + check('……选上工具后,检查器给「带出连着的 1 个查询节点」', (await bring.innerText().catch(() => '')).includes('带出连着的 1 个查询节点')) + await bring.click() + await page.waitForTimeout(150) + check('……一次补齐,别名按主表起(去掉注释和引号)', await inputsOf(mid) === JSON.stringify({ orders: 'q_sales', orders_2: t1, member_cards: t2 }) + && await bring.count() === 0, await inputsOf(mid)) + const midBox = page.locator('[data-inspector-sheet] [data-field="inputs"]') + await midBox.locator('input.mono').nth(1).fill('sales_valid') + await page.waitForTimeout(150) + check('……自动起的别名照样可以改', await inputsOf(mid) === JSON.stringify({ orders: 'q_sales', sales_valid: t1, member_cards: t2 }), await inputsOf(mid)) + await S(page, () => window.__studio.getState().select('merge')) + await page.waitForSelector('[data-inspector-sheet] [data-field="inputs"]', { timeout: 4000 }).catch(() => {}) + await S(page, () => window.__studio.getState().select(null)) await page.waitForTimeout(200) const r = await page.evaluate(async () => {