weaver-e10-builder 1.5.15 → 1.6.0

package/dist/commands/report-cell.js

@@ -0,0 +1,365 @@
+import { withReport } from './report.js';
+import { applyCellEdit, findCell, jsonArrayOf, parseCellRef, } from '../services/report/cell-edit.js';
+import { buildCustomFilterEntry, buildResultFilterEntry, describeFilter, isOptionField, loadDatasetFields, readCellFilters, resolveDatasetField, resolveFilterOp, resolveOptionValueKey, splitValues, } from '../services/report/cell-filter.js';
+import { openTypeLabel, readCellEvents, resolveOpenType, validateCellLink, } from '../services/report/cell-event.js';
+function filterFlag(kind) {
+    return kind === 'custom' ? 'customFilterField' : 'dataFilterField';
+}
+function parseKind(input) {
+    const raw = String(input ?? 'custom').trim().toLowerCase();
+    if (raw === 'custom' || raw === '自定义' || raw === '自定义筛选')
+        return 'custom';
+    if (raw === 'result' || raw === '结果' || raw === '结果筛选')
+        return 'result';
+    throw new Error(`--kind 只认 custom / result（收到「${input}」）`);
+}
+/** 单元格自己的数据字段（筛选默认作用在它所属的数据集上）。 */
+function ownFieldOf(cell) {
+    return {
+        name: String(cell?.name ?? ''),
+        text: String(cell?.text ?? ''),
+        nameIndex: String(cell?.nameIndex ?? ''),
+    };
+}
+function listCellFilters(fields) {
+    const out = [];
+    for (const f of fields || []) {
+        const r = readCellFilters(f);
+        if (r.custom.length)
+            out.push({ cell: `${f.x},${f.y}`, text: String(f.text ?? ''), kind: 'custom', conditions: r.custom });
+        if (r.result.length)
+            out.push({ cell: `${f.x},${f.y}`, text: String(f.text ?? ''), kind: 'result', conditions: r.result });
+    }
+    return out;
+}
+export function registerReportCellCommands(report, program) {
+    // ── 单元格筛选 ────────────────────────────────────────────
+    const cf = report
+        .command('cell-filter')
+        .description('单元格筛选（「单元格设置 → 筛选」）：自定义筛选 / 结果筛选，写入后回读校验');
+    cf.command('list')
+        .argument('<reportId>', '报表 ID')
+        .requiredOption('--app-id <id>', '应用 ID')
+        .option('--json', 'JSON 输出')
+        .description('列出报表里所有带筛选的单元格')
+        .action(async (reportId, raw) => {
+        await withReport(program, raw.appId, async (http, json) => {
+            const { getReportDevInfo } = await import('../services/report/reports.js');
+            const dev = await getReportDevInfo(http, reportId);
+            const rows = listCellFilters(dev.fields || []);
+            if (json || raw.json) {
+                console.log(JSON.stringify(rows, null, 2));
+                return;
+            }
+            if (!rows.length) {
+                console.log('该报表没有单元格筛选。');
+                return;
+            }
+            for (const r of rows) {
+                console.log(`${r.cell}\t${r.text}\t${r.kind === 'custom' ? '自定义筛选' : '结果筛选'} (${r.conditions.length})`);
+                r.conditions.forEach((c) => console.log(`  - ${describeFilter(c)}`));
+            }
+        });
+    });
+    cf.command('set')
+        .argument('<reportId>', '报表 ID')
+        .requiredOption('--app-id <id>', '应用 ID')
+        .requiredOption('--cell <行,列>', '目标单元格坐标，如 1,0（x=行，y=列）')
+        .requiredOption('--op <算子>', '等于/不等于/大于/包含/开头是/为空…；结果筛选用 前多少个/后多少个/奇数/偶数/特定')
+        .option('--field <名称>', '被筛选字段（缺省 = 该单元格自己的字段）')
+        .option('--value <值>', '筛选值；选项类字段可用逗号分隔多个（写选项名或 valueKey）')
+        .option('--kind <custom|result>', '筛选类型：custom=自定义筛选（缺省）/ result=结果筛选', 'custom')
+        .option('--append', '追加到已有条件后面（缺省是替换该格该类筛选）')
+        .option('--json', 'JSON 输出')
+        .description('设置单元格筛选并落库（写入 fields 与 workbook，保存后回读比对）')
+        .action(async (reportId, raw) => {
+        const ref = parseCellRef(raw.cell);
+        const kind = parseKind(raw.kind);
+        if (kind === 'result' && raw.field) {
+            throw new Error('结果筛选按行号/奇偶/特定行过滤，不针对字段，不要给 --field');
+        }
+        const op = resolveFilterOp(kind, raw.op);
+        if (kind === 'custom') {
+            const valueRequired = !['Null', 'NotNull'].includes(op);
+            if (valueRequired && raw.value === undefined) {
+                throw new Error(`算子「${raw.op}」需要一个 --value`);
+            }
+        }
+        else if (['Before', 'Last', 'Designates'].includes(op) && raw.value === undefined) {
+            throw new Error(`结果筛选「${raw.op}」需要一个 --value（数量/序号）`);
+        }
+        await withReport(program, raw.appId, async (http, json) => {
+            const { getReportDevInfo } = await import('../services/report/reports.js');
+            const dev = await getReportDevInfo(http, reportId);
+            const fields = dev.fields || [];
+            const cell = findCell(fields, ref);
+            const own = ownFieldOf(cell);
+            if (!cell.dataSetId || !own.nameIndex) {
+                throw new Error(`单元格 (${ref.x},${ref.y}) 不是数据字段格，不能挂筛选`);
+            }
+            // 解析被筛选字段（默认就是本格字段）
+            let targetName = own.name;
+            let targetText = own.text;
+            let value;
+            if (kind === 'custom') {
+                if (raw.field) {
+                    const metaFields = await loadDatasetFields(http, String(cell.dataSetId), reportId, raw.appId);
+                    const meta = metaFields.length
+                        ? resolveDatasetField(metaFields, raw.field)
+                        : (() => { throw new Error('取不到数据集字段清单，无法解析 --field，请只筛本单元格字段'); })();
+                    targetName = String(meta.name);
+                    targetText = String(meta.text || meta.name);
+                    if (isOptionField(meta) && raw.value !== undefined) {
+                        value = splitValues(raw.value).map((v) => resolveOptionValueKey(meta, v));
+                    }
+                    else if (raw.value !== undefined) {
+                        value = String(raw.value);
+                    }
+                }
+                else if (raw.value !== undefined) {
+                    // 本格字段：也尝试按数据集元数据解析选项
+                    const metaFields = await loadDatasetFields(http, String(cell.dataSetId), reportId, raw.appId);
+                    const meta = metaFields.find((f) => String(f.name) === own.name) || metaFields.find((f) => String(f.text) === own.text);
+                    if (meta && isOptionField(meta)) {
+                        value = splitValues(raw.value).map((v) => resolveOptionValueKey(meta, v));
+                    }
+                    else {
+                        value = String(raw.value);
+                    }
+                }
+            }
+            else if (raw.value !== undefined) {
+                value = String(raw.value);
+            }
+            const fieldKey = `${String(cell.dataSetId)}.${own.nameIndex}.${targetName}`;
+            const key = filterFlag(kind);
+            // 一次算好目标条件（重试时也按同一份写，避免追加语义在重读后重复叠加）
+            const current = readCellFilters(cell)[kind === 'custom' ? 'custom' : 'result'];
+            const nextIndex = current.length + 1;
+            const entry = kind === 'custom'
+                ? buildCustomFilterEntry(fieldKey, op, value, nextIndex)
+                : buildResultFilterEntry(op, String(value ?? ''), nextIndex);
+            const want = raw.append ? [...current, entry] : [entry];
+            const result = await applyCellEdit(http, {
+                http,
+                appId: raw.appId,
+                reportId,
+                ...ref,
+                patchFields: (fs) => {
+                    const c = findCell(fs, ref);
+                    c[key] = JSON.stringify(want);
+                },
+                patchCellType: (ct) => {
+                    ct[key] = want;
+                },
+                verify: (c) => {
+                    const got = jsonArrayOf(c[key]);
+                    const errors = [];
+                    if (JSON.stringify(got) !== JSON.stringify(want)) {
+                        errors.push(`${key} 回读=${JSON.stringify(got)}，期望=${JSON.stringify(want)}`);
+                    }
+                    return errors;
+                },
+            });
+            const stored = jsonArrayOf(result.cell[key]);
+            const text = `${kind === 'custom' ? '自定义筛选' : '结果筛选'} 已写入 (${ref.x},${ref.y}) ${targetText}`;
+            if (json || raw.json) {
+                console.log(JSON.stringify({ ok: true, reportId, cell: `${ref.x},${ref.y}`, kind, fieldKey, conditions: stored }, null, 2));
+            }
+            else {
+                console.log(text);
+                stored.forEach((c) => console.log(`  - ${describeFilter(c)}`));
+            }
+        });
+    });
+    cf.command('remove')
+        .argument('<reportId>', '报表 ID')
+        .requiredOption('--app-id <id>', '应用 ID')
+        .requiredOption('--cell <行,列>', '目标单元格坐标，如 1,0')
+        .option('--kind <custom|result>', '只清某一类；缺省两类都清')
+        .option('--json', 'JSON 输出')
+        .description('清空某个单元格上的筛选条件')
+        .action(async (reportId, raw) => {
+        const ref = parseCellRef(raw.cell);
+        const kinds = raw.kind ? [parseKind(raw.kind)] : ['custom', 'result'];
+        await withReport(program, raw.appId, async (http, json) => {
+            const result = await applyCellEdit(http, {
+                http,
+                appId: raw.appId,
+                reportId,
+                ...ref,
+                patchFields: (fs) => {
+                    const c = findCell(fs, ref);
+                    for (const k of kinds)
+                        c[filterFlag(k)] = '[]';
+                },
+                patchCellType: (ct) => {
+                    for (const k of kinds)
+                        ct[filterFlag(k)] = [];
+                },
+                verify: (c) => kinds.flatMap((k) => jsonArrayOf(c[filterFlag(k)]).length
+                    ? [`${filterFlag(k)} 回读仍非空：${JSON.stringify(c[filterFlag(k)])}`]
+                    : []),
+            });
+            if (json || raw.json) {
+                console.log(JSON.stringify({ ok: true, reportId, cell: `${ref.x},${ref.y}`, cleared: kinds }, null, 2));
+            }
+            else {
+                console.log(`已清空 (${ref.x},${ref.y}) 的${kinds.map((k) => (k === 'custom' ? '自定义筛选' : '结果筛选')).join(' / ')}`);
+            }
+            void result;
+        });
+    });
+    // ── 单元格事件（链接） ────────────────────────────────────
+    const ce = report
+        .command('cell-event')
+        .description('单元格事件（「事件」Tab）：PC/H5 链接地址与打开方式，写入后回读校验');
+    ce.command('list')
+        .argument('<reportId>', '报表 ID')
+        .requiredOption('--app-id <id>', '应用 ID')
+        .option('--json', 'JSON 输出')
+        .description('列出报表里配置了链接的单元格')
+        .action(async (reportId, raw) => {
+        await withReport(program, raw.appId, async (http, json) => {
+            const { getReportDevInfo } = await import('../services/report/reports.js');
+            const dev = await getReportDevInfo(http, reportId);
+            const rows = (dev.fields || [])
+                .map((f) => ({ cell: `${f.x},${f.y}`, text: String(f.text ?? ''), ...readCellEvents(f) }))
+                .filter((r) => r.pcHreflink || r.h5Hreflink);
+            if (json || raw.json) {
+                console.log(JSON.stringify(rows, null, 2));
+                return;
+            }
+            if (!rows.length) {
+                console.log('该报表没有单元格链接。');
+                return;
+            }
+            rows.forEach((r) => console.log(`${r.cell}\t${r.text}\t${openTypeLabel(r.openType)}\tPC=${r.pcHreflink || '-'}\tH5=${r.h5Hreflink || '-'}`));
+        });
+    });
+    ce.command('set')
+        .argument('<reportId>', '报表 ID')
+        .requiredOption('--app-id <id>', '应用 ID')
+        .requiredOption('--cell <行,列>', '目标单元格坐标，如 1,0')
+        .option('--pc <链接>', 'PC 链接地址（URL，或「执行js代码」时的 JS）')
+        .option('--h5 <链接>', 'H5 链接地址（移动端优先）')
+        .option('--open <方式>', '打开方式：弹出页 / 当前页 / 执行js代码；缺省保持原值（新链接为弹出页）')
+        .option('--json', 'JSON 输出')
+        .description('设置单元格链接（全角？＆会直接报错；保存后回读校验）')
+        .action(async (reportId, raw) => {
+        if (raw.pc === undefined && raw.h5 === undefined) {
+            throw new Error('至少要给 --pc 或 --h5');
+        }
+        const ref = parseCellRef(raw.cell);
+        const openType = raw.open === undefined ? null : resolveOpenType(raw.open);
+        await withReport(program, raw.appId, async (http, json) => {
+            const { getReportDevInfo } = await import('../services/report/reports.js');
+            const dev = await getReportDevInfo(http, reportId);
+            const cell = findCell(dev.fields || [], ref);
+            const before = readCellEvents(cell);
+            const effectiveOpen = openType ?? before.openType;
+            if (raw.pc !== undefined)
+                validateCellLink(String(raw.pc), effectiveOpen, '--pc');
+            if (raw.h5 !== undefined)
+                validateCellLink(String(raw.h5), effectiveOpen, '--h5');
+            const next = {
+                pcHreflink: raw.pc !== undefined ? String(raw.pc) : before.pcHreflink,
+                h5Hreflink: raw.h5 !== undefined ? String(raw.h5) : before.h5Hreflink,
+                openType: effectiveOpen,
+            };
+            const result = await applyCellEdit(http, {
+                http,
+                appId: raw.appId,
+                reportId,
+                ...ref,
+                patchFields: (fs) => {
+                    const c = findCell(fs, ref);
+                    c.pcHreflink = next.pcHreflink;
+                    c.h5Hreflink = next.h5Hreflink;
+                    c.openType = next.openType;
+                },
+                patchCellType: (ct) => {
+                    ct.pcHreflink = next.pcHreflink;
+                    ct.h5Hreflink = next.h5Hreflink;
+                    ct.openType = next.openType;
+                },
+                verify: (c) => {
+                    const got = readCellEvents(c);
+                    const errors = [];
+                    if (got.pcHreflink !== next.pcHreflink)
+                        errors.push(`pcHreflink 回读=${JSON.stringify(got.pcHreflink)}`);
+                    if (got.h5Hreflink !== next.h5Hreflink)
+                        errors.push(`h5Hreflink 回读=${JSON.stringify(got.h5Hreflink)}`);
+                    if (got.openType !== next.openType)
+                        errors.push(`openType 回读=${JSON.stringify(got.openType)}`);
+                    return errors;
+                },
+            });
+            const stored = readCellEvents(result.cell);
+            if (json || raw.json) {
+                console.log(JSON.stringify({ ok: true, reportId, cell: `${ref.x},${ref.y}`, ...stored }, null, 2));
+            }
+            else {
+                console.log(`已写入 (${ref.x},${ref.y}) 事件：${openTypeLabel(stored.openType)}`);
+                if (stored.pcHreflink)
+                    console.log(`  PC: ${stored.pcHreflink}`);
+                if (stored.h5Hreflink)
+                    console.log(`  H5: ${stored.h5Hreflink}`);
+            }
+        });
+    });
+    ce.command('clear')
+        .argument('<reportId>', '报表 ID')
+        .requiredOption('--app-id <id>', '应用 ID')
+        .requiredOption('--cell <行,列>', '目标单元格坐标，如 1,0')
+        .option('--pc', '只清 PC 链接')
+        .option('--h5', '只清 H5 链接')
+        .option('--json', 'JSON 输出')
+        .description('清空某个单元格的链接（缺省 PC+H5 都清，并把打开方式复位为弹出页）')
+        .action(async (reportId, raw) => {
+        const ref = parseCellRef(raw.cell);
+        const clearPc = raw.pc || (!raw.pc && !raw.h5);
+        const clearH5 = raw.h5 || (!raw.pc && !raw.h5);
+        await withReport(program, raw.appId, async (http, json) => {
+            const { getReportDevInfo } = await import('../services/report/reports.js');
+            const dev = await getReportDevInfo(http, reportId);
+            const before = readCellEvents(findCell(dev.fields || [], ref));
+            const next = {
+                pcHreflink: clearPc ? '' : before.pcHreflink,
+                h5Hreflink: clearH5 ? '' : before.h5Hreflink,
+                openType: clearPc && clearH5 ? 'blank' : before.openType,
+            };
+            const result = await applyCellEdit(http, {
+                http,
+                appId: raw.appId,
+                reportId,
+                ...ref,
+                patchFields: (fs) => {
+                    const c = findCell(fs, ref);
+                    c.pcHreflink = next.pcHreflink;
+                    c.h5Hreflink = next.h5Hreflink;
+                    c.openType = next.openType;
+                },
+                patchCellType: (ct) => {
+                    ct.pcHreflink = next.pcHreflink;
+                    ct.h5Hreflink = next.h5Hreflink;
+                    ct.openType = next.openType;
+                },
+                verify: (c) => {
+                    const got = readCellEvents(c);
+                    return got.pcHreflink === next.pcHreflink && got.h5Hreflink === next.h5Hreflink
+                        ? []
+                        : [`链接回读不一致：${JSON.stringify(got)}`];
+                },
+            });
+            const stored = readCellEvents(result.cell);
+            if (json || raw.json) {
+                console.log(JSON.stringify({ ok: true, reportId, cell: `${ref.x},${ref.y}`, ...stored }, null, 2));
+            }
+            else {
+                console.log(`已清空 (${ref.x},${ref.y}) 的${clearPc && clearH5 ? ' PC/H5 链接' : clearPc ? ' PC 链接' : ' H5 链接'}`);
+            }
+        });
+    });
+}
+//# sourceMappingURL=report-cell.js.map

