diff --git a/src/commands/app/clear.ts b/src/commands/app/clear.ts index 59e6877..b128ae3 100644 --- a/src/commands/app/clear.ts +++ b/src/commands/app/clear.ts @@ -430,9 +430,53 @@ async function fetchDbPreview(appCode: string): Promise { if (res.code !== 200 || !res.data) { throw new DacliError(`ssw-common /api/ssw/db/clear preview 失败: code=${res.code} ${res.msg}`) } + // v3.1+ P1-2 follow-up (ADR 0014 §2): 业务库 fallback + // 当 ssw-common 返 bizTables=[] (PG schema 共享库 jxcj + openConn(jxcj) 失败场景, 见 docs 0014 §已知风险) + // 自动 fallback 走 dacli dm list 端点 — 但仅在 token 当前 appCode 一致时 (避免跨 app 误报) + if (res.data.bizTables.length === 0 && res.data.dbConn) { + const tokenC = await JnpfClient.fromToken() + if (tokenC.appCode === appCode && tokenC.dbLinkId) { + try { + const fallbackBizTables = await fetchBizTablesViaDmList(tokenC, appCode) + if (fallbackBizTables.length > 0) { + log.warn(`⚠ ssw-common 业务库 preview 返空, fallback 走 dacli dm list 找到 ${fallbackBizTables.length} 张表 (跨 schema 共享库场景)`) + res.data.bizTables = fallbackBizTables + } + } catch (e) { + log.warn(`(业务库 fallback 也失败: ${(e as Error).message?.slice(0, 100)})`) + } + } else { + log.warn(`⚠ ssw-common 业务库 preview 返空, 但 token 当前 appCode=${tokenC.appCode} ≠ ${appCode}, 跳过 fallback`) + log.warn(` 如需看 ${appCode} 真实业务表, 请: dacli app login --appCode=${appCode}`) + } + } return res.data } +/** + * P1-2 follow-up: 走 dacli dm list 端点 (webapi loadDataModel.getDataModelList) + * 列出当前 token appCode 的业务表 — 仅 token.appCode === appCode 时调用 + * 注意: 返回的 rowCount=0 (dacli dm list 不查 row count; ssw-common preview 才有), + * 但表名清单能确认"哪些表会被清" 避免 ssw-common 漏识别导致用户不知情 + */ +async function fetchBizTablesViaDmList( + c: Awaited>, + appCode: string, +): Promise { + // v2.1+ 接三层: webapi 镜像优先 + const { initWebapi: initDmWebapi, loadDataModel } = await import('../../webapi/dataModel.ts') + await initDmWebapi(c) + if (!c.dbLinkId) return [] + const resp = (await loadDataModel.getDataModelList({ + linkId: c.dbLinkId, + currentPage: 1, + pageSize: 1000, + })) as { list: { table: string }[] } + const list = resp?.list || (Array.isArray(resp) ? (resp as { table: string }[]) : []) + // rowCount=0 (dacli dm list 不查; 用于透明显示"这些表会被清") + return list.map((t) => ({ name: t.table, rowCount: 0 })) +} + async function executeDbClear(appCode: string, dbTs: string): Promise { const c = await JnpfClient.fromToken() const res = await c.postJson('/ssw/db/clear', {