From 1483af474cb35c02bd0845530006eed68b3b08b6 Mon Sep 17 00:00:00 2001 From: ThearchyHelios Date: Sun, 4 Oct 2026 02:11:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9B=AE=E5=BD=95=20F2b=20/?= =?UTF-8?q?=20B8=EF=BC=9A=E7=A1=AE=E8=AE=A4=E5=90=AB=E4=B9=89=E8=BF=98?= =?UTF-8?q?=E7=A9=BA=E7=9D=80=E7=9A=84=E7=A0=81=E5=80=BC=E6=97=B6=E5=85=88?= =?UTF-8?q?=E8=AF=B4=E6=B8=85=E6=A5=9A=E2=80=94=E2=80=94=E3=80=8C=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E6=9C=AC=E5=88=97=E6=8E=A8=E6=96=AD=E3=80=8D=E5=8E=9F?= =?UTF-8?q?=E6=9C=AC=E4=B8=80=E9=94=AE=E7=A1=AE=E8=AE=A4=EF=BC=8C=E3=80=8C?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=9C=AC=E8=A1=A8=E5=85=A8=E9=83=A8=E6=8E=A8?= =?UTF-8?q?=E6=96=AD=E3=80=8D=E5=92=8C=E5=8D=95=E9=A1=B9=E3=80=8C=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E3=80=8D=E4=B9=9F=E4=B8=80=E6=A0=B7=EF=BC=8C=E7=A0=81?= =?UTF-8?q?=E5=80=BC=E9=87=8C=E6=9C=89=E5=90=AB=E4=B9=89=E5=BE=85=E5=A1=AB?= =?UTF-8?q?=E5=86=99=E6=97=B6=E9=97=AE=E4=B8=80=E5=8F=A5=E3=80=8C=E6=9C=89?= =?UTF-8?q?=20N=20=E4=B8=AA=E7=A0=81=E5=80=BC=E7=9A=84=E5=90=AB=E4=B9=89?= =?UTF-8?q?=E5=BE=85=E5=A1=AB=E5=86=99=EF=BC=8C=E7=A1=AE=E8=AE=A4=E7=9A=84?= =?UTF-8?q?=E6=98=AF=E5=8F=96=E5=80=BC=E6=B8=85=E5=8D=95=E3=80=8D=EF=BC=8C?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E5=90=8E=E8=BF=99=E4=BA=9B=E7=A0=81=E5=80=BC?= =?UTF-8?q?=E4=BB=8D=E6=98=BE=E7=A4=BA=E3=80=8C=E5=90=AB=E4=B9=89=E5=BE=85?= =?UTF-8?q?=E5=A1=AB=E5=86=99=E3=80=8D=E3=80=81=E8=BF=98=E8=83=BD=E5=A1=AB?= =?UTF-8?q?=E5=86=99=EF=BC=9B=E8=A1=A5=E6=A3=80=E6=9F=A5=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E7=9A=84=E6=96=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/lib/terms.ts | 5 ++++ frontend/src/pages/catalog/TableDetail.tsx | 30 ++++++++++++++++++- scripts/check-catalog.mjs | 34 ++++++++++++++++++++++ 3 files changed, 68 insertions(+), 1 deletion(-) diff --git a/frontend/src/lib/terms.ts b/frontend/src/lib/terms.ts index 90af3fc9..efd28dc6 100644 --- a/frontend/src/lib/terms.ts +++ b/frontend/src/lib/terms.ts @@ -2520,6 +2520,11 @@ export const CATALOG_UI_TEXT = { // ---- 剖析报告里关系的结论:按这次的实际变化说(原本就是已验证的不说「升为」) relationStillVerified: (coverage: string) => `仍为已验证,覆盖率 ${coverage}`, relationLowered: (reason: string) => `降为推断:${reason}`, + // ---- 确认含义还空着的码值:确认的是取值清单,含义照旧待填写 + codesPendingConfirm: (n: number) => `有 ${formatNumber(n)} 个码值的含义待填写,确认的是取值清单`, + codesPendingAfter: '确认后这些码值仍显示「含义待填写」,之后可以再填写', + confirmColumnTitle: (col: string, n: number) => `确认列 ${col} 的 ${formatNumber(n)} 项推断?`, + confirmCodesTitle: (where: string) => `确认${where}?`, } // =========================================================================== diff --git a/frontend/src/pages/catalog/TableDetail.tsx b/frontend/src/pages/catalog/TableDetail.tsx index 2865b940..2da1df27 100644 --- a/frontend/src/pages/catalog/TableDetail.tsx +++ b/frontend/src/pages/catalog/TableDetail.tsx @@ -189,6 +189,13 @@ export function TableDetail({ sourceId, table, rows, drafted, fillCodes, onFillD const review = useCallback(async (t: ReviewTarget, action: CatalogReviewAction) => { const d = detailRef.current if (!d) return + // 确认一份含义还空着的码值:先说清确认的是取值清单,含义照旧待填写 + if (action === 'confirm') { + const blank = blankCodes(d.notes, (p) => p === t.path) + if (blank.n && !(await confirmDialog({ + title: UT.confirmCodesTitle(t.where), consequences: [UT.codesPendingConfirm(blank.n), UT.codesPendingAfter], confirmLabel: CT.confirm, + }))) return + } const done = await write(t.path, () => api.dataCatalog.review(sourceId, table, { path: t.path, action, if_version: d.version })) if (done) setLive(action === 'reset' && t.source === 'human' ? CT.removed(t.where) : CT.reviewed[action](t.where)) }, [sourceId, table, write]) @@ -199,6 +206,12 @@ export function TableDetail({ sourceId, table, rows, drafted, fillCodes, onFillD const paths = new Set(COLUMN_FIELDS.map((f) => columnPath(col, f))) const { notes, n } = confirmProposed(d.notes, (p) => paths.has(p)) if (!n) return + // 一键确认本来不问;这一列的码值还有含义空着时先问一句:确认的是取值清单,含义照旧待填写 + const blank = blankCodes(d.notes, (p) => paths.has(p)) + if (blank.n && !(await confirmDialog({ + title: UT.confirmColumnTitle(col, n), consequences: [UT.codesPendingConfirm(blank.n), UT.codesPendingAfter, ...CT.confirmAllConsequences], + confirmLabel: CT.confirmAllAction(n), + }))) return const done = await write(`column:${col}`, () => api.dataCatalog.put(sourceId, table, notes, d.version)) if (done) setLive(CT.confirmedN(n)) }, [sourceId, table, write]) @@ -313,8 +326,10 @@ export function TableDetail({ sourceId, table, rows, drafted, fillCodes, onFillD const confirmAll = async () => { const { notes: body, n } = confirmProposed(notes) if (!n) return + const blank = blankCodes(notes) const ok = await confirmDialog({ - title: CT.confirmAllTitle(n, label ?? table), consequences: CT.confirmAllConsequences, confirmLabel: CT.confirmAllAction(n), + title: CT.confirmAllTitle(n, label ?? table), confirmLabel: CT.confirmAllAction(n), + consequences: blank.n ? [...CT.confirmAllConsequences, UT.codesPendingConfirm(blank.n), UT.codesPendingAfter] : CT.confirmAllConsequences, }) if (!ok) return const done = await write('confirm-all', () => api.dataCatalog.put(sourceId, table, body, detail.version)) @@ -502,6 +517,19 @@ export function TableDetail({ sourceId, table, rows, drafted, fillCodes, onFillD ) } +/** + * 要确认的推断码值里,含义还空着的码值有几个(数据剖析给的码值候选只有取值,含义等人填)。pick 挑审阅路径, + * 不给就是整张表。确认的是「这一列只有这些取值」,含义照旧待填写——确认之前要说清楚 + */ +function blankCodes(notes: CatalogDetail['notes'], pick: (path: string) => boolean = () => true): { n: number } { + let n = 0 + for (const [col, items] of Object.entries(notes.columns ?? {})) { + const codes = items?.codes + if (codes && codes.status === 'proposed' && pick(columnPath(col, 'codes'))) n += pendingCodes(codes.value) + } + return { n } +} + // --------------------------------------------------------------------------- // 表级各项 // --------------------------------------------------------------------------- diff --git a/scripts/check-catalog.mjs b/scripts/check-catalog.mjs index c6902a2a..7d5e0f75 100644 --- a/scripts/check-catalog.mjs +++ b/scripts/check-catalog.mjs @@ -986,6 +986,40 @@ await section('数据目录 · 批量确认', async () => { && cb.notes.columns.amount.measure.status === 'confirmed' && cb.notes.columns.qty.label.status === 'proposed' && cb.notes.label.status === 'proposed' && JSON.stringify(cb.notes.columns.amount.unit.value) === JSON.stringify(wideOld.columns.amount.unit.value)) check('……这一行的按钮消失', await until(async () => (await page.locator('[data-confirm-column="amount"]').count()) === 0)) + + // 码值的含义还空着(数据剖析给的候选只有取值):各种确认都先说清确认的是取值清单,确认后照旧写「含义待填写」 + state.tables[S1].find((t) => t.name === 'visits').notes.columns.status.codes = item({ 1: '已入园', 9: '', 2: '' }, 'profile', 'proposed') + await openDetail(page, S1, 'visits') + const puts = () => count(sent, /^PUT |\/review$/) + const put0 = puts() + await page.locator('[data-catalog-confirm-all]').click() + await confirmBox(page).waitFor() + check('「确认本表全部推断」:码值含义还空着时后果里写明确认的是取值清单', (await consequences(page)).includes('有 2 个码值的含义待填写,确认的是取值清单'), + (await consequences(page)).join(' | ')) + await confirmBox(page).getByRole('button', { name: '取消' }).click() + await openMark(page, 'columns.status.codes') + await panel(page).locator('[data-review-action="confirm"]').click() + await confirmBox(page).waitFor() + check('单项「确认」码值:同样先问', (await confirmBox(page).innerText()).includes('确认列 status 的码值?') + && (await consequences(page)).includes('有 2 个码值的含义待填写,确认的是取值清单'), (await confirmBox(page).innerText()).replace(/\s+/g, ' ')) + await confirmBox(page).getByRole('button', { name: '取消' }).click() + await page.locator('[data-confirm-column="status"]').click() + await confirmBox(page).waitFor() + const blankCons = await consequences(page) + check('「确认本列推断」原本一键确认,码值含义还空着时先问:有 2 个码值的含义待填写,确认的是取值清单', + (await confirmBox(page).innerText()).includes('确认列 status 的 2 项推断?') && blankCons.includes('有 2 个码值的含义待填写,确认的是取值清单') + && blankCons.some((c) => c.includes('仍显示「含义待填写」')), blankCons.join(' | ')) + await confirmBox(page).getByRole('button', { name: '取消' }).click() + check('……三处取消都没有提交', puts() === put0, String(puts() - put0)) + await page.locator('[data-confirm-column="status"]').click() + await confirmBox(page).waitFor() + await confirmBox(page).getByRole('button', { name: '确认 2 项' }).click() + await until(async () => puts() === put0 + 1) + const blankCell = page.locator('[data-column="status"] [data-cell="codes"]') + check('……确认后码值记为已确认,空着的仍写「含义待填写」,还能填写', await until(async () => (await markStatus(page, 'columns.status.codes')) === 'confirmed') + && await blankCell.locator('[data-code-pending]').count() === 2 && await blankCell.locator('[data-codes-fill]').count() === 1 + && JSON.stringify(lastBody(sent, /^PUT .*catalog\/visits$/)?.notes?.columns?.status?.codes?.value) === JSON.stringify({ 1: '已入园', 9: '', 2: '' }), + (await blankCell.innerText()).replace(/\s+/g, ' ')) check('只发了整份提交,没有别的写请求', writes(sent, /./).every((s) => /^PUT /.test(s.key)), JSON.stringify(writes(sent, /./).map((s) => s.key))) check('没有原生对话框', natives.length === 0, natives.join(' | ')) check('没有运行时报错', errors.length === 0, errors[0] ?? '')