weaver-e10-builder 1.6.8 → 1.6.10

package/dist/commands/wf-form.js

@@ -8,6 +8,9 @@ import { getRichType, resolveBrowserConfig, richIdUnits, BROWSER_TYPE_CATALOG }
 import { dropFieldComponents, prepareLayoutForSave } from '../services/form-field-drop.js';
 import { resolveBrowserByName } from '../services/browser.js';
 import { randomUUID } from 'node:crypto';
+import { resolveStyleTemplateId } from '../services/form-style-template.js';
+import { readTemplateEvidence, verifyAppliedTemplate } from '../services/form-layout-template-verification.js';
+import { workflowExcelStructureIssues } from '../services/workflow-layout-structure.js';
 import { readFileSync } from 'node:fs';
 import { buildConditionDetail, resolveWorkflowEffect, readLinkageConfig } from '../services/form-linkage-condition.js';
 import { resolveSourceForm } from '../services/action-detail.js';
@@ -72,8 +75,34 @@ async function getLayoutMeta(client, baseUrl, formId, layoutMultiId) {
     return {
         layoutId: fl.id || '', layoutMultiId: flm.id || '', layoutName: flm.name || '',
         layoutType: flm.layoutType || 'FLOW', terminalType: flm.terminalType || 'PC',
+        formLayout: fl,
     };
 }
