weaver-e10-builder 1.2.5 → 1.5.2

package/dist/services/form-field-build.js

@@ -0,0 +1,436 @@
+import { getRichType, richIdUnits } from './rich-types.js';
+import { placeholderFromFormat } from './form-create.js';
+import { resolveDetailTable } from './form-sub-detail.js';
+import { applyFieldPatches } from './form-field-patch.js';
+import { createMultilangLabel } from './form-i18n-label.js';
+/**
+ * 「字段定义 → 平台 jsonObj」的构造器。
+ *
+ * **这是唯一一份**。`form add-field` 与按物理表加字段的命令（`form add-physical-field`）都走它 ——
+ * 此前这段逻辑内联在 `commands/form.ts` 的 add-field action 里（约 340 行），
+ * 一旦要出第二个入口就会变成两处真相，所以原样搬到这里，行为一字未改。
+ *
+ * 搬动时只做了三处**等价**改写：
+ *   1. `client/baseUrl/...` 改为从入参取（原来是闭包变量）
+ *   2. `auth.userId` / `auth.tenantKey` → 入参 `userId` / `tenantKey`
+ *   3. `console.error(...) + process.exit(1)` → `throw new Error(...)`，
+ *      由调用方接住后打印并 `process.exit(1)`。**库函数不该直接退进程。**
+ *
+ * 字段落点由 `formTableId` 决定：主表的 id = 主表；某张附属物理表的 id = 落到「字段管理 → 其他」
+ * 里那张表上。
+ */
+/** 平台系统字段 id（非业务字段）。`defaultEBuilderDataTitle` 用来筛业务字段。 */
+export const SYSTEM_FIELD_IDS = new Set([
+    'name', 'creator', 'create_time', 'update_time', 'id',
+    'updater', 'data_status', 'flow_status', 'current_step',
+    'batchpubtags', 'batchmytags', 'operate', 'data_read_status',
+    'flow_system_number',
+]);
+// EBuilder dataTitle（关联字段标题栏）默认解析：优先字段名含「名称」的业务字段，无则第一个业务字段。
+// 需求：默认选带"名称"二字的字段（如 客户名称/类型名称），没有就默认选第一个。
+export function defaultEBuilderDataTitle(fields) {
+    const isBiz = (id) => /^\d{15,}$/.test(id) && !SYSTEM_FIELD_IDS.has(id);
+    const biz = (fields || []).filter((f) => isBiz(String(f.fieldId ?? '')));
+    const byName = biz.find((f) => String(f.fieldName ?? f.title ?? '').includes('名称'));
+    return byName?.fieldId || biz[0]?.fieldId || 'name';
+}
+/** 构造字段的 jsonObj。致命错误一律抛出（不退出进程）。 */
+export async function buildFieldJsonObject(ctx) {
+    const { client, baseUrl, appId, objId, userId, tenantKey, fieldType, fieldName, title, formId, fieldId, startId, endId } = ctx;
+    const cmdOpts = ctx.opts;
+    const sformId = cmdOpts.sformId || '';
+    const dataTitle = cmdOpts.dataTitle || '';
+    const formName = cmdOpts.formName || '';
+    const keys = { dataKey: ctx.dataKey, columnName: ctx.columnName };
+    // Build jsonObj based on field type
+    const jsonObj = {
+        type: fieldType,
+        title: title || fieldName,
+        formTableId: ctx.formTableId, fieldId, groupId: '-1', formId,
+        showOrder: '0.00',
+        dataKey: keys.dataKey,
+        columnName: keys.columnName,
+    };
+    // 明细表字段：--sub-form-id 时 jsonObj 带 subFormId —— **字段落点由它决定**。
+    // 必须用 resolveDetailTable 而不是直接查 getEbField：后者列不出空明细表，
+    // 用户把明细字段删光后就再也加不回去（详见 services/form-sub-detail.ts）。
+    if (cmdOpts.subFormId) {
+        const sub = await resolveDetailTable(client, baseUrl, appId, objId, formId, cmdOpts.subFormId);
+        if (!sub) {
+            throw new Error(`未找到明细表 subFormId=${cmdOpts.subFormId}（getEbField 与 querySubForms 均无此表，请确认 id）`);
+        }
+        Object.assign(jsonObj, { subFormId: cmdOpts.subFormId });
+        // 空表拿不到物理表 id，保持主表的值不动：实测带主表 formTableId 一样落进明细表。
+        if (sub.formTableId)
+            jsonObj.formTableId = sub.formTableId;
+    }
+    // 富组件：映射到平台真实 type/componentKey + 附加配置（对齐 batch/save/formField 抓包）。
+    // 之前 jsonObj 只有 type 没有 componentKey → 平台 FormFieldDto.getComponentKey() 为 null → NPE。
+    const rich = getRichType(fieldType);
+    if (rich) {
+        jsonObj.type = rich.platformType;
+        jsonObj.componentKey = rich.platformComponentKey;
+        if (rich.build) {
+            const extra = richIdUnits(fieldType, {}) - 1;
+            let extraIds = [];
+            if (extra > 0) {
+                const extraRes = await client.post(`${baseUrl}/api/form/local/generatorIds?size=${extra}&apid=${appId}`, {});
+                extraIds = (extraRes?.data?.generatorIds || []).map(String);
+            }
+            const extraCfg = await rich.build({
+                def: {
+                    multiple: cmdOpts.multiple,
+                    browserType: cmdOpts.browserType,
+                    browserFormSource: cmdOpts.browserFormSource,
+                }, fieldId, formId, formTableId: ctx.formTableId, dataKey: keys.dataKey, columnName: keys.columnName,
+                showOrder: '0.00', extraIds,
+            });
+            Object.assign(jsonObj, extraCfg);
+        }
+    }
+    // 非富组件也补 componentKey（平台要求，否则 FormFieldDto.getComponentKey() 为 null → NPE）。
+    // 富组件已在上方设置 platformComponentKey；此处 fallback 到类型名（平台对常见类型有归一容错）。
+    if (!jsonObj.componentKey)
+        jsonObj.componentKey = fieldType;
+    // Number/Money decimal precision: --precision 指定，缺省 Number=0 整数、Money=2、百分比=1
+    // 百分比：--percent → numberType=percentage；默认值：--default → content+isDefault
+    // 实测：设默认值必须连 isDelimiter/stepMode/step/isCapital 一起，否则平台丢默认（只设 content+isDefault 不落库）
+    if (fieldType === 'Number' || fieldType === 'Money') {
+        const defaultPrec = fieldType === 'Money' ? '2' : '0';
+        const isPercent = fieldType === 'Number' && cmdOpts.percent === true;
+        // 注意：commander 把 --default 映射到 opts.default（非 defaultValue）
+        const hasDefault = cmdOpts.default !== undefined && cmdOpts.default !== null && cmdOpts.default !== '';
+        // 千分位：Money 默认开（--no-delimiter 关闭）、Number 默认关（--delimiter 开启）
+        const isDelim = fieldType === 'Money' ? cmdOpts.delimiter !== false : cmdOpts.delimiter === true;
+        const isCap = cmdOpts.capital === true;
+        const patch = {
+            pointSize: cmdOpts.precision !== undefined ? cmdOpts.precision : (isPercent ? '1' : defaultPrec),
+            isDefault: hasDefault,
+            isDelimiter: isDelim,
+            isCapital: isCap,
+            capitalFormat: 'onlyUpperCase',
+            capitalPosition: 'outside',
+            capitalSetting: 'system',
+            capitalPrecision: 'yuan',
+            isExchangeRates: false,
+        };
+        if (fieldType === 'Number')
+            patch.numberType = isPercent ? 'percentage' : 'number';
+        // content 始终带（无默认值时空串）——浏览器抓包 Number 字段 getFormField 恒有 content:""，
+        // 缺 content 在 FLOW 渲染异常（与多行文本同因）。
+        if (fieldType === 'Number')
+            patch.content = hasDefault ? String(cmdOpts.default) : '';
+        if (hasDefault) {
+            patch.stepMode = false;
+            patch.step = 1;
+        }
+        Object.assign(jsonObj, patch);
+    }
+    if (fieldType === 'TextArea') {
+        // 多行文本：对齐浏览器抓包——content 恒 ""（无默认值时空串）、maxLen=4000。
+        // 缺 content 在 FLOW 渲染异常；maxLen 不发则前端最大长度回显异常。
+        Object.assign(jsonObj, { content: '', maxLen: 4000 });
+    }
+    const isDateRange = fieldType === 'DateRange' || fieldType === 'DateInterval';
+    if (fieldType === 'EInvoice') {
+        Object.assign(jsonObj, {
+            isSingle: false,
+            invoiceType: 1,
+        });
+        delete jsonObj.maxLen;
+        delete jsonObj.unique;
+        delete jsonObj.scan;
+        delete jsonObj.readonlyTransLink;
+    }
+    else if (fieldType === 'Date' || fieldType === 'DateTime') {
+        // 日期：默认精度 年月日（yyyy-MM-dd，对齐浏览器抓包）；DateTime：默认带时:分（yyyy-MM-dd HH:mm 不含秒）。
+        // 默认值不填（isDefault:false）；--format 覆盖精度。
+        const isDt = fieldType === 'DateTime';
+        const fmt = cmdOpts.format || (isDt ? 'yyyy-MM-dd HH:mm' : 'yyyy-MM-dd');
+        Object.assign(jsonObj, {
+            type: 'Date',
+            format: fmt,
+            placeholder: placeholderFromFormat(fmt),
+            timePanelStyle: { type: 'system' },
+            isDefault: false,
+        });
+        // 日期限制：--min-field 最早不得早于 / --max-field 最晚不得晚于另一字段（对齐抓包 min.dateField）。
+        // 目标字段 fieldId 从 getFields mainFields 按字段名解析。
+        if (cmdOpts.minField || cmdOpts.maxField) {
+            try {
+                const tfd = await client.post(`${baseUrl}/api/ebuilder/form/dataset/v1/getFields`, {
+                    objId, userid: userId, tenantKey,
+                });
+                const tfields = tfd?.data?.mainFields || [];
+                const minTarget = cmdOpts.minField ? tfields.find((f) => f.fieldName === cmdOpts.minField)?.fieldId : '';
+                const maxTarget = cmdOpts.maxField ? tfields.find((f) => f.fieldName === cmdOpts.maxField)?.fieldId : '';
+                if (minTarget) {
+                    jsonObj.min = { type: 'dateField', checkValue: String(minTarget) };
+                    jsonObj.earlyDate = true;
+                }
+                if (maxTarget) {
+                    jsonObj.max = { type: 'dateField', checkValue: String(maxTarget) };
+                    jsonObj.lateDate = true;
+                }
+            }
+            catch { /* 解析失败则不加限制 */ }
+        }
+        delete jsonObj.maxLen;
+        delete jsonObj.unique;
+        delete jsonObj.scan;
+        delete jsonObj.readonlyTransLink;
+    }
+    else if (fieldType === 'SubCompany') {
+        Object.assign(jsonObj, {
+            componentKey: 'Subcompany', isSingle: cmdOpts.multiple ? false : true,
+            displayType: 'space', defaultExtend: { type: 'custom', relation: 'current' },
+            viewDataDetail: true, showDimension: true,
+            pcDisplaySelectedCount: { type: 'default' },
+            mobileDisplaySelectedCount: { type: 'default' },
+        });
+        delete jsonObj.maxLen;
+        delete jsonObj.unique;
+        delete jsonObj.scan;
+        delete jsonObj.readonlyTransLink;
+    }
+    else if (fieldType === 'City') {
+        // 城市/地区选择（对齐浏览器 payload：region 模式 + 系统级联层级 + 字母索引）
+        Object.assign(jsonObj, {
+            isSingle: false,
+            levelSetting: 'system',
+            isDefault: false,
+            useLetterIndex: true,
+            mode: 'region',
+        });
+        delete jsonObj.maxLen;
+        delete jsonObj.unique;
+        delete jsonObj.scan;
+        delete jsonObj.readonlyTransLink;
+    }
+    else if (fieldType === 'EBuilder') {
+        if (!sformId) {
+            throw new Error('EBuilder 类型必须指定 --sform-id（目标表单 objId）');
+        }
+        // Resolve formName from target form if not provided
+        let resolvedFormName = formName;
+        if (!resolvedFormName) {
+            try {
+                const tlist = await client.get(`${baseUrl}/api/bs/ebuilder/form/obj/getList/${appId}?apid=${appId}`, { ebbusinessid: appId });
+                const tf = (tlist?.data || []).find((f) => String(f.id) === String(sformId));
+                resolvedFormName = tf?.formName || tf?.name || sformId;
+            }
+            catch {
+                resolvedFormName = sformId;
+            }
+        }
+        // Resolve dataTitle：纯数字 fieldId 直接用；'name'/字段名 → 查目标表字段。
+        // 未传 --data-title 时按 name 处理：默认优先字段名含「名称」的业务字段（如 客户名称/类型名称），无则第一个业务字段。
+        let resolvedDataTitle = dataTitle || 'name';
+        if (!/^\d{15,}$/.test(resolvedDataTitle)) {
+            try {
+                const tfd = await client.post(`${baseUrl}/api/ebuilder/form/dataset/v1/getFields`, {
+                    objId: sformId, userid: userId, tenantKey,
+                });
+                const tfields = tfd?.data?.mainFields || [];
+                if (resolvedDataTitle === 'name') {
+                    resolvedDataTitle = defaultEBuilderDataTitle(tfields);
+                }
+                else {
+                    const m = tfields.find((f) => f.fieldName === resolvedDataTitle)
+                        || tfields.find((f) => String(f.fieldName || '').includes(resolvedDataTitle));
+                    resolvedDataTitle = m?.fieldId || resolvedDataTitle;
+                }
+            }
+            catch { /* 解析失败保留原值 */ }
+        }
+        Object.assign(jsonObj, {
+            sformId,
+            dataTitle: resolvedDataTitle || 'name',
+            formName: resolvedFormName,
+            virtualForm: false,
+            displayType: 'line',
+            isAddForRelation: true,
+            isSingle: cmdOpts.multiple ? false : true, // 默认单选；--multiple 多选
+            viewDataDetail: true,
+            pcDisplaySelectedCount: { type: 'default' },
+            mobileDisplaySelectedCount: { type: 'default' },
+            quickAddParams: [],
+            relateViewData: [],
+            relateField: null,
+            appId,
+            virtualTable: false,
+        });
+    }
+    else if (fieldType === 'Flow') {
+        // 浏览-流程字段（对齐浏览器 payload：type=Flow + relateExt.module=workflow）
+        if (!sformId) {
+            throw new Error('Flow 类型必须指定 --sform-id（目标流程绑定的表单 objId）');
+        }
+        let resolvedFormName = formName;
+        if (!resolvedFormName) {
+            try {
+                const tlist = await client.get(`${baseUrl}/api/bs/ebuilder/form/obj/getList/${appId}?apid=${appId}`, { ebbusinessid: appId });
+                const tf = (tlist?.data || []).find((f) => String(f.id) === String(sformId));
+                resolvedFormName = tf?.formName || tf?.name || sformId;
+            }
+            catch {
+                resolvedFormName = sformId;
+            }
+        }
+        Object.assign(jsonObj, {
+            isAddForRelation: true,
+            sformId,
+            formName: resolvedFormName,
+            conditionOperate: 'and',
+            filterParams: '{}',
+            filterQueryParams: '{}',
+            columnFields: [],
+            displayType: 'line',
+            viewDataDetail: true,
+            pcDisplaySelectedCount: { type: 'default' },
+            mobileDisplaySelectedCount: { type: 'default' },
+            relateExt: { module: 'workflow' },
+            relateField: null,
+            quickAddParams: [],
+        });
+    }
+    else if (isDateRange) {
+        // 日期区间：补 start/end 两个 DateComponent + rangeInterval（对齐浏览器 payload）
+        const format = cmdOpts.format || 'yyyy-MM-dd';
+        const rangeTitle = title || fieldName;
+        const start = {
+            componentKey: 'DateComponent', content: '', describe: '', earlyDate: 'false',
+            format, isDefault: 'false', lateDate: 'false',
+            placeholder: placeholderFromFormat(format),
+            position: '', relateMultiple: 'false', required: 'false', size: 'medium',
+            title: `${rangeTitle}(开始时间)`, fieldId: startId,
+            min: { type: 'currentHour' }, max: { type: 'currentHour' },
+        };
+        const end = { ...start, title: `${rangeTitle}(结束时间)`, fieldId: endId };
+        Object.assign(jsonObj, {
+            isDefault: false,
+            start, end,
+            hasDisplayFormat: true,
+            rangeInterval: { limitType: 'max', timeUnit: 'day' },
+        });
+    }
+    else if (fieldType === 'IDCard') {
+        // 身份证号：平台原生简单字段，浏览器抓包 payload 极简（type/title/formTableId/dataKey/
+        // columnName/fieldId/formId/showOrder/groupId 即全部）——无 componentKey、无文本长度配置。
+        delete jsonObj.componentKey;
+        delete jsonObj.maxLen;
+        delete jsonObj.unique;
+        delete jsonObj.scan;
+        delete jsonObj.readonlyTransLink;
+    }
+    else {
+        // 文本最大长度：--max-len 指定，缺省 Text=100、TextArea=4000（对齐浏览器抓包；TextArea 在上面分支已设 content:""）
+        const defaultMaxLen = fieldType === 'TextArea' ? 4000 : 100;
+        const maxLen = cmdOpts.maxLen !== undefined ? Number(cmdOpts.maxLen) : defaultMaxLen;
+        Object.assign(jsonObj, {
+            maxLen: Number.isFinite(maxLen) && maxLen > 0 ? maxLen : defaultMaxLen,
+            unique: false, scan: false,
+            readonlyTransLink: false,
+        });
+    }
+    // 人员/部门多选：默认单选，--multiple 改多选（isSingle:false）。EBuilder 已在上文分支设过。
+    if (fieldType === 'Employee' || fieldType === 'Department') {
+        jsonObj.isSingle = cmdOpts.multiple ? false : true;
+    }
+    // 下拉多选是独立类型 SelectMultiple（非 Select + 开关）。浏览器抓包：type:"SelectMultiple"，
+    // 无 componentKey/maxLen/unique/scan（else 分支给 Select 加的 junk 要清掉），options 单独配。
+    if (fieldType === 'Select' && cmdOpts.multiple) {
+        jsonObj.type = 'SelectMultiple';
+        jsonObj.componentKey = 'SelectMultiple';
+        delete jsonObj.maxLen;
+        delete jsonObj.unique;
+        delete jsonObj.scan;
+        delete jsonObj.readonlyTransLink;
+    }
+    // Select 绑定选项预设模板：--option-template（ID 或名称）。
+    // 浏览器抓包（2026-09-09）：jsonObj 带 templateId+templateName+publicTemplate:false+options:[]（选项不内联），
+    // 平台渲染时按模板拉选项。模板管理见 `form option-template`。
+    if (fieldType === 'Select' && cmdOpts.optionTemplate) {
+        // 先清 else 分支给文本类加的 junk + options 占位（模板字段不发选项）
+        delete jsonObj.maxLen;
+        delete jsonObj.unique;
+        delete jsonObj.scan;
+        delete jsonObj.readonlyTransLink;
+        const tplIdOrName = cmdOpts.optionTemplate;
+        // 解析模板：纯数字按 ID 直查详情；否则在 custom+system 列表按名称精确匹配
+        let tplId = '';
+        let tplName = '';
+        const readTpl = async (id) => {
+            const r = await client.post(`${baseUrl}/api/form/datasources/queryDataSourcesByTemplateValueKey`, { templateId: id });
+            return r?.formDataTemplate?.id ? r.formDataTemplate : null;
+        };
+        if (/^\d+$/.test(tplIdOrName)) {
+            const t = await readTpl(tplIdOrName);
+            if (!t)
+                throw new Error(`选项模板 ${tplIdOrName} 不存在`);
+            tplId = String(t.id);
+            tplName = String(t.name);
+        }
+        else {
+            for (const type of ['custom', 'system']) {
+                const list = await client.post(`${baseUrl}/api/form/datasources/queryDataList`, { pageNo: 1, pageSize: 100, name: tplIdOrName, type });
+                const hit = (list?.templatePage?.result || []).find((r) => r.name === tplIdOrName);
+                if (hit) {
+                    tplId = String(hit.id);
+                    tplName = String(hit.name);
+                    break;
+                }
+            }
+            if (!tplId)
+                throw new Error(`未找到名为「${tplIdOrName}」的选项模板（custom+system 均已查）`);
+        }
+        Object.assign(jsonObj, {
+            hideScore: true,
+            optionBackgroundStyle: 'default',
+            options: [],
+            templateScore: {},
+            currentLevel: '1',
+            templateId: tplId,
+            templateName: tplName,
+            publicTemplate: false,
+            parentId: [],
+        });
+        if (cmdOpts.multiple) {
+            console.error('提示：模板下拉当前按单选（currentLevel=1）绑定；多选+模板组合未验证');
+        }
+    }
+    // 默认值 / 数据库字段名 / 描述：与 edit-field 共用同一套补丁规则。
+    // 放在最后 —— 前面各类型分支会写 content（如 TextArea 恒置 ''），先打补丁会被冲掉。
+    const patch = applyFieldPatches(jsonObj, {
+        defaultValue: cmdOpts.default,
+        dataKey: cmdOpts.dataKey,
+        columnName: cmdOpts.columnName,
+        desc: cmdOpts.desc,
+    });
+    if (patch.errors.length > 0) {
+        // 原实现在这里逐行 console.error 后 process.exit(1)；变成抛出，由调用方统一打印。
+        // 文案与顺序保持不变（多行拼在一个 Error 里）。
+        throw new Error([...patch.errors.map((e) => `  ❌ ${e}`), '  已中止，未做任何改动。'].join('\n'));
+    }
+    for (const w of patch.warnings)
+        console.error(`  ⚠ ${w}`);
+    // 必填**只存在于布局 comp 里**（`config.required`）—— 字段记录没有这个键。所以下面那句
+    // 只是形式上的补齐，真正生效的是布局落点：增量插入的 `overrides.required`，
+    // 或 --reinit 时 configs 里那条 newFieldConfig。两处都写全了用户才看不出差别。
+    if (cmdOpts.required === true)
+        jsonObj.required = true;
+    // 字段标题在平台里存的是**多语言标签 id**（字段记录的 `labelObj.title`），不是文本本身。
+    // 不建标签也能显示（设计器退回读 `title`），但只要有谁引用了标签而这个标签不存在，
+    // 标题就会**静默变空** —— 平台既不校验也不报错。所以顺手建一个真的，不留自造 id 的口子。
+    // 建失败只告警：字段本身才是主操作，不该被标签服务拖垮。
+    try {
+        const titleLabelId = await createMultilangLabel(client, baseUrl, title || fieldName, 'ebuilderform');
+        jsonObj.labelObj = { ...(jsonObj.labelObj || {}), title: titleLabelId };
+        jsonObj.titleLabelId = titleLabelId;
+    }
+    catch (e) {
+        console.error(`  ⚠ 标题的多语言标签未建立（字段不受影响，设计器会退回用 title 显示）: ${e.message}`);
+    }
+    return jsonObj;
+}
+//# sourceMappingURL=form-field-build.js.map

