weaver-e10-builder 1.0.12-beta → 1.1.0

package/dist/commands/form.js

@@ -242,7 +242,7 @@ export function registerFormCommands(program) {
         .argument('<name>', '表单名称')
         .argument('[dir]', '输出目录（可选，记录 memo.md）')
         .requiredOption('--fields <json>', '字段定义 JSON 文件路径（如 @fields.json），格式：[{"componentKey":"Text","fieldName":"姓名"}]')
-        .option('--no-menu', '不自动添加台账菜单（默认建表后自动加）')
+        .option('--menu', '建表后添加台账菜单（默认不加；漏加可用 `e10-cli menu add-table` 补）')
         .option('--layout <type>', '表单布局类型：FLOW(流式)/EXCEL(表格，缺省)。布局类型建表后不可切换', 'EXCEL')
         .action(async (appId, name, dir, cmdOpts) => {
         const opts = program.opts();
@@ -722,6 +722,74 @@ export function registerFormCommands(program) {
                 }
             }
         }
+        // Step 2b: Flow 字段（浏览-流程）绑 sformId —— 对齐 EBuilder Step 2。
+        // 之前 form create 只对 EBuilder 事后绑 sformId（Step 2），Flow 无对应步骤 → fields.json 里 Flow 的
+        // sformId 被丢弃，字段建成无关联裸 Flow（"该字段未配置"）。此处补 Flow 的 sformId/relateExt 等，
+        // payload 镜像 form add-field 的 Flow 分支。getFormField 读全量→patch→saveFormFieldNew（防最小 jsonObj 覆盖）。
+        const flowFields = fieldDefs.filter(f => f.componentKey === 'Flow' && f.sformId);
+        if (flowFields.length > 0) {
+            console.error(`  绑定 ${flowFields.length} 个 Flow 关联流程字段 sformId...`);
+            await resolveFormId();
+            // 目标流程表单名（按 sformId 查应用表单列表；跨应用找不到则用 sformId 兜底，formName 仅展示文本）
+            let allForms = [];
+            try {
+                const formList = await client.get(`${baseUrl}/api/bs/ebuilder/form/obj/getList/${appId}?apid=${appId}`, { ebbusinessid: appId });
+                allForms = formList?.data || [];
+            }
+            catch { /* 查不到则 formName 用 sformId */ }
+            // 读已建字段（拿 fieldId）
+            const ffFieldData = await client.post(`${baseUrl}/api/ebuilder/form/dataset/v1/getFields`, {
+                objId, userid: auth.userId, tenantKey: auth.tenantKey,
+            });
+            const ffAllFields = ffFieldData?.data?.mainFields || [];
+            for (const ff of flowFields) {
+                const ffField = ffAllFields.find((f) => f.fieldName === ff.fieldName && /^\d+$/.test(String(f.fieldId)));
+                if (!ffField) {
+                    console.error(`    ⚠ 找不到 Flow 字段: ${ff.fieldName}`);
+                    continue;
+                }
+                const sformId = String(ff.sformId);
+                // 读字段全量配置（保留列名等，防最小 jsonObj 覆盖破坏；对齐 Step 5b/Step 8 保护模式）
+                let cur = {};
+                try {
+                    const gf = await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/getFormField`, { module: 'ebuilderform', formTableField: { formField: { id: String(ffField.fieldId), form: { id: resolvedFormId } } } }, { ebbusinessid: resolvedFormId });
+                    cur = gf?.data || {};
+                }
+                catch { /* best effort */ }
+                if (!cur?.fieldId) {
+                    console.error(`    ⚠ 未读到 Flow 字段 ${ff.fieldName}（fieldId=${ffField.fieldId}），跳过`);
+                    continue;
+                }
+                const tfm = allForms.find((fm) => String(fm.id) === sformId);
+                const targetFormName = tfm?.formName || tfm?.objName || tfm?.name || tfm?.showName || sformId;
+                // spread cur 全量 + patch Flow 关联配置（镜像 form add-field Flow payload，form.ts add-field Flow 分支）
+                const jsonObj = {
+                    ...cur,
+                    isAddForRelation: true,
+                    sformId,
+                    formName: targetFormName,
+                    conditionOperate: 'and',
+                    filterParams: '{}',
+                    filterQueryParams: '{}',
+                    columnFields: [],
+                    displayType: 'line',
+                    viewDataDetail: true,
+                    pcDisplaySelectedCount: { type: 'default' },
+                    mobileDisplaySelectedCount: { type: 'default' },
+                    relateExt: { module: 'workflow', displayOccupyDetail: false, filterConflicts: false },
+                    relateField: null,
+                    quickAddParams: [],
+                    formId: resolvedFormId,
+                };
+                const updateRes = await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/saveFormFieldNew?apid=${appId}`, { formId: resolvedFormId, module: 'ebuilderform', customParam: { appId, objId }, jsonObj: JSON.stringify(jsonObj) }, { ebbusinessid: resolvedFormId });
+                if (updateRes?.code === 200 && updateRes?.status) {
+                    console.error(`    已关联: ${ff.fieldName} → 流程表单 ${sformId}（${targetFormName}）`);
+                }
+                else {
+                    console.error(`    关联失败: ${ff.fieldName} — ${updateRes?.msg || '未知错误'}`);
+                }
+            }
+        }
         // Step 3: Configure ffRelateField for fields that auto-fill from EBuilder records
         const relateFields = fieldDefs.filter(f => f.relateFrom?.ebuilderField && f.relateFrom?.sourceFieldId);
         if (relateFields.length > 0) {
@@ -1487,7 +1555,7 @@ export function registerFormCommands(program) {
                 console.error(`  字段分组分配失败: ${e.message}（分组已建，字段未分配，可在设计器手动拖入分组）`);
             }
         }
-        if (cmdOpts.menu !== false) {
+        if (cmdOpts.menu) {
             try {
                 const { addFormTableViewMenu } = await import('./menu.js');
                 menuId = await addFormTableViewMenu(client, baseUrl, appId, objId, name);
@@ -1641,6 +1709,52 @@ export function registerFormCommands(program) {
             process.exit(1);
         }
     });
+    linkageCmd.command('list')
+        .description('查看显隐联动规则列表（回读条件/动作/启用状态）')
+        .argument('<appId>', '应用 ID')
+        .argument('<objId>', '表单 objId')
+        .option('--keyword <text>', '按规则名搜索')
+        .action(async (appId, objId, cmdOpts) => {
+        const opts = program.opts();
+        const auth = await AuthSession.fromOptions(opts);
+        if (!auth)
+            process.exit(1);
+        const client = new ApiClient(auth);
+        const baseUrl = auth.getBaseUrl();
+        // objId → formId
+        const listData = await client.get(`${baseUrl}/api/bs/ebuilder/form/obj/getList/${appId}?apid=${appId}`, { ebbusinessid: appId });
+        const formInfo = (listData?.data || []).find((f) => String(f.id) === String(objId));
+        const formId = formInfo?.formId || '';
+        if (!formId) {
+            console.error('无法获取 formId，请确认 objId 正确');
+            process.exit(1);
+        }
+        // queryByPages：省略 keyword/orderData 空串（服务端 DTO 反序列化空串会 500 "Cannot coerce empty String"）
+        const body = {
+            formId, module: 'ebuilderform', linkageTypeList: ['template', 'sql'],
+            customParam: { appId, objId }, pageNo: 1, pageSize: 50,
+        };
+        if (cmdOpts.keyword)
+            body.keyword = cmdOpts.keyword;
+        const res = await client.post(`${baseUrl}/api/ebuilder/form/form/setting/viewlinkage/queryByPages?apid=${appId}`, body, { ebbusinessid: appId });
+        if (res?.code !== 200 || !res?.status) {
+            console.error(`查询失败: ${res?.msg || '未知错误'}`);
+            process.exit(1);
+        }
+        const list = res?.data?.result || [];
+        if (opts.json) {
+            console.log(JSON.stringify(list, null, 2));
+        }
+        else {
+            console.log(`共 ${res?.data?.totalCount ?? list.length} 条联动规则:`);
+            for (const x of list) {
+                const en = x.enableState === '1' ? '启用' : '停用';
+                console.log(`  [${x.id}] ${x.linkageName} (${en})`);
+                console.log(`      条件: ${x.conditionShowValue || '—'}`);
+                console.log(`      动作: ${x.linkageDetailShowValue || '—'}`);
+            }
+        }
+    });
     form.command('field-options')
         .description('给已有 Select/RadioBox/CheckBox 字段设置选项和默认值')
         .argument('<objId>', '表单 objId')