+/** A rebuilding command must never silently replace a non-default template. */
+async function templateForWorkflowRebuild(client, baseUrl, formId, meta, requested) {
+    if (requested)
+        return (await resolveStyleTemplateId(client, baseUrl, formId, meta.layoutType, requested)).id;
+    const defaultId = meta.layoutType === 'FLOW' ? '820000000000000001' : '700000000000000008';
+    if (!(meta.formLayout.pageLayouts || []).some((page) => page.comps?.length) || !meta.formLayout.formStyle?.styleConfig)
+        return defaultId;
+    const defaultStyle = await readTemplateEvidence(client, baseUrl, meta.layoutType, defaultId);
+    if (verifyAppliedTemplate(defaultStyle, meta.formLayout).length) {
+        throw new Error('当前布局不是系统默认模板效果；重建会覆盖现有样式。请显式传 --style-template <当前模板ID>，或使用布局局部编辑能力');
+    }
+    return defaultId;
+}
+async function verifyWorkflowRebuild(client, baseUrl, formId, templateId) {
+    const after = await getLayoutMeta(client, baseUrl, formId);
+    const issues = workflowExcelStructureIssues(after.formLayout);
+    const compCount = after.formLayout.pageLayouts?.[0]?.comps?.length || 0;
+    if (!compCount)
+        issues.push('回读布局没有组件');
+    const evidence = await readTemplateEvidence(client, baseUrl, after.layoutType, templateId);
+    issues.push(...verifyAppliedTemplate(evidence, after.formLayout));
+    if (issues.length)
+        throw new Error(`平台已接受布局，但独立回读校验失败：${issues.join('；')}`);
+    return compCount;
+}
 async function readConfigs(client, baseUrl, formId) {
     const meta = await getLayoutMeta(client, baseUrl, formId);
     const cfg = await client.post(`${baseUrl}${ROUTE}/view/relate/getConfig`, {
@@ -188,6 +217,11 @@ function applyLoneSingleRows(configs) {
     const det = details.map((d) => ({ ...d, singleRow: true }));
     return [...others, ...biz, ...det];
 }
+/** initLayout generates group containers from groupFieldIds; never submit existing Fold containers as input. */
+function withoutCollapseContainers(configs) {
+    return configs.flatMap((c) => c.type === 'Collapse' || c.componentKey === 'Fold'
+        ? withoutCollapseContainers(c.children || []) : [c]);
+}
 // 读表单现有字段分组 → refFieldIds（initLayout/getConfig 的 groupFieldIds）。
 // getFieldGroupPage 返回全部主表字段，字段 formField.group 带 groupId+groupName；
 // refFieldId = groupId - 1（平台先分配 layout config 再分配 formFieldGroup，顺序相连）。
@@ -205,7 +239,7 @@ async function fetchFormGroupEntries(client, baseUrl, formId) {
         for (const f of list) {
             const g = f?.formField?.group;
             if (g?.id)
-                out.push(g);
+                out.push({ ...g, __fieldId: f?.formField?.id || f?.formField?.fieldId || f?.fieldId });
         }
         if (list.length < PAGE)
             break;
@@ -230,6 +264,9 @@ export async function initWorkflowFormLayout(client, baseUrl, formId, o = {}, ho
         throw new Error('无法获取 layoutId');
     // 保留字段分组：getConfig/initLayout 带 groupFieldIds，否则 Collapse 折叠被冲掉
     const groupIds = await fetchFormGroups(client, baseUrl, formId);
+    if (meta.layoutType === 'EXCEL' && o.generateCollapse === false && groupIds.length) {
+        throw new Error('表单已有字段分组；关闭 generateCollapse 会丢失分组子网格，已中止');
+    }
     // ⚠️ configs **一律从默认布局取**，哪怕这次要写的是另一套布局。
     // 实测：拿目标布局自己的 runtime id 去 getConfig 也能回一份 configs（字段数看着一样），
     // 但拿它 initLayout **写不进目标布局** —— 接口回 200、回读 `comps: 0`，静默失败。
@@ -271,7 +308,7 @@ export async function initWorkflowFormLayout(client, baseUrl, formId, o = {}, ho
     if (hooks.preLayout)
         hooks.preLayout(configs);
     // 落单/孤字段占满行（对齐 eb 表）：奇数个最后一个 + 被 singleRow 挤落单的前一字段自动 singleRow
-    const finalConfigs = applyLoneSingleRows(configs);
+    const finalConfigs = applyLoneSingleRows(meta.layoutType === 'EXCEL' ? withoutCollapseContainers(configs) : configs);
     const styleTemplateId = o.styleTemplate
         || (meta.layoutType === 'FLOW' ? '820000000000000001' : '700000000000000008');
     const initRes = await client.post(`${baseUrl}${ROUTE}/view/relate/initLayout`, {
@@ -287,6 +324,10 @@ export async function initWorkflowFormLayout(client, baseUrl, formId, o = {}, ho
     if (initRes?.code !== 200 || !initRes?.status)
         throw new Error(`initLayout 失败: ${initRes?.msg}`);
     const comps = initRes?.data?.pageLayouts?.[0]?.comps || initRes?.data?.formLayout?.pageLayouts?.[0]?.comps || [];
+    const returnedLayout = initRes?.data?.formLayout || { pageLayouts: initRes?.data?.pageLayouts };
+    const structureIssues = workflowExcelStructureIssues(returnedLayout);
+    if (structureIssues.length)
+        throw new Error(`平台已接受布局，但返回结构不完整：${structureIssues.join('；')}`);
     return { layoutType: meta.layoutType, styleTemplateId, comps: comps.length };
 }
 async function genIds(client, baseUrl, n) {
@@ -510,6 +551,7 @@ export function registerWorkflowFormCommands(program) {
         .option('--browser-form-source <src>', '--browser-type form 时的来源：business(默认) / ebuilder')
         .option('--browser-name <name>', '按名字指定浏览数据源（含自定义浏览框，如 "CLM-合同类型"）；优先于 --browser-type')
         .option('--no-init', '跳过末尾自动 layout init（默认加完自动重排布局，对齐 add-fields 批量）')
+        .option('--style-template <name|id>', '自动重排时应用的当前样式模板；已有自定义样式需指定')
         .action(async (formId, fieldName, fieldType, title, o) => {
         try {
             const opts = program.opts();
@@ -519,6 +561,9 @@ export function registerWorkflowFormCommands(program) {
             const client = new ApiClient(auth);
             const baseUrl = auth.getBaseUrl();
             const ebb = { ebbusinessid: formId };
+            const autoTemplate = o.init !== false
+                ? await templateForWorkflowRebuild(client, baseUrl, formId, await getLayoutMeta(client, baseUrl, formId), o.styleTemplate)
+                : undefined;
             const ck = canon(fieldType);
             const colName = toColumnName(fieldName);
             const [fieldId] = await genIds(client, baseUrl, 1);
@@ -634,7 +679,7 @@ export function registerWorkflowFormCommands(program) {
             // 走 initWorkflowFormLayout：强制业务字段可编辑（防 FLOW 锁死）+ 合并运行时 singleRow + applyLoneSingleRows（落单独占整行）。
             if (o.init !== false) {
                 try {
-                    await initWorkflowFormLayout(client, baseUrl, formId, {}, o.singleRow ? {
+                    await initWorkflowFormLayout(client, baseUrl, formId, { styleTemplate: autoTemplate }, o.singleRow ? {
                         preLayout: (cfgs) => {
                             // --single-row：field jsonObj 的 singleRow 平台不落到 layout comp（getConfig 不带），
                             // 显式给新加字段 config.singleRow=true（递归找 fieldId，含明细 children）。
@@ -651,10 +696,12 @@ export function registerWorkflowFormCommands(program) {
                             walkSet(cfgs);
                         },
                     } : undefined);
+                    await verifyWorkflowRebuild(client, baseUrl, formId, autoTemplate);
                     console.error(`  布局已 init`);
                 }
                 catch (e) {
-                    console.error(`  布局 init 失败: ${e?.message || e}（字段已加，手动跑 wf-form layout init）`);
+                    console.error(`  布局 init 或回读失败: ${e?.message || e}（字段已加，布局未确认；请先检查当前布局）`);
+                    process.exitCode = 1;
                 }
             }
             // 开关：布局 init 可能把字段 options 冲回空，布局之后再补一次 开启=1 / 关闭=0。
@@ -1385,6 +1432,7 @@ export function registerWorkflowFormCommands(program) {
         .argument('<formId>', '流程表单 formId')
         .argument('<fieldsJson>', '字段定义 JSON / @文件路径')
         .option('--no-init', '跳过末尾自动 layout init（默认加完自动重排布局）')
+        .option('--style-template <name|id>', '自动重排时应用的当前样式模板；已有自定义样式需指定')
         .action(async (formId, fieldsJson, cmdOpts) => {
         try {
             const opts = program.opts();
@@ -1410,6 +1458,9 @@ export function registerWorkflowFormCommands(program) {
             }
             if (!Array.isArray(defs) || !defs.length)
                 throw new Error('fieldsJson 需为非空数组');
+            const autoTemplate = cmdOpts.init !== false
+                ? await templateForWorkflowRebuild(client, baseUrl, formId, await getLayoutMeta(client, baseUrl, formId), cmdOpts.styleTemplate)
+                : undefined;
             const ids = await genIds(client, baseUrl, defs.length);
             let added = 0;
             for (let i = 0; i < defs.length; i++) {
@@ -1434,12 +1485,13 @@ export function registerWorkflowFormCommands(program) {
             let compCount = 0;
             if (cmdOpts.init !== false && added > 0) {
                 try {
-                    const r = await initWorkflowFormLayout(client, baseUrl, formId);
-                    compCount = r.comps;
+                    const r = await initWorkflowFormLayout(client, baseUrl, formId, { styleTemplate: autoTemplate });
+                    compCount = await verifyWorkflowRebuild(client, baseUrl, formId, autoTemplate);
                     console.error(`  布局已 init: 组件 ${compCount} 个`);
                 }
                 catch (e) {
-                    console.error(`  布局 init 失败: ${e?.message || e}（字段已加，手动跑 wf-form layout init）`);
+                    console.error(`  布局 init 或回读失败: ${e?.message || e}（字段已加，布局未确认；请先检查当前布局）`);
+                    process.exitCode = 1;
                 }
             }
             console.log(opts.json
@@ -1539,8 +1591,14 @@ export function registerWorkflowFormCommands(program) {
             // 读全字段
             const fData = await client.post(`${baseUrl}${ROUTE}/field/manage/getFormField`, { module: MODULE, formTableField: { formField: { id: fieldId, form: { id: formId } } } }, ebb);
             const jsonObj = fData?.data || {};
-            if (!jsonObj.fieldId)
-                throw new Error(`getFormField 未读到字段 fieldId=${fieldId}`);
+            if (!jsonObj.fieldId) {
+                const { configs } = await readConfigs(client, baseUrl, formId);
+                const detail = configs.find((c) => String(c.id) === fieldId &&
+                    (c.componentKey === 'DataTable' || c.type === 'DetailTable'));
+                throw new Error(detail
+                    ? `ID ${fieldId} 是明细表容器，不是普通字段；edit-field 不能修改其标题，当前 CLI 尚无已验证的明细表标题修改命令`
+                    : `getFormField 未读到普通字段 fieldId=${fieldId}`);
+            }
             const changes = [];
             if (o.title !== undefined) {
                 jsonObj.title = o.title;
@@ -1827,6 +1885,7 @@ export function registerWorkflowFormCommands(program) {
         .argument('[firstFieldName]', '首字段名（强烈建议传；空子表 getConfig 读不到）')
         .option('--data-key <k>', '子表物理表名/dataKey（默认 uf_拼音_随机）')
         .option('--init', '创建后跑 layout init 放入 DetailTable 组件')
+        .option('--style-template <name|id>', '配合 --init 时应用的当前样式模板；已有自定义样式需指定')
         .option('--first-field-type <t>', '首字段类型（默认 Text）')
         .option('--first-field-data-key <k>', '首字段编码 dataKey（缺省取首字段名拼音首字母，与 add-field 一致）')
         .action(async (formId, name, firstFieldName, o) => {
@@ -1838,6 +1897,9 @@ export function registerWorkflowFormCommands(program) {
             const client = new ApiClient(auth);
             const baseUrl = auth.getBaseUrl();
             const ebb = { ebbusinessid: formId };
+            const autoTemplate = o.init
+                ? await templateForWorkflowRebuild(client, baseUrl, formId, await getLayoutMeta(client, baseUrl, formId), o.styleTemplate)
+                : undefined;
             const [subFormId] = await genIds(client, baseUrl, 1);
             if (!subFormId)
                 throw new Error('生成 subFormId 失败');
@@ -1874,7 +1936,7 @@ export function registerWorkflowFormCommands(program) {
                 // 走 initWorkflowFormLayout：强制业务字段可编辑 + applyLoneSingleRows（落单独占整行）+ 保留分组；
                 // DetailTable 由 normalizeDetailTableChildren 保留在 configs，applyLoneSingleRows 对明细恒 singleRow。
                 try {
-                    const r = await initWorkflowFormLayout(client, baseUrl, formId);
+                    const r = await initWorkflowFormLayout(client, baseUrl, formId, { styleTemplate: autoTemplate });
                     compCount = r.comps;
                     console.error(`  布局已 init: 组件 ${compCount} 个（含 DetailTable）`);
                 }
@@ -1901,13 +1963,12 @@ export function registerWorkflowFormCommands(program) {
     // 流程表单字段分组（基本信息/系统设置等折叠容器）。三步接口（module=workflow，实测可用）：
     //   ① saveFieldGroup       建分组 → data.group.id(formFieldGroup记录id) + refFieldId(layout Collapse id)
     //   ② updateFormFieldGroup 分配字段（fieldList）
-    //   ③ initLayout            布局：configs 包 Collapse{id:refFieldId, componentKey:"Fold", type:"Collapse",
-    //                             dataKey:"f_"+refFieldId, children:[分组字段]} + 顶层 groupFieldIds:[refFieldId]
-    //   （对齐 eb 表 form-create.ts FLOW 分组结构 / 记忆 field-group-saveFieldGroup-api）
+    //   ③ initLayout            平铺 configs + groupFieldIds，平台生成 Collapse 与子网格
     wfForm.command('group')
         .description('创建字段分组、分配字段并设置布局折叠')
         .argument('<formId>', '流程表单 formId')
         .requiredOption('--groups <json>', '分组定义 JSON：{"分组名":["字段名或ID",...]}，可 @文件路径')
+        .option('--style-template <name|id>', '重建时明确应用的当前样式模板；已有自定义样式必须指定')
         .action(async (formId, o) => {
         try {
             const opts = program.opts();
@@ -1935,6 +1996,8 @@ export function registerWorkflowFormCommands(program) {
             const entries = Object.entries(groups || {});
             if (entries.length === 0)
                 throw new Error('--groups 为空');
+            const initialMeta = await getLayoutMeta(client, baseUrl, formId);
+            const styleTemplateId = await templateForWorkflowRebuild(client, baseUrl, formId, initialMeta, o.styleTemplate);
             // 名字 → 字段列表，无字段的分组也允许（空分组占位，后续 assign）
             // 解析字段（主表字段名→fieldId；含明细字段名但分组只建议主表）
             const { configs } = await readConfigs(client, baseUrl, formId);
@@ -2009,29 +2072,37 @@ export function registerWorkflowFormCommands(program) {
             }, ebb);
             if (cfgRes?.code !== 200 || !cfgRes?.status)
                 throw new Error(`getConfig 失败: ${cfgRes?.msg}`);
-            const allConfigs = JSON.parse(JSON.stringify(cfgRes?.data?.configs || []));
+            const rawConfigs = JSON.parse(JSON.stringify(cfgRes?.data?.configs || []));
+            const allConfigs = meta.layoutType === 'EXCEL' ? withoutCollapseContainers(rawConfigs) : rawConfigs;
             // 合并运行时已保存的 singleRow（getConfig 不带，防 initLayout 冲掉独占一行）
             const allSrSet = await fetchRuntimeSingleRows(client, baseUrl, formId);
             mergeRuntimeSingleRow(allConfigs, allSrSet);
-            // 找出被分组的主表字段 config（顶层非系统非明细），从平铺抽出包 Collapse
-            const groupFieldIdSet = new Set(created.flatMap((g) => g.fieldIds));
-            const collapsedFields = allConfigs.filter((c) => !c.system && c.type !== 'DetailTable' && c.componentKey !== 'DataTable' && groupFieldIdSet.has(String(c.id)));
-            const rest = allConfigs.filter((c) => collapsedFields.indexOf(c) === -1);
-            const groupFieldIds = [];
-            const collapses = [];
-            for (const grp of created) {
-                const children = collapsedFields.filter((c) => grp.fieldIds.includes(String(c.id)));
-                groupFieldIds.push(grp.refFieldId);
-                collapses.push({
-                    id: grp.refFieldId, name: grp.name, componentKey: 'Fold', display: true, show: true,
+            const groupFieldIds = await fetchFormGroups(client, baseUrl, formId);
+            // EXCEL 由平台生成容器与子网格；FLOW 需要显式 Fold 输入。
+            let finalConfigs;
+            if (meta.layoutType === 'EXCEL') {
+                finalConfigs = applyLoneSingleRows(allConfigs);
+            }
+            else {
+                const assigned = await fetchFormGroupEntries(client, baseUrl, formId);
+                const byGroup = new Map();
+                for (const row of assigned) {
+                    const id = String(row.id);
+                    const group = byGroup.get(id) || { name: String(row.groupName || ''), fieldIds: new Set() };
+                    if (row.__fieldId)
+                        group.fieldIds.add(String(row.__fieldId));
+                    byGroup.set(id, group);
+                }
+                const groupedIds = new Set([...byGroup.values()].flatMap(g => [...g.fieldIds]));
+                const rest = allConfigs.filter((c) => !groupedIds.has(String(c.id)));
+                const folds = [...byGroup].map(([groupId, grp]) => ({
+                    id: String(BigInt(groupId) - 1n), name: grp.name, componentKey: 'Fold', display: true, show: true,
                     readOnly: true, required: false, disableEdit: false, singleRow: false, isDelete: false,
-                    type: 'Collapse', typeDescribe: '分组', dataKey: `f_${grp.refFieldId}`,
-                    children,
-                });
+                    type: 'Collapse', typeDescribe: '分组', dataKey: `f_${String(BigInt(groupId) - 1n)}`,
+                    children: allConfigs.filter((c) => grp.fieldIds.has(String(c.id))),
+                }));
+                finalConfigs = applyLoneSingleRows([...folds, ...rest]);
             }
-            // 落单/孤字段占满行（含分组内字段 singleRow 由平台 Collapse 自行排布，只对未分组字段算）
-            const finalConfigs = applyLoneSingleRows([...collapses, ...rest]);
-            const styleTemplateId = meta.layoutType === 'FLOW' ? '820000000000000001' : '700000000000000008';
             const initRes = await client.post(`${baseUrl}${ROUTE}/view/relate/initLayout`, {
                 formId, module: MODULE, apiModule: 'workflow/form', layoutId: meta.layoutId,
                 generateCollapse: true, styleTemplateId, styleTemplateType: 1,
@@ -2043,10 +2114,10 @@ export function registerWorkflowFormCommands(program) {
             }, ebb);
             if (initRes?.code !== 200 || !initRes?.status)
                 throw new Error(`initLayout 失败: ${initRes?.msg}`);
-            const comps = initRes?.data?.pageLayouts?.[0]?.comps || initRes?.data?.formLayout?.pageLayouts?.[0]?.comps || [];
+            const compCount = await verifyWorkflowRebuild(client, baseUrl, formId, styleTemplateId);
             console.log(opts.json
-                ? JSON.stringify({ success: true, formId, groups: created.map((g) => ({ name: g.name, groupId: g.groupId, refFieldId: g.refFieldId, fieldCount: g.fieldIds.length })), comps: comps.length }, null, 2)
-                : `字段分组完成: ${created.length} 个分组，布局 ${comps.length} 组件`);
+                ? JSON.stringify({ success: true, formId, groups: created.map((g) => ({ name: g.name, groupId: g.groupId, refFieldId: g.refFieldId, fieldCount: g.fieldIds.length })), comps: compCount }, null, 2)
+                : `字段分组完成: ${created.length} 个分组，布局 ${compCount} 组件`);
         }
         catch (e) {
             console.error(`字段分组失败: ${e.message}`);
@@ -2288,6 +2359,7 @@ export function registerWorkflowFormCommands(program) {
         .option('--readonly <fields...>', '设为只读（readOnly=true, disableEdit=true）')
         .option('--editable <fields...>', '设为可编辑（readOnly=false, disableEdit=false）')
         .option('--single-row <fields...>', '独占一行（singleRow=true）')
+        .option('--style-template <name|id>', '重建时明确应用的当前样式模板；已有自定义样式必须指定')
         .action(async (formId, o) => {
         try {
             const opts = program.opts();
@@ -2300,6 +2372,7 @@ export function registerWorkflowFormCommands(program) {
             const meta = await getLayoutMeta(client, baseUrl, formId);
             if (!meta.layoutId)
                 throw new Error('无法获取 layoutId');
+            const styleTemplateId = await templateForWorkflowRebuild(client, baseUrl, formId, meta, o.styleTemplate);
             // 保留字段分组：getConfig/initLayout 带 groupFieldIds，否则 Collapse 折叠被冲掉
             const groupIds = await fetchFormGroups(client, baseUrl, formId);
             // 读当前布局 configs（含明细 children + Collapse 分组）
@@ -2349,8 +2422,7 @@ export function registerWorkflowFormCommands(program) {
             apply(o.editable, (c) => { c.readOnly = false; c.disableEdit = false; }, '可编辑');
             apply(o.singleRow, (c) => { c.singleRow = true; }, '独占一行');
             // 落单/孤字段占满行（对齐 eb 表）：奇数个最后一个 + 被 singleRow 挤落单的前一字段自动 singleRow
-            const finalConfigs = applyLoneSingleRows(configs);
-            const styleTemplateId = meta.layoutType === 'FLOW' ? '820000000000000001' : '700000000000000008';
+            const finalConfigs = applyLoneSingleRows(meta.layoutType === 'EXCEL' ? withoutCollapseContainers(configs) : configs);
             const initRes = await client.post(`${baseUrl}${ROUTE}/view/relate/initLayout`, {
                 formId, module: MODULE, apiModule: 'workflow/form', layoutId: meta.layoutId,
                 generateCollapse: true, styleTemplateId, styleTemplateType: 1,
@@ -2362,10 +2434,10 @@ export function registerWorkflowFormCommands(program) {
             }, ebb);
             if (initRes?.code !== 200 || !initRes?.status)
                 throw new Error(`initLayout 失败: ${initRes?.msg}`);
-            const comps = initRes?.data?.pageLayouts?.[0]?.comps || initRes?.data?.formLayout?.pageLayouts?.[0]?.comps || [];
+            const compCount = await verifyWorkflowRebuild(client, baseUrl, formId, styleTemplateId);
             console.log(opts.json
-                ? JSON.stringify({ success: true, formId, layoutType: meta.layoutType, comps: comps.length }, null, 2)
-                : `字段属性已保存: 布局 ${comps.length} 组件`);
+                ? JSON.stringify({ success: true, formId, layoutType: meta.layoutType, comps: compCount }, null, 2)
+                : `字段属性已保存: 布局 ${compCount} 组件`);
         }
         catch (e) {
             console.error(`设置字段属性失败: ${e.message}`);