package/dist/commands/report-cell.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"report-cell.js","sourceRoot":"","sources":["../../src/commands/report-cell.ts"],"names":[],"mappings":"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"}

package/dist/commands/wf-form.d.ts

@@ -36,6 +36,8 @@ interface FieldOpts {
     browserType?: string | Record<string, unknown>;
     /** `browserType=form` 时的来源：business(默认) / ebuilder。 */
     browserFormSource?: string;
+    /** 字段编码 dataKey；不给则按字段名拼音首字母（与 add-field 一致）。 */
+    dataKey?: string;
 }
 /**
  * wf-form 分支链**自己处理**的类型。

package/dist/commands/wf-form.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wf-form.d.ts","sourceRoot":"","sources":["../../src/commands/wf-form.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIpC,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAyP9C;;;gHAGgH;AAChH,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAClD,CAAC,GAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAAC,SAAS,CAAC,EAAE,OAAO,CAAC;IAAC,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAAO,EAC9I,KAAK,GAAE;IAAE,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;CAAO,GACnD,OAAO,CAAC;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAiEzE;AAWD,yCAAyC;AACzC,UAAU,SAAS;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAChG,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,OAAO,CAAC;IAAC,cAAc,CAAC,EAAE,OAAO,CAAC;IAC/D,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxE,yEAAyE;IACzE,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/C,uDAAuD;IACvD,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED;;;;;GAKG;AACH,eAAO,MAAM,eAAe,aAG1B,CAAC;AAEH;;;;;GAKG;AACH,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,SAAS,GAAG,IAAI,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EACtF,KAAK,EAAE,MAAM,GAAG,SAAS,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GACvE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAiIlC;AAED,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CA4+DtE"}
+{"version":3,"file":"wf-form.d.ts","sourceRoot":"","sources":["../../src/commands/wf-form.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIpC,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAyP9C;;;gHAGgH;AAChH,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAClD,CAAC,GAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAAC,SAAS,CAAC,EAAE,OAAO,CAAC;IAAC,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAAO,EAC9I,KAAK,GAAE;IAAE,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;CAAO,GACnD,OAAO,CAAC;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAiEzE;AAWD,yCAAyC;AACzC,UAAU,SAAS;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAChG,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,OAAO,CAAC;IAAC,cAAc,CAAC,EAAE,OAAO,CAAC;IAC/D,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxE,yEAAyE;IACzE,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/C,uDAAuD;IACvD,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iDAAiD;IACjD,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;;;GAKG;AACH,eAAO,MAAM,eAAe,aAG1B,CAAC;AAEH;;;;;GAKG;AACH,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,SAAS,GAAG,IAAI,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EACtF,KAAK,EAAE,MAAM,GAAG,SAAS,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GACvE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAiIlC;AAED,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAg/DtE"}

package/dist/commands/wf-form.js

@@ -309,7 +309,7 @@ export const WF_FORM_HANDLED = new Set([
  */
 export async function buildFieldJsonObj(client, baseUrl, fieldName, fieldType, title, o, formId, fieldId) {
     const ck = canon(fieldType);
-    const colName = toColumnName(fieldName);
+    const colName = String(o.dataKey ?? '').trim() || toColumnName(fieldName);
     const jsonObj = {
         type: ck, title: title || fieldName, fieldId, groupId: '-1', formId, showOrder: '0.00',
         dataKey: colName, columnName: colName,
@@ -1809,6 +1809,7 @@ export function registerWorkflowFormCommands(program) {
         .option('--data-key <k>', '子表物理表名/dataKey（默认 uf_拼音_随机）')
         .option('--init', '创建后跑 layout init 放入 DetailTable 组件')
         .option('--first-field-type <t>', '首字段类型（默认 Text）')
+        .option('--first-field-data-key <k>', '首字段编码 dataKey（缺省取首字段名拼音首字母，与 add-field 一致）')
         .action(async (formId, name, firstFieldName, o) => {
         try {
             const opts = program.opts();
@@ -1831,19 +1832,18 @@ export function registerWorkflowFormCommands(program) {
                 throw new Error(`saveSubForm 失败: ${subRes?.msg}`);
             console.error(`  子表已建: subFormId=${subFormId}  name=${name}  dataKey=${dataKey}`);
             let firstFieldId = '';
+            let firstFieldDataKey = '';
             if (firstFieldName) {
                 const [fid] = await genIds(client, baseUrl, 1);
                 firstFieldId = fid;
-                const ftype = canon(o.firstFieldType || 'Text');
-                const fo = {
-                    type: ftype, title: firstFieldName, fieldId: firstFieldId, groupId: '-1', formId, showOrder: '0.00',
-                    dataKey: toSubTableName(firstFieldName).replace(/^uf_/, ''), columnName: toSubTableName(firstFieldName).replace(/^uf_/, ''),
-                    componentKey: ftype, subFormId,
-                };
+                // 与 wf-form add-field 走同一个构造器（buildFieldJsonObj）：只有 subFormId 与
+                // dataKey 由这里传入，其余属性完全一致。wf-form 的普通字段同样不带 formTableId。
+                const fo = await buildFieldJsonObj(client, baseUrl, firstFieldName, o.firstFieldType || 'Text', undefined, { subFormId, dataKey: o.firstFieldDataKey }, formId, firstFieldId);
+                firstFieldDataKey = String(fo.dataKey);
                 const fRes = await client.post(`${baseUrl}${ROUTE}/field/manage/saveFormFieldNew`, { formId, module: MODULE, customParam: {}, jsonObj: JSON.stringify(fo) }, ebb);
                 if (fRes?.code !== 200 || !fRes?.status)
                     throw new Error(`加首字段失败: ${fRes?.msg}`);
-                console.error(`  首字段已加: ${firstFieldName} (${firstFieldId})`);
+                console.error(`  首字段已加: ${firstFieldName} (${firstFieldId}) dataKey=${firstFieldDataKey}`);
             }
             else {
                 console.error('  ⚠ 未传首字段：子表已建但空子表 getConfig 读不到，需手动加字段后才可 init 放置');
@@ -1866,7 +1866,8 @@ export function registerWorkflowFormCommands(program) {
                 }
             }
             console.log(opts.json
-                ? JSON.stringify({ success: true, formId, subFormId, name, dataKey, firstFieldId, initComps: compCount || undefined }, null, 2)
+                ? JSON.stringify({ success: true, formId, subFormId, name, dataKey, firstFieldId,
+                    firstFieldDataKey: firstFieldDataKey || undefined, initComps: compCount || undefined }, null, 2)
                 : `明细子表已建: ${name}  subFormId=${subFormId}${firstFieldName ? `  首字段=${firstFieldName}` : ''}${o.init ? `  已 init 放入布局` : '  (未 init，跑 wf-form layout init 放置)'}`);
             if (!opts.json && !o.init) {
                 console.log('  后续加字段: e10-cli wf-form add-field <formId> <字段名> <类型> --sub-form-id ' + subFormId);