diff --git a/frontend/src/api/client.ts b/frontend/src/api/client.ts index eb0f3abf..6827f719 100644 --- a/frontend/src/api/client.ts +++ b/frontend/src/api/client.ts @@ -1,6 +1,8 @@ import type { - ActivateSnapshotBody, ActivateSnapshotOut, AiPreview, CatalogDetail, CatalogDraftJob, CatalogImpact, CatalogList, CatalogNotes, - CatalogPatchPreview, CatalogPatchSubmit, CatalogProfileOut, CatalogReviewAction, CommitOut, CurrentRecipe, EditPreview, + ActivateSnapshotBody, ActivateSnapshotOut, AiPreview, CatalogAssistantEvent, CatalogAssistantRequest, CatalogDetail, CatalogDraftJob, + CatalogImpact, CatalogImportReport, CatalogList, CatalogNotes, CatalogPatchPreview, CatalogPatchSubmit, CatalogProfileOut, + CatalogReviewAction, CatalogReviewBatchItem, CatalogReviewBatchResult, CatalogReviewKind, CatalogReviewProgress, CatalogReviewQueue, + CatalogTableUsage, CommitOut, CurrentRecipe, EditPreview, EditRequest, ImportRecord, ManifestOut, PurgeRawBody, PurgeRawOut, QuestionAnswer, Recipe, RedraftRulesOut, RemovePeriodBody, RemovePeriodOut, RevokeAcceptanceBody, RevokeAcceptanceOut, SnapshotOut, Staging, @@ -15,7 +17,7 @@ import { ApiError, BASE, NETWORK_MESSAGE, actorHeader, codeOf, del, describeDetail, failure, get, isGatewayFailure, parseBody, patch, post, put, qs, report, request, upload, type RequestOptions, type UploadOptions, } from './http' -import { bundle } from './bundle' +import { bundle, dispositionName } from './bundle' import { compare } from './compare' import { inquiry } from './inquiry' import { schedules } from './schedules' @@ -451,6 +453,51 @@ export const api = { profile: (sourceId: string, body: { tables?: string[] }, opts?: RequestOptions) => request(`/datasources/${encodeURIComponent(sourceId)}/catalog/profile`, { method: 'POST', body: JSON.stringify(body), ...opts }), + // ---- 审阅队列（只列推断项，按表的使用次数、这一项对数字的影响和来源排好） + /** 一页待确认项。kind：全部 / 影响数字的项 / 名称和含义；table 只看这一张表 */ + reviewQueue: (sourceId: string, params: { limit?: number; offset?: number; kind?: CatalogReviewKind; table?: string | null }, + opts?: RequestOptions) => + get(`${catalogBase(sourceId)}/review-queue${qs({ limit: 50, offset: 0, kind: 'all', ...params })}`, opts), + /** + * 成批确认、驳回、撤销审阅（最多 200 条）：逐表按 if_version 乐观锁，一张表冲突不影响别的表，同一张表的几条一次写入。 + * 逐条回结果：成功的带这张表写入后的版本，冲突、不合法的带原因和机读码 + */ + reviewBatch: (sourceId: string, items: CatalogReviewBatchItem[]) => + post<{ results: CatalogReviewBatchResult[] }>(`${catalogBase(sourceId)}/review/batch`, { items }), + /** 审阅进度：使用次数前 top_n 张表、全部表、影响数字的项 */ + reviewProgress: (sourceId: string, opts?: RequestOptions) => + get(`${catalogBase(sourceId)}/review-progress`, opts), + /** 用过这张表的运行，新的在前 */ + usage: (sourceId: string, table: string, limit = 20, opts?: RequestOptions) => + get(`${catalogBase(sourceId)}/${encodeURIComponent(table)}/usage${qs({ limit })}`, opts), + // ---- 导出导入 + /** + * 导出这个数据源的数据目录（GET /catalog/export，附件）：回来的是文件本身和服务端给的文件名，没给就是 null，由调用方 + * 按数据源名补。原样存下，不解析：导入时交回的就是这份 + */ + exportFile: async (sourceId: string): Promise<{ blob: Blob; name: string | null }> => { + const path = `${catalogBase(sourceId)}/export` + let res: Response + try { + res = await fetch(BASE + path, { headers: actorHeader() }) + } catch (e: any) { + const err = new ApiError(0, NETWORK_MESSAGE, { kind: 'network', raw: `${e?.name ?? 'Error'}: ${e?.message ?? e}` }) + report(false, err) + throw err + } + if (!res.ok) throw failure(res.status, res.statusText, await res.text().catch(() => ''), path) + report(true) + return { blob: await res.blob(), name: dispositionName(res.headers.get('Content-Disposition')) } + }, + /** 导入的预览（只读）：哪些表对上了，各有几项新增、更新、保留、冲突、跳过，冲突逐条列出 */ + importPreview: (sourceId: string, body: { content: unknown; include_guidance: boolean }) => + post(`${catalogBase(sourceId)}/import/preview`, body), + /** + * 导入：规则同预览，逐表乐观锁，一张表失败不影响别的。有排队、进行中的起草任务时 409（catalog_draft_busy）； + * 文件格式不对 422（detail 是一句中文） + */ + importCatalog: (sourceId: string, body: { content: unknown; include_guidance: boolean }) => + post(`${catalogBase(sourceId)}/import`, body), }, runs: { @@ -867,6 +914,83 @@ export function streamCopilot( return () => controller.abort() } +/** 表助手一轮结束时的情况：error 是给人看的那句话（开流前被拒时带状态码和机读码）；aborted 是点了停止 */ +export interface CatalogAssistantEnd { + error?: string + status?: number + code?: string + aborted?: boolean +} + +/** + * 表助手的一轮（POST /datasources/{id}/catalog/{table}/assistant）：回答是事件流，每个事件一行 data: ，到一个回调 + * 一个（text 增量、query 只读查询、proposal 修改提案、done、error）。返回取消函数，就是「停止回答」。 + * + * 开流之前就被拒（表不在 404、起草模型用不了 409 catalog_draft_model_unavailable、请求太长 422）时 onEnd 带服务端那句话、 + * 状态码和机读码；流到一半断了和一开始就连不上一样，说无法连接服务。认不出的行（心跳、半截）跳过 + */ +export function streamCatalogAssistant( + sourceId: string, + table: string, + body: CatalogAssistantRequest, + onEvent: (event: CatalogAssistantEvent) => void, + onEnd: (end: CatalogAssistantEnd) => void, +): () => void { + const controller = new AbortController() + const path = `${catalogBase(sourceId)}/${encodeURIComponent(table)}/assistant` + const emit = (line: string) => { + const text = line.replace(/\r$/, '') + if (!text.startsWith('data:')) return + const payload = text.slice(5).trim() + if (!payload) return + try { + const event = parseBody(payload) + if (event && typeof event === 'object' && typeof event.type === 'string') onEvent(event as CatalogAssistantEvent) + } catch { /* 认不出的一行，跳过 */ } + } + void (async () => { + try { + const res = await fetch(BASE + path, { + method: 'POST', + headers: { 'Content-Type': 'application/json', Accept: 'text/event-stream', ...actorHeader() }, + body: JSON.stringify(body), + signal: controller.signal, + }) + if (!res.ok || !res.body) { + const err = failure(res.status, res.statusText, await res.text().catch(() => ''), path) + onEnd(err.kind === 'network' ? { error: NETWORK_MESSAGE } : { error: err.message, status: res.status, code: err.code }) + return + } + report(true) + const reader = res.body.getReader() + const decoder = new TextDecoder() + let buffer = '' + for (;;) { + const { done, value } = await reader.read() + if (done) break + buffer += decoder.decode(value, { stream: true }) + let idx: number + while ((idx = buffer.indexOf('\n')) >= 0) { + emit(buffer.slice(0, idx)) + buffer = buffer.slice(idx + 1) + } + } + buffer += decoder.decode() + if (buffer) emit(buffer) + onEnd({}) + } catch (e: any) { + if (e?.name === 'AbortError') { onEnd({ aborted: true }); return } + if (e instanceof TypeError) { + report(false, new ApiError(0, NETWORK_MESSAGE, { kind: 'network', raw: String(e) })) + onEnd({ error: NETWORK_MESSAGE }) + return + } + onEnd({ error: e?.message ?? NETWORK_MESSAGE }) + } + })() + return () => controller.abort() +} + /** * 订阅一次运行的事件流。 * diff --git a/frontend/src/lib/terms.ts b/frontend/src/lib/terms.ts index 663b6329..0071a7c9 100644 --- a/frontend/src/lib/terms.ts +++ b/frontend/src/lib/terms.ts @@ -2445,14 +2445,24 @@ export const CATALOG_DRAFT_TEXT = { queued: '排队中，等待开始…', running: '正在起草…', // 服务端点了停止就取消进行中的模型调用（不等它答完，一次调用可能要几分钟），只等手上正在写入目录的那张表写完 - stopping: '正在停止：取消进行中的模型调用，正在写入目录的表写完后停止…', + // 宽表每写完一段就写进目录：停下来时已写进的段保留，只停掉进行中的调用 + stopping: '正在停止：取消进行中的模型调用，已写进目录的段保留…', progress: (done: number, total: number) => `已完成 ${formatNumber(done)} / ${formatNumber(total)} 张表`, /** 结束以后：全部写出来的表有几张（停止、失败、部分完成的不算） */ progressDone: (ok: number, total: number) => `写完 ${formatNumber(ok)} / ${formatNumber(total)} 张表`, parts: (done: number, total: number) => `${formatNumber(done)} / ${formatNumber(total)} 段`, - partsHint: '超过 40 列的表拆成表级一段和若干列分段，逐段起草', + partsHint: '超过 40 列的表拆成表级一段和若干列分段，逐段起草，每写完一段就写进目录', + /** 段被缩小、拆半后实际分成的块（比段多时才写） */ + chunks: (done: number, total: number) => `${formatNumber(done)} / ${formatNumber(total)} 块`, + chunksHint: (total: number) => `模型用完额度或超时后，段被缩小、拆半：这张表实际分成 ${formatNumber(total)} 块起草`, + /** 已经写进目录的段（停止、服务重启时保留） */ + partsWritten: (n: number) => `已写进目录 ${formatNumber(n)} 段`, + partsWrittenHint: '每写完一段就写进目录，停止或服务重启时已写进的段保留', + /** 停下来的宽表：服务端的原因里没写时，界面补这一句 */ + partsWrittenStopped: (n: number, rest: number) => (rest > 0 + ? `已写进目录 ${formatNumber(n)} 段，剩下 ${formatNumber(rest)} 段没起草` : `已写进目录 ${formatNumber(n)} 段`), hide: '在后台继续', - hideHint: '关闭对话框不会停止起草，进度显示在目录页上方；每张表起草完就写进目录', + hideHint: '关闭对话框不会停止起草，进度显示在目录页上方；每写完一段就写进目录', stop: '停止', busy: '这个数据源已有进行中的起草任务，下面显示的是它的进度', modelUsed: (model: string) => `模型：${model}`, @@ -2490,8 +2500,13 @@ export const CATALOG_DRAFT_TEXT = { cancelled: '已停止', interrupted: '服务重启，起草中断', } as Record, - interrupted: '服务重启时这次起草还没有完成，没写完的表未起草。已写进目录的内容保留；可以只重试这些表，接着起草', - cancelled: '已写进目录的内容保留，没写完的表未起草', + // 重试不是续跑：服务端把这些表整张重新分段起草（不跳过已写进目录的段），已写进目录的内容不会丢。别写成「接着起草 + // 剩下的段」——宽表重试花的时间和额度和第一次差不多 + interrupted: '服务重启时这次起草还没有完成，没写完的部分未起草。已写进目录的内容保留（每写完一段就写进目录）；可以只重试这些表：会重新起草整张表，已写进目录的内容不会丢', + cancelled: '已写进目录的内容保留（每写完一段就写进目录），没写完的部分未起草', + /** 停下来时有表已经写进了一部分段 */ + cancelledParts: (tables: number, parts: number) => + `其中 ${formatNumber(tables)} 张表已写进目录 ${formatNumber(parts)} 段；只重试这些表时会重新起草整张表，已写进的不会丢`, // 任务整体出错的原因（job.error）照服务端的原话写在标题「起草失败」下面，不再加前缀：服务端的原因有的已经是整句 // （「数据源不存在……」），有的自带「起草任务出错：」开头。没结束的表记失败、原因同任务的，逐表不再重复 /** 没写全的表：失败、部分完成、已停止各几张；跳过的（表结构里没有）另说 */ @@ -2539,6 +2554,8 @@ export const CATALOG_DRAFT_TEXT = { /** 上次起草有留空的列：清单上是轻提示（不是失败标记），表详情顶部同一句 */ lastBlank: (n: number) => `上次起草有 ${formatNumber(n)} 列模型拿不准、留空了`, lastBlankAdvice: '可以在起草要求里补充缩写和术语的含义，再重新起草这张表，已有的内容不会丢', + /** 最近一次起草停止了、没有新写入：留空的列是再之前那次写完的起草记下的 */ + lastBlankEarlier: '最近一次起草已停止，留空的列按再之前那次起草记下的', draftGuidance: '补充起草要求', draftGuidanceHint: '打开起草设置，范围是这张表：先在起草要求里补充缩写和术语的含义，再开始起草', redraft: '重新起草这张表', @@ -2953,6 +2970,328 @@ export const CATALOG_UI_TEXT = { cardinalityCheckedShort: '已核实', cardinalityCheckedHint: '基数由数据剖析用数据核实（子表一侧确有重复或确实唯一），一对多关联后重复计算的检查据此报错误', emptyTables: (n: number) => `挑表时跳过 ${formatNumber(n)} 张空表`, + // ---- 表详情里有效记录条件、去重规则的说明（模型起草时附的依据、数据剖析核对的排除比例） + fieldNote: '说明', +} + +// =========================================================================== +// 表助手（表详情里「和助手一起完善」）：和助手对话完善一张表的数据目录。 +// +// 术语： +// - 面板叫「表助手」，入口写「和助手一起完善」。助手只改数据目录、不改业务库；只记数据事实，不写公式。 +// - 助手提出的修改叫「修改提案」，每一项写「改前 / 改后 / 依据」，可以逐项「去掉」「加回」。 +// - 「待保存的修改」：跨多轮累积，同一项以最后一次提案为准；「保存 N 项修改」一次写入，改动的项记为人工填写、已确认。 +// - 只读查询只在开了数据剖析的源上有：写「查询了数据」，SQL 和前几行可以展开；遮罩列的值写「已遮罩」（服务端给的）。 +// - 对话不保存在服务端：关闭表助手、换表、离开页面后就没有了。 +// =========================================================================== + +export const CATALOG_ASSISTANT_TEXT = { + open: '和助手一起完善', + openHint: '和表助手对话完善这张表的数据目录：说出业务事实，助手整理成修改提案，确认后再保存', + openMissing: '表结构中已没有这张表，不能和助手一起完善', + title: '表助手', + subtitle: (table: string) => `完善「${table}」的数据目录`, + close: '关闭表助手', + closeTitle: '关闭表助手？', + closeConsequences: ['待保存的修改和这段对话都会丢失'], + closeConfirm: '放弃并关闭', + leaveTitle: '表助手有未保存的修改', + leaveConsequences: ['离开后待保存的修改和这段对话都会丢失'], + leaveConfirm: '放弃并离开', + noProfile: '这个数据源没开数据剖析，助手只能根据表结构和目录推断，不能查数据', + profileOn: '这个数据源开了数据剖析：助手可以发少量只读查询核对数据，遮罩列不取值', + notStored: '对话不保存在服务端，关闭表助手或离开页面后就没有了', + greeting: '说出你知道的业务事实（某一列的含义、码值、有效记录条件……），助手整理成修改提案，你确认后才写进数据目录。助手只记数据事实，不写计算公式。', + /** + * 上次起草有留空的列：开场引导先问这几列（assistant.ts 的 blankLeadOf）。例子只举起草时记下的留空列里还没补上的； + * 拿不到起草时记下的列名时，改说目录里还没有中文名和含义的列——那里面还有没写出来的列，不能说成留空的列 + */ + blankLead: (b: { from: 'draft' | 'catalog'; n: number; examples: string[]; remaining: number | null; unnamed: number }) => { + const head = `上次起草有 ${formatNumber(b.n)} 列模型拿不准、留空了` + const cols = b.examples.join('、') + if (b.from === 'catalog') { + return b.unnamed > 0 + ? `${head}。目录里还有 ${formatNumber(b.unnamed)} 列没有中文名和含义${cols ? `，例如 ${cols}` : ''}，可以先从这些列开始。` + : `${head}，现在目录里的列都已有中文名或含义。` + } + if (b.remaining === 0) return `${head}，现在都已补上中文名或含义。` + if (!cols) return `${head}。` + if (b.remaining == null) return `${head}，例如 ${cols}。可以先从这几列开始。` + return b.remaining < b.n + ? `${head}，还有 ${formatNumber(b.remaining)} 列没补上：${cols}。可以先从这几列开始。` + : `${head}：${cols}。可以先从这几列开始。` + }, + suggestLabel: '可以这样开始', + /** 「补上……」按钮：上面的数字就是点名的列数（不知道一共几列时不写数字） */ + suggestBlank: (from: 'draft' | 'catalog', total: number | null) => (from === 'catalog' + ? `补上没有中文名和含义的 ${formatNumber(total ?? 0)} 列` + : total == null ? '补上留空的列' : `补上留空的 ${formatNumber(total)} 列`), + suggestBlankText: (from: 'draft' | 'catalog', cols: string[], total: number | null) => { + const named = cols.join('、') + if (from === 'draft' && total == null) return `请帮我补上上次起草时模型留空的列的中文名和含义，例如 ${named}。拿不准的地方先问我。` + const more = total != null && total > cols.length ? ` 等 ${formatNumber(total)} 列` : '' + return `请帮我补上这几列的中文名和含义：${named}${more}。拿不准的地方先问我。` + }, + suggestFacts: '核对有效记录条件和去重规则', + suggestFactsText: '这张表的有效记录条件和去重规则应该怎么写？拿不准的地方先问我。', + suggestPending: '看看哪些推断可以确认', + suggestPendingText: '这张表还没确认的推断项里，哪些可以直接确认、哪些需要我补充？', + you: '你', + assistant: '助手', + logLabel: '和表助手的对话', + inputLabel: '给表助手的消息', + inputPlaceholder: '例如：status 为 9 表示作废，统计时要排除', + inputHint: 'Enter 发送，Shift+Enter 换行', + count: (n: number, max: number) => `${formatNumber(n)} / ${formatNumber(max)} 字`, + tooLong: (max: number) => `一条消息不超过 ${formatNumber(max)} 字`, + send: '发送', + stop: '停止回答', + answering: '助手正在回答…', + answered: '助手已回答', + stopped: '已停止回答', + interrupted: '连接中断，这一轮没有答完', + failed: (reason: string) => `这一轮没有完成：${reason}`, + usage: (input: number, output: number) => + `输入 ${formatTokens(input, { compact: true })}、输出 ${formatTokens(output, { compact: true })}`, + queries: (n: number) => `查询 ${formatNumber(n)} 次`, + // ---- 只读查询（rows 是取回的行数；truncated：后面还有行，取回的只是前一截，不是结果的总行数） + query: (rows: number, truncated = false) => (truncated + ? `查询了数据（取回前 ${formatNumber(rows)} 行，后面还有）` : `查询了数据（${formatNumber(rows)} 行）`), + queryFailed: '查询没有成功', + queryRows: (shown: number, total: number, truncated = false) => { + const head = truncated ? `取回前 ${formatNumber(total)} 行（后面还有）` : `共 ${formatNumber(total)} 行` + return total > shown ? `${head}，显示前 ${formatNumber(shown)} 行` : head + }, + queryEmpty: '没有返回行', + // ---- 修改提案 + proposal: (n: number) => `修改提案（${formatNumber(n)} 项）`, + before: '改前', + after: '改后', + reason: '依据', + drop: '去掉', + dropLabel: (where: string) => `去掉：${where}`, + restore: '加回', + restoreLabel: (where: string) => `加回：${where}`, + state: { + pending: '待保存', + replaced: '已改用另一条提案的值', + dropped: '已去掉', + saved: '已保存', + } as Record<'pending' | 'replaced' | 'dropped' | 'saved', string>, + stateConfirm: '值不变，保存即确认', + // ---- 待保存的修改 + pending: (n: number) => `待保存的修改（${formatNumber(n)} 项）`, + pendingEmpty: '还没有待保存的修改', + pendingHint: '跨多轮累积，同一项以最后一次提案为准。保存后改动的项记为人工填写、已确认', + pendingShow: '展开待保存的修改', + pendingHide: '收起待保存的修改', + save: (n: number) => `保存 ${formatNumber(n)} 项修改`, + saving: '正在保存…', + clear: '全部去掉', + clearTitle: (n: number) => `去掉全部 ${formatNumber(n)} 项待保存的修改？`, + clearConfirm: '全部去掉', + tooMany: (n: number, max: number) => `有 ${formatNumber(n)} 项，一次最多保存 ${formatNumber(max)} 项，请先去掉一些`, + editing: '正在编辑这张表，保存或取消后再保存助手的修改', + saved: (n: number, version: number) => `已保存 ${formatNumber(n)} 项修改（第 ${formatNumber(version)} 版）`, + savedToast: (n: number, table: string) => `已保存 ${formatNumber(n)} 项修改到「${table}」的数据目录`, + conflictTitle: '这张表刚被修改过', + conflictBody: '已按最新内容重算改前和改后，请核对后再保存。', + conflictFailed: '无法按最新内容重算改前和改后，请稍后重试', + problems: '以下几项已无法保存，已从待保存的修改中去掉：', +} + +// =========================================================================== +// 审阅队列（数据目录页的「审阅队列」视图）：跨表列出推断项，按表的使用次数、这一项对数字的影响和来源排好， +// 可以成批确认、驳回、撤销审阅。 +// +// 术语： +// - 「影响数字的项」：有效记录条件、去重规则、业务日期、关联关系、业务主键、度量类型——写错了查出来的数就不对，排在最前； +// 「名称和含义」：中文名、含义、单位、码值、粒度、表类型。 +// - 审阅过的项原地标出结果（已确认、已驳回、未生效），刷新队列后才移除；「撤销审阅」回到起草时的状态（推断）。 +// - 每一项的位置写「列 status 的码值」「表的有效记录条件」「指向 parks 的关联关系」（同提案卡片），不只写字段名。 +// - 「常用 N 张表」：被运行用过、使用次数最多的前几张（最多 20 张），N 写实际张数；没有运行用过的表时写明。 +// - 进度写「已确认 42%」，三行同一个口径：已确认 ÷（已确认 + 待确认）；已驳回的、有确证的（外键约束）不计入。 +// - 「使用 N 次」是所在表被运行查询过的次数（按查询算，同表清单）；「用过这张表的运行」写「共 N 次运行」（按运行算）， +// 两个数不一样，各自写明单位。 +// =========================================================================== + +export const CATALOG_REVIEW_TEXT = { + viewLabel: '数据目录的视图', + view: { list: '表清单', review: '审阅队列' } as Record<'list' | 'review', string>, + viewHint: { + list: '逐表查看和编辑数据目录', + review: '跨表列出待确认的推断项，按使用次数和对数字的影响排好，可以成批确认、驳回', + } as Record<'list' | 'review', string>, + queueLabel: '待确认的推断项', + kindLabel: '按项筛选', + kind: { all: '全部', facts: '影响数字的项', names: '名称和含义' } as Record<'all' | 'facts' | 'names', string>, + kindHint: { + all: '全部待确认的推断项', + facts: '有效记录条件、去重规则、业务日期、关联关系、业务主键、度量类型：写错了查出来的数就不对', + names: '中文名、含义、单位、码值、粒度、表类型', + } as Record<'all' | 'facts' | 'names', string>, + tableLabel: '按表筛选', + tableAll: '全部表', + tableOption: (label: string | null, table: string, n: number) => `${label ? `${label}（${table}）` : table} · ${formatNumber(n)} 项`, + total: (n: number) => `${formatNumber(n)} 项待确认`, + shown: (shown: number, total: number) => `显示 ${formatNumber(shown)} / ${formatNumber(total)} 项`, + empty: '没有待确认的推断项', + emptyBody: '推断的项都审阅过了。之后起草出的新推断会出现在这里。', + emptyFiltered: '没有符合条件的待确认项', + emptyFilteredBody: '请换个筛选条件。', + loadFailed: '无法读取审阅队列', + retry: '重试', + refresh: '刷新队列', + refreshHint: '审阅过的项刷新后从队列中移除', + more: (n: number) => `再载入 ${formatNumber(n)} 项`, + loading: '正在载入…', + selectAll: '全选当前列表', + select: (where: string, table: string) => `选择：${table} ${where}`, + selected: (n: number) => `已选 ${formatNumber(n)} 项`, + clearSelection: '取消选择', + usage: (n: number) => `使用 ${formatNumber(n)} 次`, + usageHint: '所在表被运行查询过的次数，同一次运行中结果相同的重复查询只算一次', + open: (where: string, table: string) => `打开「${table}」，查看${where}`, + reasonsLabel: '排在这里的原因', + // ---- 成批审阅 + confirm: (n: number) => `确认（${formatNumber(n)}）`, + reject: (n: number) => `驳回（${formatNumber(n)}）`, + reset: (n: number) => `撤销审阅（${formatNumber(n)}）`, + resetHint: '把这一页上审阅过的项回到起草时的状态（推断）', + confirmTitle: (n: number) => `确认 ${formatNumber(n)} 项推断？`, + confirmConsequences: ['确认后这些项参与 SQL 检查', '来源保持不变，状态改为已确认', '之后仍可撤销审阅'], + confirmAction: (n: number) => `确认 ${formatNumber(n)} 项`, + rejectTitle: (n: number) => `驳回 ${formatNumber(n)} 项推断？`, + rejectConsequences: ['驳回后不提供给助手、不参与 SQL 检查', '之后起草也不会再提出', '之后仍可撤销审阅'], + rejectAction: (n: number) => `驳回 ${formatNumber(n)} 项`, + tooMany: (max: number) => `一次最多审阅 ${formatNumber(max)} 项，请少选一些`, + working: '正在提交…', + done: { confirm: '已确认', reject: '已驳回', reset: '已撤销审阅' } as Record<'confirm' | 'reject' | 'reset', string>, + conflict: '未生效：这张表刚被修改过，请刷新队列后再审阅', + failed: '未生效', + /** 一批的结果：成功几项、冲突几项、别的原因没成功几项 */ + summary: (action: 'confirm' | 'reject' | 'reset', ok: number, conflicts: number, failed: number) => { + const head = `${{ confirm: '已确认', reject: '已驳回', reset: '已撤销审阅' }[action]} ${formatNumber(ok)} 项` + const bad = [ + conflicts ? `${formatNumber(conflicts)} 项未生效（所在表刚被修改过）` : '', + failed ? `${formatNumber(failed)} 项未生效` : '', + ].filter(Boolean) + return bad.length ? `${head}；${bad.join('、')}，请刷新队列后再审阅` : head + }, + failedAll: (reason: string) => `未能提交：${reason}`, + // ---- 进度 + progressTitle: '审阅进度', + /** 常用表：被运行用过、使用次数最多的前几张（最多 topN 张），n 是实际张数 */ + progressTop: (n: number) => `常用 ${formatNumber(n)} 张表`, + progressTopHint: (n: number, topN: number) => (n > 0 + ? `被运行用过、使用次数最多的 ${formatNumber(n)} 张表里的项（最多取 ${formatNumber(topN)} 张）` + : `被运行用过、使用次数最多的表里的项（最多取 ${formatNumber(topN)} 张）`), + progressTopNone: '常用表', + progressTopEmpty: '还没有运行用过的表', + progressAll: '全部表', + progressAllHint: '这个数据源全部表里的项', + progressFacts: '影响数字的项', + progressFactsHint: '有效记录条件、去重规则、业务日期、关联关系、业务主键、度量类型', + progressRule: '已确认 ÷（已确认 + 待确认）：已驳回的、有确证的（外键约束）不用再确认，不计入', + /** 一行进度：已确认百分比和待确认几项；不知道待确认几项时只写已确认几项 */ + progressText: (pct: number | null, confirmed: number, proposed: number | null, total: number | null) => { + if (total === 0) return '还没有目录项' + if (proposed == null) return `已确认 ${formatNumber(confirmed)} 项` + if (pct == null) return '没有待确认的项' + return `已确认 ${formatNumber(pct)}% · 待确认 ${formatNumber(proposed)} 项` + }, + progressFailed: '无法读取审阅进度', + // ---- 没选中项时的右栏 + overviewTitle: '从左侧队列挑一项开始审阅', + overviewBody: '队列按所在表的使用次数、这一项对数字的影响和来源排序：常用表里影响数字的推断排在最前，模型起草、命名推断的比数据库注释的靠前。点开一项可以看它所在表的详情和用过这张表的运行。', + // ---- 从队列打开的项 + focusMark: '从审阅队列打开', + // ---- 表清单视图概览里的入口 + openQueue: '打开审阅队列', + openQueueHint: '跨表按使用次数和对数字的影响排好，可以成批确认、驳回', +} + +/** 表详情里「用过这张表的运行」（GET /catalog/{table}/usage） */ +export const CATALOG_USAGE_TEXT = { + title: '用过这张表的运行', + hint: '新的在前', + show: '查看用过这张表的运行', + hide: '收起', + none: '还没有运行查询过这张表', + /** 按运行算（一次运行查询了几次这张表都只算一次），和表头按查询算的「使用 N 次」不是一个数 */ + count: (shown: number, total: number) => (total > shown + ? `共 ${formatNumber(total)} 次运行，显示最近 ${formatNumber(shown)} 次` : `共 ${formatNumber(total)} 次运行`), + countHint: '按运行算：一次运行查询了几次这张表都只算一次；表头的使用次数按查询算，两个数可能不一样', + error: '无法读取用过这张表的运行', + retry: '重试', + unnamed: '未保存的工作流', + open: (name: string) => `打开运行记录：${name}`, +} + +// =========================================================================== +// 导出导入数据目录（数据目录页的「导出目录」「导入目录」）：本机整理好的目录带到另一个实例。 +// +// 术语： +// - 导出的是一个 .json 文件，含全部状态的项和起草要求。导入先「预览」（只读），确认后才写入。 +// - 预览逐表写「新增 / 更新 / 保留 / 冲突 / 跳过」：冲突是这里已确认、已驳回的项和文件里不一样，以这里为准； +// 跳过是表结构里没有的列、两端对不上的关联关系。 +// =========================================================================== + +export const CATALOG_TRANSFER_TEXT = { + export: '导出目录', + exportHint: '把这个数据源的数据目录导出成文件（含全部状态的项和起草要求），可以导入到另一个实例', + exporting: '正在导出…', + exported: (name: string) => `已导出「${name}」`, + exportFailed: (reason: string) => `未能导出数据目录：${reason}`, + fileName: (source: string) => `${source}-数据目录.json`, + import: '导入目录', + importHint: '从导出的文件导入数据目录：先预览，确认后再写入', + title: '导入数据目录', + chooseLabel: '导出的数据目录文件', + chooseHint: '「导出目录」得到的 .json 文件', + choose: '选择文件', + chosen: (name: string) => `已选择：${name}`, + includeGuidance: '同时导入起草要求', + includeGuidanceHint: '这个数据源还没有起草要求时才写入，已有的不覆盖', + rulesTitle: '导入的规矩', + rules: [ + '表按名字对上：不分大小写；带 schema 前缀的对不上时去掉前缀再对', + '文件中已确认、已驳回的项照原样带入，来源和状态不变', + '这里已确认、已驳回的项和文件中的不一样时以这里为准，记为冲突', + '文件中推断、已验证的项只填补这里的空缺，不覆盖已有的', + '表结构里没有的列、两端对不上的关联关系跳过，写明原因', + ], + preview: '预览', + previewing: '正在预览…', + notJson: '文件不是有效的 JSON，请选择「导出目录」得到的文件', + readFailed: '无法读取这个文件', + fileMeta: (source: string, at: string) => `导出自「${source}」 · ${at}`, + totals: (t: { tables: number; add: number; update: number; keep: number; conflicts: number; skipped: number }) => + `${formatNumber(t.tables)} 张表：新增 ${formatNumber(t.add)} 项、更新 ${formatNumber(t.update)} 项、保留 ${formatNumber(t.keep)} 项、` + + `冲突 ${formatNumber(t.conflicts)} 项、跳过 ${formatNumber(t.skipped)} 项`, + head: { table: '表', add: '新增', update: '更新', keep: '保留', conflicts: '冲突', skipped: '跳过' }, + matchedAs: (name: string) => `对上「${name}」`, + unmatched: (n: number) => `${formatNumber(n)} 张表在这个数据源里对不上，不导入：`, + conflictsTitle: (n: number) => `冲突 ${formatNumber(n)} 项：以这里为准，不导入`, + conflictFile: '文件中', + conflictTarget: '这里', + skippedTitle: (n: number) => `跳过 ${formatNumber(n)} 项`, + guidance: { + replace: '起草要求：写入文件中的起草要求（这个数据源还没有）', + keep: '起草要求：保留这个数据源现有的，不覆盖', + none: '起草要求：不导入', + } as Record<'keep' | 'replace' | 'none', string>, + confirm: (n: number) => `导入 ${formatNumber(n)} 张表`, + importing: '正在导入…', + nothing: '没有可以导入的内容：文件中的表在这个数据源里都对不上', + done: '导入完成', + doneTotals: (t: { tables: number; add: number; update: number; conflicts: number }) => + `写入 ${formatNumber(t.tables)} 张表：新增 ${formatNumber(t.add)} 项、更新 ${formatNumber(t.update)} 项；冲突 ${formatNumber(t.conflicts)} 项以这里为准`, + version: (v: number) => `第 ${formatNumber(v)} 版`, + tableFailed: (reason: string) => `这张表未导入：${reason}`, + back: '重新选择文件', + cancel: '取消', + close: '完成', } // =========================================================================== diff --git a/frontend/src/pages/catalog/CatalogPage.tsx b/frontend/src/pages/catalog/CatalogPage.tsx index 3257ec32..09a1ddc0 100644 --- a/frontend/src/pages/catalog/CatalogPage.tsx +++ b/frontend/src/pages/catalog/CatalogPage.tsx @@ -1,14 +1,19 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react' -import type { ReactNode } from 'react' +import type { KeyboardEvent as ReactKeyboardEvent, ReactNode } from 'react' import { useNavigate, useParams, useSearchParams } from 'react-router-dom' -import { ArrowLeft, BookMarked, Database, ListFilter as ListFilterIcon, ScanSearch, Sparkles, TriangleAlert } from 'lucide-react' +import { + ArrowLeft, BookMarked, Database, Download, ListFilter as ListFilterIcon, ScanSearch, Sparkles, TriangleAlert, Upload, +} from 'lucide-react' import clsx from 'clsx' import { ApiError, api } from '../../api/client' -import type { CatalogDetail, CatalogList, CatalogTableRow } from '../../types' -import { EmptyState, ErrorState, PageHeader, Skeleton, Spinner, toast, useTicker } from '../../components/ui' +import type { CatalogDetail, CatalogList, CatalogReviewItem, CatalogReviewKind, CatalogTableRow } from '../../types' +import { EmptyState, ErrorState, PageHeader, Skeleton, Spinner, rovingTarget, toast, useTicker } from '../../components/ui' import { useCatalog, useDatasources, useOnReconnect } from '../../store/catalog' +import { errorMessage } from '../../lib/errors' +import { formatNumber } from '../../lib/format' import { - CATALOG_DRAFT_TEXT as DT, CATALOG_TEXT as CT, PROFILE_STOP_LABEL, PROFILE_TEXT as PT, SCHEMA_PARTIAL_TEXT as SPT, + CATALOG_DRAFT_TEXT as DT, CATALOG_REVIEW_TEXT as RT, CATALOG_TEXT as CT, CATALOG_TRANSFER_TEXT as XT, PROFILE_STOP_LABEL, + PROFILE_TEXT as PT, SCHEMA_PARTIAL_TEXT as SPT, } from '../../lib/terms' import { StatusLegend, SystemNotesNotice } from './parts' import { DraftDialog } from './DraftDialog' @@ -20,6 +25,10 @@ import { ProfileSettingsDialog } from './ProfileSettings' import { fillKey, profileBlockOf, profileSettingsOf, secondsText } from './profile' import { TableDetail } from './TableDetail' import { TableIndex } from './TableIndex' +import { ReviewOverview, ReviewQueue } from './ReviewQueue' +import { ImportDialog } from './TransferDialog' +import { itemKey, reviewParamsOf, writeReviewParams } from './review' +import type { CatalogView } from './review' import { filterCounts, listParamsOf, progressOf, rowFromDetail, usageSummary, visibleRows, writeListParams } from './model' import type { ListFilter, ListParams, ListSort } from './model' @@ -34,6 +43,10 @@ import type { ListFilter, ListParams, ListSort } from './model' // // 清单的搜索词、筛选、排序和「只看运行中查询过的表」记在地址的查询参数里（q / filter / sort / used），刷新、前进后退 // 都不丢；在清单和表详情之间跳转时带着它们走。 +// +// 左栏有两个视图：表清单（逐表看）和审阅队列（view=review：跨表按优先级列出推断项，成批确认、驳回，筛选记在 kind / +// rtable 里）。从队列点开一项，右栏是所在表的详情，地址带着那一项（item），详情滚到那一项、列出用过这张表的运行。 +// 页头的「导出目录」「导入目录」把整理好的目录带到另一个实例（导入先预览，确认后才写）。 // =========================================================================== export function CatalogPage() { @@ -98,10 +111,20 @@ export function CatalogPage() { const setFilter = useCallback((f: ListFilter) => setList((c) => ({ ...c, filter: f })), []) const setSort = useCallback((v: ListSort) => setList((c) => ({ ...c, sort: v })), []) const setUsedOnly = useCallback((v: boolean) => setList((c) => ({ ...c, used: v })), []) - /** 跳到别的表、回到清单时带上清单的查询参数（按页面上的算：搜索词可能还没写进地址） */ + /** + * 跳到别的表、回到清单时带上清单的查询参数（按页面上的算：搜索词可能还没写进地址）。审阅视图的参数（view、kind、rtable） + * 照旧带着，从审阅队列打开的那一项（item）不带：换了表就不是那一项了 + */ const searchRef = useRef('') - const search = writeListParams(params, list).toString() + const carried = writeListParams(params, list) + carried.delete('item') + const search = carried.toString() searchRef.current = search ? `?${search}` : '' + const carriedRef = useRef(carried) + carriedRef.current = carried + /** 审阅视图：view=review 时左栏是审阅队列；kind、rtable 是队列的筛选；item 是右栏从队列打开的那一项 */ + const review = useMemo(() => reviewParamsOf(params), [params]) + const inReview = review.view === 'review' const [selected, setSelected] = useState>(() => new Set()) /** * 起草对话框开着没有、打开时显示什么：setup 选范围开始；job 显示页面跟着的任务（进行中的进度、刚结束的结果）。 @@ -142,12 +165,15 @@ export function CatalogPage() { const backToList = useCallback(() => navigate(`${base}${searchRef.current}`), [navigate, base]) const back = source?.origin === 'upload' ? '/data/tables' : '/data/databases' + /** 右栏的表详情载入、改过之后的目录：审阅队列里这张表的项跟着换状态 */ + const [detailSync, setDetailSync] = useState<{ seq: number; detail: CatalogDetail } | null>(null) /** 写入、审阅之后按返回的单表目录更新清单里那一行 */ const onDetail = useCallback((d: CatalogDetail) => { setData((cur) => cur && ({ ...cur, tables: cur.tables.map((r) => (r.table_name === d.table_name ? rowFromDetail(d, r) : r)), })) + setDetailSync((cur) => ({ seq: (cur?.seq ?? 0) + 1, detail: d })) }, []) /** @@ -306,6 +332,52 @@ export function CatalogPage() { return [list[i - 1]?.table_name ?? null, list[i + 1]?.table_name ?? null] }, [table, visible, rows, sort]) + /** + * 改地址的查询参数，按地址栏现在的样子改：setSearchParams 的函数式写法拿的是上一次渲染时的参数，连着改两样（先点 + * 「全部」、紧接着换表）时后一次会把前一次盖掉 + */ + const patchSearch = useCallback((fn: (p: URLSearchParams) => URLSearchParams, opts?: { replace?: boolean }) => { + const next = fn(new URLSearchParams(window.location.search)).toString() + navigate({ search: next ? `?${next}` : '' }, opts) + }, [navigate]) + /** 换视图（表清单 / 审阅队列）：记进地址（后退回到上一个视图），右栏正在看的表不动 */ + const setView = useCallback((v: CatalogView) => { + patchSearch((prev) => writeReviewParams(prev, { view: v, item: '' })) + }, [patchSearch]) + /** 审阅队列的筛选：替换当前这条历史（筛选不该占满后退键） */ + const setReviewParams = useCallback((p: { kind?: CatalogReviewKind; table?: string }) => { + patchSearch((prev) => writeReviewParams(prev, p), { replace: true }) + }, [patchSearch]) + /** 从审阅队列打开一项：右栏是所在表的详情，地址带着这一项 */ + const openReviewItem = useCallback((i: CatalogReviewItem) => { + const q = writeReviewParams(carriedRef.current, { view: 'review', item: i.path }).toString() + navigate(`${base}/${encodeURIComponent(i.table_name)}${q ? `?${q}` : ''}`) + }, [navigate, base]) + /** 成批审阅、导入写进了这些表：重取清单，正在看的表重新载入（编辑中的不动，保存时服务端会用版本号拦下） */ + const onTablesWritten = useCallback((tables: string[]) => { + setDrafted((cur) => ({ seq: cur.seq + 1, tables: new Set(tables) })) + void load() + }, [load]) + const activeReviewKey = inReview && table && review.item ? itemKey({ table_name: table, path: review.item }) : null + const proposedTotal = useMemo(() => rows.reduce((n, r) => n + (r.in_schema ? r.counts.proposed : 0), 0), [rows]) + + /** 导出目录：下载服务端给的文件，文件名按服务端的，没给就按数据源名补 */ + const [exporting, setExporting] = useState(false) + const [importing, setImporting] = useState(false) + const exportCatalog = useCallback(async () => { + setExporting(true) + try { + const { blob, name } = await api.dataCatalog.exportFile(sourceId) + const file = name ?? XT.fileName(source?.name ?? sourceId) + saveFile(file, blob) + toast.ok(XT.exported(file)) + } catch (e) { + toast.error(XT.exportFailed(errorMessage(e))) + } finally { + setExporting(false) + } + }, [sourceId, source?.name]) + const usage = useMemo(() => usageSummary(rows), [rows]) const wideHeader = useMedia('(min-width: 640px)') /** @@ -375,42 +447,58 @@ export function CatalogPage() { body = (
{table ? ( + draftBusy={!!stripJob} onRedraft={redraftTable} onDraftGuidance={draftWithGuidance} + profileEnabled={profileSettings.enabled} focusPath={inReview ? review.item || null : null} usageOpen={inReview} /> ) - : } + : inReview + ? + : setView('review')} />}
) @@ -427,6 +515,18 @@ export function CatalogPage() {
{hasTables && headerProfile} {hasTables && headerDraft} + {hasTables && ( + + )} + {hasTables && ( + + )} @@ -481,6 +581,9 @@ export function CatalogPage() { onReset={() => setJob(null)} /> )} + {importing && ( + setImporting(false)} onImported={onTablesWritten} /> + )} {profileSettingsOpen && source && ( setProfileSettingsOpen(false)} onSaved={onProfileSettingsSaved} /> @@ -524,6 +627,51 @@ function DraftStrip({ job, notice, onOpen }: { ) } +/** 存成文件（同运行记录里的下载）：浏览器下载，文件名照给的 */ +function saveFile(name: string, blob: Blob) { + const url = URL.createObjectURL(blob) + const a = document.createElement('a') + a.href = url + a.download = name + a.click() + setTimeout(() => URL.revokeObjectURL(url), 1000) +} + +const VIEWS: CatalogView[] = ['list', 'review'] + +/** + * 左栏上方的两个视图：表清单（逐表看）、审阅队列（跨表按优先级看推断项，带着还有几项待确认）。标签页语义， + * ←→ Home End 切换 + */ +function ViewTabs({ view, proposed, onChange }: { view: CatalogView; proposed: number; onChange: (v: CatalogView) => void }) { + const refs = useRef>({}) + const move = (e: ReactKeyboardEvent, i: number) => { + const j = rovingTarget(e, i, VIEWS.length, 'horizontal') + if (j < 0) return + e.preventDefault() + onChange(VIEWS[j]) + refs.current[VIEWS[j]]?.focus() + } + return ( +
+ {VIEWS.map((v, i) => { + const selected = view === v + return ( + + ) + })} +
+ ) +} + /** 媒体查询的当前结果，跟着窗口大小变 */ function useMedia(query: string): boolean { const [on, setOn] = useState(() => typeof matchMedia !== 'function' || matchMedia(query).matches) @@ -601,13 +749,14 @@ function UsageSummary({ used, pending, none, active, onFocus }: { ) } -/** 没有选中表时的右栏：空目录时引导起草；否则写审阅进度，给出下一张该审的表 */ -function Overview({ rows, empty, systemNotes, draft, onOpen }: { +/** 没有选中表时的右栏：空目录时引导起草；否则写审阅进度，给出下一张该审的表，也可以去审阅队列跨表成批审阅 */ +function Overview({ rows, empty, systemNotes, draft, onOpen, onReview }: { rows: CatalogTableRow[] empty: boolean systemNotes: boolean draft: ReactNode onOpen: (table: string) => void + onReview: () => void }) { const pendingNext = rows.find((r) => r.in_schema && r.counts.proposed > 0) const stats = { pending: 0, done: 0, none: 0 } @@ -634,6 +783,12 @@ function Overview({ rows, empty, systemNotes, draft, onOpen }: { {CT.reviewNextHint}
)} + {pendingNext && ( +
+ + {RT.openQueueHint} +
+ )} )} {systemNotes && } diff --git a/frontend/src/pages/catalog/ColumnTable.tsx b/frontend/src/pages/catalog/ColumnTable.tsx index cec5a1ba..56e64f27 100644 --- a/frontend/src/pages/catalog/ColumnTable.tsx +++ b/frontend/src/pages/catalog/ColumnTable.tsx @@ -9,7 +9,7 @@ import { IconButton } from '../../components/ui' import { CATALOG_COLUMN_FIELD_LABEL, CATALOG_MEASURE_HINT, CATALOG_MEASURE_LABEL, CATALOG_TEXT as CT, CODES_TEXT as KT, } from '../../lib/terms' -import { ItemMark } from './parts' +import { FOCUS_RING, FOCUS_STYLE, ItemMark } from './parts' import type { ReviewTarget } from './parts' import { COLUMN_FIELDS, codesComplete, columnPath, completeOf } from './model' import type { ColumnDraft, ColumnField } from './model' @@ -50,7 +50,16 @@ export interface ColumnModel { type ColumnTexts = ColumnDraft -export function ColumnTable({ columns, form, initial, problems, busy, systemNotes, onReview, onConfirmColumn, onFillCodes, onChange, onCodesComplete }: { +/** 审阅路径 columns.<列名>.<字段> → [列名, 字段]（列名里可以有句点，按最后一个句点切）；不是列级项为 null */ +function columnOfPath(path: string | null | undefined): [string, string] | null { + if (!path?.startsWith('columns.')) return null + const rest = path.slice('columns.'.length) + const at = rest.lastIndexOf('.') + return at > 0 ? [rest.slice(0, at), rest.slice(at + 1)] : null +} + +export function ColumnTable({ columns, form, initial, problems, busy, systemNotes, onReview, onConfirmColumn, onFillCodes, onChange, onCodesComplete, + focusPath = null }: { columns: ColumnModel[] /** 编辑中：列名 → 字段 → 文字（form 是当前的，initial 是进入编辑时的）；不在编辑时为 null */ form: Record | null @@ -67,7 +76,10 @@ export function ColumnTable({ columns, form, initial, problems, busy, systemNote onChange: (col: string, field: ColumnField, value: string) => void /** 编辑中勾选或取消码值的「已列出全部取值」 */ onCodesComplete: (col: string, value: boolean) => void + /** 从审阅队列打开的那一项（列级项的审阅路径）：那一格标出来 */ + focusPath?: string | null }) { + const focus = columnOfPath(focusPath) return (
@@ -89,7 +101,7 @@ export function ColumnTable({ columns, form, initial, problems, busy, systemNote {columns.map((c) => ( + onCodesComplete={onCodesComplete} focusField={focus && focus[0] === c.name ? focus[1] : null} /> ))}
@@ -98,7 +110,7 @@ export function ColumnTable({ columns, form, initial, problems, busy, systemNote } const ColumnRow = memo(function ColumnRow({ col, editing, draft, initial, problems, busy, systemNotes, onReview, onConfirmColumn, onFillCodes, onChange, - onCodesComplete }: { + onCodesComplete, focusField }: { col: ColumnModel editing: boolean /** 这一列的表单。只有改了这一列时引用才会变，别的行不重画 */ @@ -112,6 +124,8 @@ const ColumnRow = memo(function ColumnRow({ col, editing, draft, initial, proble onFillCodes: (col: string) => void onChange: (col: string, field: ColumnField, value: string) => void onCodesComplete: (col: string, value: boolean) => void + /** 从审阅队列打开的是这一列的哪一项 */ + focusField: string | null }) { const { name, structure, items } = col const pending = COLUMN_FIELDS.filter((f) => items?.[f]?.status === 'proposed').length @@ -121,9 +135,12 @@ const ColumnRow = memo(function ColumnRow({ col, editing, draft, initial, proble const where = CT.whereColumn(name, CATALOG_COLUMN_FIELD_LABEL[f]) const problem = problems[`c:${name}:${f}`] const changed = editing && ((draft?.[f] ?? '') !== (initial?.[f] ?? '') || (f === 'codes' && completeOf(draft) !== completeOf(initial))) + const focused = focusField === f return ( // 窄框下没填的项不占行（编辑时照常列出来好填） - + {CT.columnHead[f]}
{editing ? input : view}
@@ -223,6 +240,7 @@ const ColumnRow = memo(function ColumnRow({ col, editing, draft, initial, proble ) }, (a, b) => a.col === b.col && a.editing === b.editing && a.draft === b.draft && a.initial === b.initial && a.busy === b.busy + && a.focusField === b.focusField && a.systemNotes === b.systemNotes && a.onReview === b.onReview && a.onConfirmColumn === b.onConfirmColumn && a.onFillCodes === b.onFillCodes && a.onChange === b.onChange && a.onCodesComplete === b.onCodesComplete // 格式问题每次都是新对象：只比这一列的几格 diff --git a/frontend/src/pages/catalog/DraftDialog.tsx b/frontend/src/pages/catalog/DraftDialog.tsx index 3a7547fc..d9970f06 100644 --- a/frontend/src/pages/catalog/DraftDialog.tsx +++ b/frontend/src/pages/catalog/DraftDialog.tsx @@ -9,8 +9,8 @@ import { errorMessage } from '../../lib/errors' import { formatTime } from '../../lib/format' import { CATALOG_DRAFT_TEXT as DT, CATALOG_TEXT as CT, DRAFT_GUIDANCE_MAX, DRAFT_NOTE_MAX } from '../../lib/terms' import { - DRAFT_MAX_TABLES, DRAFT_MODEL_UNAVAILABLE, DRAFT_PART_COLUMNS, DRAFT_TOP_N, RETRYABLE, blankOf, isJobActive, jobBlank, needsLook, - nothingWritten, retryableCount, taskReason, + DRAFT_MAX_TABLES, DRAFT_MODEL_UNAVAILABLE, DRAFT_PART_COLUMNS, DRAFT_TOP_N, RETRYABLE, blankOf, chunksOf, isJobActive, jobBlank, needsLook, + nothingWritten, retryableCount, taskReason, writtenOf, } from './draftJob' import type { DraftPreset, DraftStartBody } from './draftJob' @@ -435,6 +435,9 @@ function JobView({ job, running, stopping, busy, blankTables, onRedraftBlank }: // 额度用完、超时多了，之后的段缩小了：进行中写一句，段数为什么变多看得明白 const partColumns = running && job.use_model && job.part_columns != null && job.part_columns < DRAFT_PART_COLUMNS ? job.part_columns : null const blankTotal = jobBlank(job) + // 停下来时已经写进了一部分段的表（宽表每写完一段就写进目录）：几张、合计几段 + const stopped = job.tasks.filter((t) => t.status === 'cancelled' && writtenOf(t) > 0) + const stoppedParts = { tables: stopped.length, parts: stopped.reduce((n, t) => n + writtenOf(t), 0) } return (
{busy && {DT.busy}} @@ -468,7 +471,12 @@ function JobView({ job, running, stopping, busy, blankTables, onRedraftBlank }: {running &&

{DT.hideHint}

} {job.status === 'failed' && job.error && {job.error}} {job.status === 'interrupted' && {DT.interrupted}} - {job.status === 'cancelled' &&

{DT.cancelled}

} + {job.status === 'cancelled' && ( +

+ {DT.cancelled} + {stoppedParts.tables > 0 && {DT.cancelledParts(stoppedParts.tables, stoppedParts.parts)}} +

+ )} {problemText && (

{problemText}

)} @@ -523,7 +531,15 @@ const TASK_ICON: Record 1 && t.status !== 'pending' && t.status !== 'skipped' + const started = t.status !== 'pending' && t.status !== 'skipped' + const parts = t.parts_total != null && t.parts_total > 1 && started + // 段被缩小、拆半后实际的块（比段多时才写）；已经写进目录的段：起草中、部分完成时写着（停止也不丢，部分完成的 + // 段进度是「都结束了」，看不出写进了几段），停下来时补一句剩下几段没起草。服务端的原因里已经写了的不重复，写完了的不写 + const chunks = started ? chunksOf(t) : null + const written = writtenOf(t) + const writtenText = written <= 0 || reason.includes(DT.partsWritten(written)) ? '' + : t.status === 'running' || t.status === 'partial' ? DT.partsWritten(written) + : t.status === 'cancelled' ? DT.partsWrittenStopped(written, Math.max(0, (t.parts_total ?? written) - written)) : '' const changes = DT.taskAdded(t.added, t.updated) const blank = blankOf(t) const sample = t.blank_sample?.filter(Boolean) ?? [] @@ -537,6 +553,11 @@ function TaskRow({ task: t, jobError }: { task: CatalogDraftTask; jobError: stri {DT.parts(t.parts_done, t.parts_total!)} )} + {chunks && ( + + {DT.chunks(chunks.done, chunks.total)} + + )} {changes && ( {changes} )} @@ -545,6 +566,11 @@ function TaskRow({ task: t, jobError }: { task: CatalogDraftTask; jobError: stri {DT.taskStatus[t.status]}
+ {writtenText && ( +

+ {writtenText} +

+ )} {reason && (

{reason}

)} diff --git a/frontend/src/pages/catalog/ReviewQueue.tsx b/frontend/src/pages/catalog/ReviewQueue.tsx new file mode 100644 index 00000000..ba3a1d6c --- /dev/null +++ b/frontend/src/pages/catalog/ReviewQueue.tsx @@ -0,0 +1,436 @@ +import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react' +import { AlertTriangle, CheckCheck, RotateCcw, RotateCw, X } from 'lucide-react' +import clsx from 'clsx' +import { api } from '../../api/client' +import type { + CatalogDetail, CatalogReviewAction, CatalogReviewItem, CatalogReviewKind, CatalogReviewProgress, CatalogTableRow, +} from '../../types' +import { EmptyState, ErrorState, Notice, Skeleton, Spinner, confirmDialog, toast, useRadioGroup } from '../../components/ui' +import { errorMessage } from '../../lib/errors' +import { CATALOG_REVIEW_TEXT as RT } from '../../lib/terms' +import { StatusChip } from './parts' +import { + REVIEW_BATCH_MAX, REVIEW_KINDS, REVIEW_PAGE, applyResults, batchTargets, confirmProgress, itemKey, reviewWhere, statusOf, + syncFromDetail, +} from './review' +import type { ItemOutcome } from './review' + +// =========================================================================== +// 审阅队列（数据目录页的「审阅队列」视图，左栏）：跨表列出推断项，顺序由服务端排好（所在表的使用次数 × 这一项对数字的 +// 影响 × 来源），每一项写为什么排在这里。可以按项（影响数字的项 / 名称和含义）和表筛选；多选后成批确认、驳回，审阅过的 +// 原地标出结果（冲突的标出来），选中可以撤销审阅；刷新队列后审阅过的才移除。顶上是审阅进度：常用表（使用次数最多、 +// 被运行用过的前 20 张）、全部表、影响数字的项各确认了多少，三行同一个口径。点开一项，右栏是所在表的详情（滚到那一项、 +// 标出来）和用过这张表的运行。 +// =========================================================================== + +export function ReviewQueue({ sourceId, rows, kind, table, activeKey, detailSync, onParams, onOpenItem, onChanged }: { + sourceId: string + /** 目录清单的各行：按表筛选的候选（有推断项的表）、表的中文名 */ + rows: CatalogTableRow[] + kind: CatalogReviewKind + /** 只看这一张表；空串是全部表 */ + table: string + /** 右栏正打开的那一项（itemKey） */ + activeKey: string | null + /** 右栏的表详情载入、改过之后的目录：队列里这张表的项跟着换状态 */ + detailSync: { seq: number; detail: CatalogDetail } | null + onParams: (p: { kind?: CatalogReviewKind; table?: string }) => void + onOpenItem: (item: CatalogReviewItem) => void + /** 成批审阅写进了这些表：页面重取清单、正在看的表重新载入 */ + onChanged: (tables: string[]) => void +}) { + const [items, setItems] = useState(null) + const [total, setTotal] = useState(0) + const [loadError, setLoadError] = useState(null) + const [loadingMore, setLoadingMore] = useState(false) + const [outcomes, setOutcomes] = useState>(() => new Map()) + const [versions, setVersions] = useState>(() => new Map()) + const [selected, setSelected] = useState>(() => new Set()) + const [acting, setActing] = useState(null) + const [summary, setSummary] = useState<{ action: CatalogReviewAction; ok: number; conflicts: number; failed: number } | null>(null) + const [batchError, setBatchError] = useState(null) + const [progress, setProgress] = useState(null) + const [progressError, setProgressError] = useState(false) + const [reloadSeq, setReloadSeq] = useState(0) + const loadSeq = useRef(0) + const itemsRef = useRef(items) + itemsRef.current = items + const outcomesRef = useRef(outcomes) + outcomesRef.current = outcomes + const versionsRef = useRef(versions) + versionsRef.current = versions + const allRef = useRef(null) + const radio = useRadioGroup(REVIEW_KINDS, kind, (k) => onParams({ kind: k })) + + const loadProgress = useCallback(() => { + api.dataCatalog.reviewProgress(sourceId).then((p) => { setProgress(p); setProgressError(false) }, () => setProgressError(true)) + }, [sourceId]) + useEffect(() => { loadProgress() }, [loadProgress]) + + // 第一页：筛选变了、点了刷新就从头取，审阅过的标记、选择、汇总都清掉 + useEffect(() => { + const mine = ++loadSeq.current + setItems(null) + setLoadError(null) + api.dataCatalog.reviewQueue(sourceId, { limit: REVIEW_PAGE, offset: 0, kind, table: table || null }).then((q) => { + if (mine !== loadSeq.current) return + setItems(q.items) + setTotal(q.total) + setOutcomes(new Map()) + setVersions(new Map()) + setSelected(new Set()) + setSummary(null) + setBatchError(null) + }, (e) => { if (mine === loadSeq.current) setLoadError(e) }) + }, [sourceId, kind, table, reloadSeq]) + + const refresh = () => { + setReloadSeq((n) => n + 1) + loadProgress() + } + + /** + * 再载入一页。服务端的队列里已经没有审阅成功、不再是推断的项：偏移按「这一页上还在服务端队列里的项」数， + * 不会跳过没载入的项 + */ + const loadMore = async () => { + const list = itemsRef.current + if (!list || loadingMore) return + const gone = list.filter((i) => statusOf(i, outcomes.get(itemKey(i))) !== 'proposed').length + setLoadingMore(true) + try { + const q = await api.dataCatalog.reviewQueue(sourceId, { limit: REVIEW_PAGE, offset: list.length - gone, kind, table: table || null }) + setItems((cur) => { + const have = new Set((cur ?? []).map(itemKey)) + return [...(cur ?? []), ...q.items.filter((i) => !have.has(itemKey(i)))] + }) + setTotal(q.total + gone) + } catch (e) { + toast.error(e) + } finally { + setLoadingMore(false) + } + } + + // 右栏的表详情载入、改过：这张表的项按最新的目录换状态 + const syncSeen = useRef(detailSync?.seq ?? 0) + useEffect(() => { + if (!detailSync || detailSync.seq === syncSeen.current) return + syncSeen.current = detailSync.seq + const list = itemsRef.current + if (!list) return + const d = detailSync.detail + if (!list.some((i) => i.table_name === d.table_name)) return + const next = syncFromDetail(list, d.table_name, d.notes, d.version, outcomesRef.current, versionsRef.current) + setOutcomes(next.outcomes) + setVersions(next.versions) + loadProgress() + }, [detailSync, loadProgress]) + + const act = async (action: CatalogReviewAction) => { + const list = itemsRef.current ?? [] + const targets = batchTargets(list, selected, action, outcomes) + if (!targets.length || acting) return + if (targets.length > REVIEW_BATCH_MAX) { + setBatchError(RT.tooMany(REVIEW_BATCH_MAX)) + return + } + if (action !== 'reset') { + const ok = await confirmDialog(action === 'confirm' + ? { title: RT.confirmTitle(targets.length), consequences: RT.confirmConsequences, confirmLabel: RT.confirmAction(targets.length) } + : { title: RT.rejectTitle(targets.length), consequences: RT.rejectConsequences, confirmLabel: RT.rejectAction(targets.length), danger: true }) + if (!ok) return + } + setActing(action) + setBatchError(null) + try { + const { results } = await api.dataCatalog.reviewBatch(sourceId, targets.map((i) => ({ + table_name: i.table_name, path: i.path, action, if_version: versions.get(i.table_name) ?? i.version, + }))) + const next = applyResults(results, action, outcomes, versions) + setOutcomes(next.outcomes) + setVersions(next.versions) + setSelected(new Set()) + const ok = results.filter((r) => r.ok) + const conflicts = results.filter((r) => !r.ok && next.outcomes.get(itemKey(r))?.kind === 'conflict').length + setSummary({ action, ok: ok.length, conflicts, failed: results.length - ok.length - conflicts }) + if (ok.length) onChanged([...new Set(ok.map((r) => r.table_name))]) + loadProgress() + } catch (e) { + setBatchError(RT.failedAll(errorMessage(e))) + } finally { + setActing(null) + } + } + + // 按表筛选的候选：有推断项的表（使用次数多的在前），正在筛的那张不在里面也列上 + const tableOptions = useMemo(() => { + const list = rows.filter((r) => r.counts.proposed > 0) + if (table && !list.some((r) => r.table_name === table)) { + const row = rows.find((r) => r.table_name === table) + return [...list, row ?? ({ table_name: table, label: null, counts: { proposed: 0 } } as unknown as CatalogTableRow)] + } + return list + }, [rows, table]) + const labelOf = useMemo(() => new Map(rows.map((r) => [r.table_name, r.label])), [rows]) + + const loaded = items ?? [] + const picked = loaded.filter((i) => selected.has(itemKey(i))).length + const all = loaded.length > 0 && picked === loaded.length + useEffect(() => { + if (allRef.current) allRef.current.indeterminate = picked > 0 && !all + }, [picked, all]) + const toggleAll = () => setSelected(all ? new Set() : new Set(loaded.map(itemKey))) + const toggle = useCallback((key: string) => setSelected((cur) => { + const next = new Set(cur) + if (next.has(key)) next.delete(key) + else next.add(key) + return next + }), []) + const counts = { + confirm: batchTargets(loaded, selected, 'confirm', outcomes).length, + reject: batchTargets(loaded, selected, 'reject', outcomes).length, + reset: batchTargets(loaded, selected, 'reset', outcomes).length, + } + const filtered = kind !== 'all' || !!table + const remaining = Math.max(0, total - loaded.length) + + return ( +
+ +
+
+ {REVIEW_KINDS.map((k) => ( + + ))} +
+
+ + + +
+
+ + + {selected.size ? RT.selected(selected.size) : items ? RT.total(total) : RT.loading} + + {selected.size > 0 && ( + + )} +
+
+ + {summary && ( +

+ {summary.conflicts || summary.failed + ? + : } + {RT.summary(summary.action, summary.ok, summary.conflicts, summary.failed)} +

+ )} + {batchError &&
{batchError}
} + +
+ {loadError + ?
+ : !items + ?
+ : !items.length + ? ( + } title={filtered ? RT.emptyFiltered : RT.empty} + body={filtered ? RT.emptyFilteredBody : RT.emptyBody} offline={false} className="!py-10" /> + ) + : ( +
    + {items.map((i) => { + const key = itemKey(i) + return ( + + ) + })} +
+ )} + {items && remaining > 0 && ( +
+ +
+ )} +
+ + {selected.size > 0 && ( +
+ {RT.selected(selected.size)} + + + + +
+ )} +
+ ) +} + +/** 队列里的一行：复选框、位置和所在表、值、说明、为什么排在这里、来源和状态（审阅过的写结果）、所在表的使用次数 */ +const QueueRow = memo(function QueueRow({ item: i, itemKeyText, tableLabel, outcome, checked, active, onToggle, onOpen }: { + item: CatalogReviewItem + itemKeyText: string + tableLabel: string | null + outcome: ItemOutcome | undefined + checked: boolean + active: boolean + onToggle: (key: string) => void + onOpen: (item: CatalogReviewItem) => void +}) { + const status = statusOf(i, outcome) + // 位置按 path 说（「列 status 的码值」）：服务端的 field_label 只是字段的叫法，列级的项只写它分不清是哪一列 + const where = reviewWhere(i) + const tableText = tableLabel ? `${tableLabel}（${i.table_name}）` : i.table_name + const mono = i.field === 'valid_filter' || i.field === 'keys' + return ( +
  • + {active && } + + onToggle(itemKeyText)} aria-label={RT.select(where, i.table_name)} + data-review-select="" /> + + +
    • + ) +}) + +/** + * 审阅进度：常用表、全部表、影响数字的项，三行同一个口径——已确认 ÷（已确认 + 待确认），已驳回的、有确证的不计入， + * 审完了就是 100%。常用表只算被运行用过的（最多 top_n 张），标签写实际几张，一张都没有时写明还没有运行用过的表。 + * 数字写在字里，色条只给眼睛看 + */ +function ProgressBlock({ progress, failed }: { progress: CatalogReviewProgress | null; failed: boolean }) { + if (!progress) { + return ( +
    + {failed ? RT.progressFailed : } +
    + ) + } + const { top, all, facts } = progress + const topTables = Math.max(0, top.tables ?? 0) + const topLine = confirmProgress(top.items_confirmed, top.items_proposed) + const allLine = confirmProgress(all.items_confirmed, all.items_proposed) + const factsLine = confirmProgress(facts.confirmed, facts.proposed) + return ( +
    + {topTables > 0 + ? ( + + ) + : ( +
    + {RT.progressTopNone} + {RT.progressTopEmpty} +
    + )} + + 0} /> +
    + ) +} + +function ProgressLine({ label, hint, line, total, attr, warn = false }: { + label: string + hint: string + line: ReturnType + /** 这一行一共几项（全部状态）：0 时写还没有目录项；不知道时为 null */ + total: number | null + attr: string + warn?: boolean +}) { + const text = RT.progressText(line.pct, line.confirmed, line.proposed, total) + return ( +
    +
    + {label} + {text} +
    + {line.pct != null && ( +
    +
    +
    + )} +
    + ) +} + +/** 审阅视图里没打开项时的右栏：怎么排的序、点开能看到什么 */ +export function ReviewOverview() { + return ( +
    +
    +

    {RT.overviewTitle}

    +

    {RT.overviewBody}

    +

    {RT.kindHint.facts}

    +
    +
    + ) +} diff --git a/frontend/src/pages/catalog/TableAssistant.tsx b/frontend/src/pages/catalog/TableAssistant.tsx new file mode 100644 index 00000000..2d0e0648 --- /dev/null +++ b/frontend/src/pages/catalog/TableAssistant.tsx @@ -0,0 +1,616 @@ +import { memo, useCallback, useEffect, useId, useMemo, useRef, useState } from 'react' +import type { KeyboardEvent as ReactKeyboardEvent } from 'react' +import { ArrowUp, BookMarked, Database, Info, MessagesSquare, Minus, Plus, Square, Trash2, X } from 'lucide-react' +import clsx from 'clsx' +import { ApiError, api, streamCatalogAssistant } from '../../api/client' +import type { CatalogAssistantEnd } from '../../api/client' +import type { CatalogDetail } from '../../types' +import { Notice, Spinner, confirmDialog, isComposing, toast } from '../../components/ui' +import { useLeaveGuard } from '../../lib/leave' +import { CATALOG_ASSISTANT_TEXT as T, CATALOG_STATUS_LABEL } from '../../lib/terms' +import { Markdown } from '../../run/Markdown' +import { patchValueText } from '../../run/catalogPatch' +import { + ASSISTANT_MAX_CHARS, ASSISTANT_MAX_SAVE, QUERY_ROWS_SHOWN, applyEvent, applyPreview, assistantChangesOf, blankColumnsOf, blankLeadOf, + changeStateOf, changeWhere, dropPending, historyOf, mergeProposal, pendingForAssistant, pendingSubmit, pendingVersion, savedKey, +} from './assistant' +import type { AssistantTurn, ChangeState, PendingChange, Turn, TurnPart } from './assistant' + +// =========================================================================== +// 表助手：在表详情里和助手对话完善这一张表的数据目录（POST /catalog/{table}/assistant，事件流）。 +// +// 回答流式显示，能停止；助手跑过的只读查询（只有开了数据剖析的源才有）写 SQL 和前几行，默认收起；修改提案逐项写改前、 +// 改后、依据，可以逐项去掉、加回。提案并进「待保存的修改」：跨多轮累积，同一项以最后一次提案为准，一键保存（最多 200 项）。 +// 保存带待保存的修改里最早那条提案对照的版本：别人在那之后改过就 409，按最新内容重算（预览接口，只读）后停下来让人再看 +// 一眼；只重算交去保存的那几项，保存期间回答里又到的提案原样留着。对话不存服务端：每一轮把前面的对话和待保存的修改 +// （最多 200 项）一起交上去；关闭、换表、离开页面就没有了，有待保存的修改时先问。 +// 开场：上次起草有留空的列时，引导先问这几列——列名取那次起草记下的（任务里这张表的 blank_sample），拿不到时改说目录里 +// 还没有中文名和含义的列。 +// =========================================================================== + +type SaveState = + | { phase: 'idle'; error?: string | null; saved?: { n: number; version: number } | null } + | { phase: 'saving' } + | { phase: 'reloading' } + | { phase: 'conflict'; problems: string[] } + +const charCount = (s: string) => [...s.trim()].length + +export function TableAssistant({ sourceId, table, tableLabel, detail, profileEnabled, lastBlank, editing, onSaved, onClose }: { + sourceId: string + table: string + /** 表的中文名（没有就是表名）：标题、提示里用 */ + tableLabel: string + /** 页面上这张表最新的目录：留空的列、保存后更新 */ + detail: CatalogDetail + /** 数据源开了数据剖析：助手才能发只读查询 */ + profileEnabled: boolean + /** + * 上次起草模型拿不准、留空的列数（n）和出处：开场引导先问这几列。jobId 是那次起草的任务（从中取起草时记下的列名）； + * earlier：最近一次停止了，n 是再之前那次起草记下的（不知道是哪一次，取不到列名） + */ + lastBlank: { n: number; earlier: boolean; jobId: string | null } + /** 正在编辑这张表：先不让保存（同一张表两处同时改，保存会撞上版本冲突） */ + editing: boolean + /** 保存成功：页面换上返回的目录 */ + onSaved: (d: CatalogDetail) => void + /** 关上面板（有待保存的修改时这里先问过了） */ + onClose: () => void +}) { + const [turns, setTurns] = useState([]) + const [pending, setPending] = useState([]) + const [saved, setSaved] = useState>(() => new Set()) + const [text, setText] = useState('') + const [save, setSave] = useState({ phase: 'idle' }) + const [trayOpen, setTrayOpen] = useState(true) + const turnsRef = useRef(turns) + turnsRef.current = turns + const pendingRef = useRef(pending) + pendingRef.current = pending + const stopRef = useRef<(() => void) | null>(null) + const seq = useRef(0) + const inputRef = useRef(null) + const logRef = useRef(null) + const titleId = useId() + const streaming = turns.some((t) => t.role === 'assistant' && t.state === 'streaming') + const dirty = pending.length > 0 || streaming + + // 打开时焦点给输入框；卸下时停掉进行中的回答 + useEffect(() => { inputRef.current?.focus() }, []) + useEffect(() => () => { stopRef.current?.() }, []) + + useLeaveGuard(pending.length > 0, () => confirmDialog({ + title: T.leaveTitle, consequences: T.leaveConsequences, confirmLabel: T.leaveConfirm, danger: true, + })) + + // 新的内容到了：滚到底（人往上翻着看的时候不打扰） + const lastLen = useRef(0) + useEffect(() => { + const el = logRef.current + if (!el) return + const size = turns.reduce((n, t) => n + (t.role === 'user' ? 1 : t.parts.length + 1), 0) + const near = el.scrollHeight - el.scrollTop - el.clientHeight < 160 + if (size !== lastLen.current || near) el.scrollTop = el.scrollHeight + lastLen.current = size + }, [turns]) + + // 上次起草记下的留空列名：从那次起草的任务里取（null 是还没取回来；取不到是空数组，改说目录里还没有中文名和含义的列） + const blankN = lastBlank.n + const blankJob = blankN > 0 && !lastBlank.earlier ? lastBlank.jobId : null + const [blankSample, setBlankSample] = useState(null) + useEffect(() => { + if (!blankJob) return + let live = true + setBlankSample(null) + api.dataCatalog.draftJob(sourceId, blankJob) + .then(({ job }) => job.tasks.find((t) => t.table_name === table)?.blank_sample?.filter(Boolean) ?? []) + .catch(() => [] as string[]) + .then((cols) => { if (live) setBlankSample(cols) }) + return () => { live = false } + }, [sourceId, table, blankJob]) + // 没有留空的列、还在取那次起草记下的列名时不写 + const blankLead = useMemo(() => (blankN <= 0 || (blankJob && blankSample == null) + ? null : blankLeadOf(blankN, blankJob ? blankSample : null, blankColumnsOf(detail))), [blankN, blankJob, blankSample, detail]) + const hasProposed = useMemo(() => { + const n = detail.notes + const items = [n.label, n.description, n.grain, n.keys, n.kind, n.business_date, n.valid_filter, n.dedup, + ...Object.values(n.columns ?? {}).flatMap((c) => Object.values(c ?? {})), ...(n.relations ?? [])] + return items.some((it) => !!it && (it as { status?: string }).status === 'proposed') + }, [detail]) + + const updateTurn = useCallback((id: string, fn: (t: AssistantTurn) => AssistantTurn) => { + setTurns((ts) => ts.map((t) => (t.id === id && t.role === 'assistant' ? fn(t) : t))) + }, []) + + const send = useCallback((raw: string) => { + const question = raw.trim() + if (!question || charCount(question) > ASSISTANT_MAX_CHARS) return + if (turnsRef.current.some((t) => t.role === 'assistant' && t.state === 'streaming')) return + const n = ++seq.current + const userTurn: Turn = { id: `u${n}`, role: 'user', text: question } + const reply: AssistantTurn = { id: `a${n}`, role: 'assistant', parts: [], state: 'streaming' } + const messages = historyOf(turnsRef.current, question) + setTurns((ts) => [...ts, userTurn, reply]) + setText('') + let proposals = 0 + // 这一轮已经收尾（done、error）：之后再来的事件不认 + let ended = false + stopRef.current = streamCatalogAssistant(sourceId, table, { messages, pending: pendingForAssistant(pendingRef.current) }, (ev) => { + if (ended) return + if (ev.type === 'done' || ev.type === 'error') ended = true + if (ev.type === 'proposal') { + const pid = `${reply.id}.p${++proposals}` + const changes = assistantChangesOf(ev.changes) + updateTurn(reply.id, (t) => applyEvent(t, ev, pid)) + if (changes.length) { + const version = typeof ev.version === 'number' && Number.isFinite(ev.version) ? ev.version : detail.version + setPending((cur) => mergeProposal(cur, changes, pid, version)) + // 待保存的修改变了：上一次保存的结果、冲突的说明都不再对。正在保存、重算的不动（按钮照旧不能点，结果出来再说） + setSave((s) => (s.phase === 'saving' || s.phase === 'reloading' ? s : { phase: 'idle' })) + } + return + } + updateTurn(reply.id, (t) => applyEvent(t, ev, '')) + }, (end: CatalogAssistantEnd) => { + stopRef.current = null + updateTurn(reply.id, (t) => { + if (t.state !== 'streaming') return t + if (end.aborted) return { ...t, state: 'stopped' } + if (end.error) return { ...t, state: 'error', error: end.error, code: end.code ?? null } + // 流结束了却没有 done：这一轮没答完 + return { ...t, state: 'error', error: T.interrupted } + }) + }) + }, [sourceId, table, detail.version, updateTurn]) + + const stop = () => stopRef.current?.() + + const onKeyDown = (e: ReactKeyboardEvent) => { + if (e.key !== 'Enter' || e.shiftKey || isComposing(e)) return + e.preventDefault() + if (!streaming) send(text) + } + + // 两个回调保持不变：流式的正文每来一段只重画正在回答的那一轮 + const drop = useCallback((path: string) => setPending((cur) => dropPending(cur, path)), []) + const restore = useCallback((part: Extract, path: string) => { + const change = part.changes.find((c) => c.path === path) + if (change) setPending((cur) => mergeProposal(cur, [change], part.id, part.version)) + }, []) + const clearAll = async () => { + if (!pendingRef.current.length) return + if (!(await confirmDialog({ title: T.clearTitle(pendingRef.current.length), confirmLabel: T.clearConfirm, danger: true }))) return + setPending([]) + setSave({ phase: 'idle' }) + } + + const doSave = async () => { + const list = pendingRef.current + if (!list.length || list.length > ASSISTANT_MAX_SAVE || editing) return + setSave({ phase: 'saving' }) + try { + const d = await api.dataCatalog.patch(sourceId, table, pendingSubmit(list), pendingVersion(list)) + setSaved((cur) => new Set([...cur, ...list.map((p) => savedKey(p.origin, p.path))])) + setPending((cur) => cur.filter((p) => !list.includes(p))) + setSave({ phase: 'idle', saved: { n: list.length, version: d.version } }) + onSaved(d) + toast.ok(T.savedToast(list.length, tableLabel)) + } catch (e) { + if (e instanceof ApiError && e.status === 409) { + // 别人刚改过：按最新内容重算（只读），停下来让人再看一眼 + setSave({ phase: 'reloading' }) + try { + const p = await api.dataCatalog.patchPreview(sourceId, table, pendingSubmit(list)) + // 只重算交去保存的那几项：保存、重算期间回答里又到的提案不在预览里，原样留着 + setPending((cur) => applyPreview(cur, p, list)) + setSave({ phase: 'conflict', problems: p.problems }) + } catch { + setSave({ phase: 'idle', error: T.conflictFailed }) + } + } else if (e instanceof ApiError && e.kind === 'http' && (e.status === 422 || e.status === 404)) { + setSave({ phase: 'idle', error: e.message }) + } else { + setSave({ phase: 'idle' }) + toast.error(e) + } + } + } + + const close = async () => { + if (dirty && !(await confirmDialog({ title: T.closeTitle, consequences: T.closeConsequences, confirmLabel: T.closeConfirm, danger: true }))) return + stopRef.current?.() + onClose() + } + + const onPanelKey = (e: ReactKeyboardEvent) => { + if (e.key !== 'Escape' || isComposing(e) || e.defaultPrevented) return + e.preventDefault() + void close() + } + + const fresh = turns.length === 0 + const len = charCount(text) + const over = len > ASSISTANT_MAX_CHARS + const lastAssistant = [...turns].reverse().find((t): t is AssistantTurn => t.role === 'assistant') + const status = streaming ? T.answering : lastAssistant?.state === 'stopped' ? T.stopped : lastAssistant ? T.answered : '' + + return ( +