package/dist/services/form-field-build.js.map

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

package/dist/services/form-field-patch.d.ts

@@ -47,8 +47,10 @@ export interface FieldPatchOpts {
     defaultValue?: string;
     /** 清空默认值。 */
     clearDefault?: boolean;
-    /** 数据库字段名（同时写 dataKey 与 columnName）。 */
+    /** 字段编码 dataKey。未同时给 `columnName` 时列名跟随（历史行为）。 */
     dataKey?: string;
+    /** 数据库列名 columnName。**与 dataKey 是两个东西**，可分别指定。 */
+    columnName?: string;
     /** 字段描述。 */
     desc?: string;
 }

package/dist/services/form-field-patch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-field-patch.d.ts","sourceRoot":"","sources":["../../src/services/form-field-patch.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH;;;;;;GAMG;AACH,eAAO,MAAM,gBAAgB,uFAEnB,CAAC;AAEX,sCAAsC;AACtC,eAAO,MAAM,mBAAmB,kDAAmD,CAAC;AAEpF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,qBAAqB,EAAE,MAAM,CAAC,MAAM,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAazG,CAAC;AAEF,mEAAmE;AACnE,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAE3G;AAED,MAAM,WAAW,cAAc;IAC7B,2BAA2B;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW;IACX,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa;IACb,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,wCAAwC;IACxC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,YAAY;IAC3B,qBAAqB;IACrB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAED;;;;;GAKG;AACH,eAAO,MAAM,eAAe,MAAM,CAAC;AAEnC,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,cAAc,GACjD,YAAY,CA0Dd"}
+{"version":3,"file":"form-field-patch.d.ts","sourceRoot":"","sources":["../../src/services/form-field-patch.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH;;;;;;GAMG;AACH,eAAO,MAAM,gBAAgB,uFAEnB,CAAC;AAEX,sCAAsC;AACtC,eAAO,MAAM,mBAAmB,kDAAmD,CAAC;AAEpF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,qBAAqB,EAAE,MAAM,CAAC,MAAM,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAczG,CAAC;AAEF,mEAAmE;AACnE,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAE3G;AAED,MAAM,WAAW,cAAc;IAC7B,2BAA2B;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW;IACX,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa;IACb,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,kDAAkD;IAClD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,kDAAkD;IAClD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,YAAY;IAC3B,qBAAqB;IACrB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAED;;;;;GAKG;AACH,eAAO,MAAM,eAAe,MAAM,CAAC;AAEnC,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,cAAc,GACjD,YAAY,CAsEd"}

package/dist/services/form-field-patch.js

@@ -44,6 +44,7 @@ export const PLATFORM_FIELD_SHAPES = {
     DateRange: { type: 'DateRange', componentKey: 'DateInterval' },
     // 附件：平台 type 是 File（componentKey 保持全名）
     FileComponent: { type: 'File', componentKey: 'FileComponent' },
+    SubCompany: { type: 'SubCompany', componentKey: 'Subcompany' },
 };
 /** 取某 CLI 类型对应要发送的平台形状；未登记的类型原样直通（`type`/`componentKey` 同为类型名）。 */
 export function platformFieldShape(cliType) {
@@ -93,18 +94,31 @@ export function applyFieldPatches(jsonObj, opts) {
             applied.push(opts.clearDefault ? '默认值已清空' : `默认值=${val}`);
         }
     }
-    // ── 数据库字段名 ────────────────────────────────────────
-    if (opts.dataKey !== undefined) {
-        const k = opts.dataKey.trim();
-        if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(k)) {
+    // ── 字段编码(dataKey) / 数据库列名(columnName) ──────────
+    // 两者是**独立的东西**：平台允许不同（设计器里可分别填），不是同一个列名的两个写法。
+    // `--data-key` 只管编码、`--column-name` 只管列名；
+    // 只给 `--data-key` 时列名跟随（**历史行为**，老脚本不受影响）。
+    if (opts.dataKey !== undefined || opts.columnName !== undefined) {
+        const shape = /^[A-Za-z_][A-Za-z0-9_]*$/;
+        const dk = opts.dataKey === undefined ? undefined : opts.dataKey.trim();
+        const cn = opts.columnName === undefined ? undefined : opts.columnName.trim();
+        if (dk !== undefined && !shape.test(dk)) {
             errors.push(`--data-key 只能由字母、数字、下划线组成且不以数字开头，收到 "${opts.dataKey}"`);
         }
+        else if (cn !== undefined && !shape.test(cn)) {
+            errors.push(`--column-name 只能由字母、数字、下划线组成且不以数字开头，收到 "${opts.columnName}"`);
+        }
         else {
-            // dataKey 与 columnName 是同一个物理列名的两个写法，**必须一起改**，
-            // 只改一个会留下两个不一致的名字。
-            jsonObj.dataKey = k;
-            jsonObj.columnName = k;
-            applied.push(`dataKey/columnName=${k}`);
+            if (dk !== undefined) {
+                jsonObj.dataKey = dk;
+                applied.push(`dataKey=${dk}`);
+            }
+            // 列名：显式给了就用它；只给 data-key 时跟随（历史行为）；只给 column-name 时 dataKey 不动
+            const col = cn !== undefined ? cn : dk;
+            if (col !== undefined) {
+                jsonObj.columnName = col;
+                applied.push(`columnName=${col}`);
+            }
         }
     }
     // ── 字段描述 ────────────────────────────────────────────

package/dist/services/form-field-patch.js.map

@@ -1 +1 @@
-{"version":3,"file":"form-field-patch.js","sourceRoot":"","sources":["../../src/services/form-field-patch.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"form-field-patch.js","sourceRoot":"","sources":["../../src/services/form-field-patch.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,gBAAgB;CAClE,CAAC;AAEX,sCAAsC;AACtC,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,CAAU,CAAC;AAEpF;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAA4E;IAC5G,oDAAoD;IACpD,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,YAAY,EAAE,iBAAiB,EAAE;IAC3D,qDAAqD;IACrD,oEAAoE;IACpE,kEAAkE;IAClE,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,EAAE,YAAY,EAAE;IAC3E,QAAQ,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,EAAE,kBAAkB,EAAE;IACrF,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,EAAE,UAAU,EAAE;IACzE,+BAA+B;IAC/B,SAAS,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,YAAY,EAAE,cAAc,EAAE;IAC9D,uCAAuC;IACvC,aAAa,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,eAAe,EAAE;IAC9D,UAAU,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE;CAC/D,CAAC;AAEF,mEAAmE;AACnE,MAAM,UAAU,kBAAkB,CAAC,OAAe;IAChD,OAAO,qBAAqB,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,CAAC;AACpF,CAAC;AAwBD;;;;;GAKG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,GAAG,CAAC;AAEnC,MAAM,UAAU,iBAAiB,CAC/B,OAA4B,EAAE,IAAoB;IAElD,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;IAExC,uDAAuD;IACvD,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QAC9B,IAAK,gBAAsC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YAC3D,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,qCAAqC,CAAC,CAAC;QAC5D,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAC9B,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBACnC,MAAM,CAAC,IAAI,CAAC,wBAAwB,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;YACtD,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;gBACnB,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;gBAC5B,IAAI,CAAC,GAAG,eAAe,EAAE,CAAC;oBACxB,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,eAAe,yBAAyB,CAAC,CAAC;gBAClF,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,wDAAwD;IACxD,IAAI,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;QACzD,IAAI,CAAE,mBAAyC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YAC/D,MAAM,CAAC,IAAI,CAAC,WAAW,mBAAmB,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,IAAI,IAAI,QAAQ,EAAE,CAAC,CAAC;QACtF,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC;YACrE,mDAAmD;YACnD,OAAO,CAAC,OAAO,GAAG,GAAG,CAAC;YACtB,OAAO,CAAC,SAAS,GAAG,CAAC,IAAI,CAAC,YAAY,IAAI,GAAG,KAAK,EAAE,CAAC;YACrD,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC;QAC5D,CAAC;IACH,CAAC;IAED,kDAAkD;IAClD,8CAA8C;IAC9C,0CAA0C;IAC1C,2CAA2C;IAC3C,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,IAAI,IAAI,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;QAChE,MAAM,KAAK,GAAG,0BAA0B,CAAC;QACzC,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QACxE,MAAM,EAAE,GAAG,IAAI,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;QAC9E,IAAI,EAAE,KAAK,SAAS,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;YACxC,MAAM,CAAC,IAAI,CAAC,wCAAwC,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;QACvE,CAAC;aAAM,IAAI,EAAE,KAAK,SAAS,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;YAC/C,MAAM,CAAC,IAAI,CAAC,2CAA2C,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;QAC7E,CAAC;aAAM,CAAC;YACN,IAAI,EAAE,KAAK,SAAS,EAAE,CAAC;gBACrB,OAAO,CAAC,OAAO,GAAG,EAAE,CAAC;gBACrB,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;YAChC,CAAC;YACD,+DAA+D;YAC/D,MAAM,GAAG,GAAG,EAAE,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACvC,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;gBACtB,OAAO,CAAC,UAAU,GAAG,GAAG,CAAC;gBACzB,OAAO,CAAC,IAAI,CAAC,cAAc,GAAG,EAAE,CAAC,CAAC;YACpC,CAAC;QACH,CAAC;IACH,CAAC;IAED,uDAAuD;IACvD,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC5B,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC;QAC7B,OAAO,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IACxC,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;AACvC,CAAC"}