weaver-e10-builder 1.6.6 → 1.6.8

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,iBAAiB,CAAC,EAAE,CAAC,GAAG,CAAC,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,EACzK,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"}
+{"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;AA2P9C;;;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,iBAAiB,CAAC,EAAE,CAAC,GAAG,CAAC,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,EACzK,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,CAsmEtE"}

package/dist/commands/wf-form.js

@@ -10,7 +10,9 @@ import { resolveBrowserByName } from '../services/browser.js';
 import { randomUUID } from 'node:crypto';
 import { readFileSync } from 'node:fs';
 import { buildConditionDetail, resolveWorkflowEffect, readLinkageConfig } from '../services/form-linkage-condition.js';
+import { resolveSourceForm } from '../services/action-detail.js';
 import { resolveFormulaRefs } from '../services/formula-detail.js';
+import { addSystemFieldsToLayout, setDefaultLayout, updateFormLayout } from '../services/workflow-node-layout.js';
 import { FLOW_ROUTE, assertAssignableTarget, buildAssignExpression, buildDrivingColumnsBody, buildDrivingEventsBody, buildFdEffect, buildFormulaLinkageName, buildFormulaSavePayload, buildLinkageApiUrl, buildLinkageExt, buildLinkageDeleteBody, buildLinkageListBody, buildLinkageQueryBody, buildLinkageSavePayload, buildLinkageUpdatePayload, buildMonitorActions, buildPreCheckBody, buildTriggerSpecs, describeColumn, extractEffect, findAssignEquals, formatSpecsLine, isAssignableTarget, isWorkflowDimension, mergeMonitorActions, moduleColumnsOf, partitionDrivingColumns, resolveDrivingColumn, specsFromStoredTriggers, storedTriggers, summarizeLinkage, formatTriggerLine, targetDriftWarning, toBareLabel, } from '../services/form-formula-linkage.js';
 /** 流程表单选项配色（对齐浏览器抓包 styleConfig.OptionBackground，循环取用）。 */
 const OPTION_COLORS = ['#FFBD4F', '#FF716E', '#3BD8C3', '#5B8FF9', '#5AD8A6', '#F6BD16', '#E86452', '#6DC8EC', '#945FB9', '#FF99C3'];
@@ -1038,8 +1040,8 @@ export function registerWorkflowFormCommands(program) {
         .argument('<formId>', '流程表单 formId')
         .argument('<name>', '联动名称')
         .requiredOption('--config <json>', '联动配置 JSON：{"conditions":[{"field":"请假天数","operator":"EQUAL","value":"3"}],"actions":[{"prop":"hide","fields":["请假事由"]}]}。prop: hide/show/edit/readonly/required/hideLine；'
-        + 'operator: EQUAL/NOT_EQUAL/CONTAIN/NOT_CONTAIN/GREATER/LESS/GREATER_EQUAL/LESS_EQUAL，'
-        + '**为空写 NULL（或 EMPTY，会归一）、不为空写 NOT_NULL**（默认 EQUAL）；'
+        + 'operator: EQUAL/GREATER/LESS/GREATER_EQUAL/LESS_EQUAL，**为空写 NULL（或 EMPTY，会归一）、不为空写 NOT_NULL**（默认 EQUAL）；'
+        + '不等于/包含/不包含改写在 config 的 formula 里（Boolean 公式）；'
         + '顶层可选 "detailType":"AND|OR"（界面上「所有」/「任一」）；'
         + '"effect" 指定生效维度：不写=当前表单，"workFlow"=当前工作流，"includeNode"=选择节点（后者另需 "nodeId"）')
         .option('--workflow-id <id>', '流程 ID。生效维度选「当前工作流」或「选择节点」时必给（该联动挂在流程上，refId 也是它）')
@@ -1052,6 +1054,18 @@ export function registerWorkflowFormCommands(program) {
             const client = new ApiClient(auth);
             const baseUrl = auth.getBaseUrl();
             const ebb = { ebbusinessid: formId };
+            // 流程绑的是 EB 卡片表单时，这条路由的 getConfig 只回系统字段，业务字段一个都读不到。
+            // 显示属性联动该走 EB 表单路由（module=ebuilderform），这里直接把 appId/objId 解出来。
+            if (cmdOpts.workflowId) {
+                const ebRef = await resolveSourceForm(client, baseUrl, cmdOpts.workflowId);
+                if (ebRef && ebRef.sourceFormId === formId) {
+                    throw new Error(`该流程绑定的是 EB 卡片表单（appId=${ebRef.sourceAppId}，objId=${ebRef.sourceObjId}），`
+                        + '显示属性联动要走 EB 表单路由：\n'
+                        + `  e10-cli form linkage add ${ebRef.sourceAppId} ${ebRef.sourceObjId} "<联动名称>" --config @rule.json\n`
+                        + `字段 ID 用 e10-cli form read ${ebRef.sourceObjId} --app-id ${ebRef.sourceAppId} 查。`
+                        + 'wf-form linkage 只适用于原生流程表单。');
+                }
+            }
             const cfg = readLinkageConfig(cmdOpts.config);
             if (!Array.isArray(cfg.conditions) || !Array.isArray(cfg.actions) || !cfg.actions.length) {
                 throw new Error('config 需含 conditions[] 和非空 actions[]');
@@ -1062,6 +1076,11 @@ export function registerWorkflowFormCommands(program) {
                 throw new Error(`action prop 不支持（仅 ${SUPPORTED.join(',')}）`);
             // getConfig 解析字段名 → fieldId/dataKey/componentKey（主表 + 明细 children）
             const { configs } = await readConfigs(client, baseUrl, formId);
+            if (!configs.some((c) => !c.system)) {
+                throw new Error('表单调取不到业务字段（getConfig 只回了系统字段）。流程绑定 EB 卡片表单时，'
+                    + 'wf-form linkage 这条原生路由读不到它的字段：先用 `workflow info <workflowId>` 取 objId/appId，'
+                    + '改用 `form linkage <appId> <objId>`；传 --workflow-id 可让命令直接判定并给出该命令。');
+            }
             const allFields = [];
             for (const c of configs) {
                 if (c.system)
@@ -2084,6 +2103,119 @@ export function registerWorkflowFormCommands(program) {
             process.exitCode = 1;
         }
     });
+    // ---------- wf-form layout rename（改布局名称/描述）----------
+    // 抓包（mulinquan 2026-10-29）：POST /api/workflow/core/form/layout/update
+    //   body: { module, customParam:{workflowId,isNodeLayout:true},
+    //           formLayoutMultiple:<layout/list 那一行，只换 name/describe>, local, copyConfig }
+    // ⚠ 不是 layout/save：带 formLayoutMultiple.id 调 save 会走插入分支，直接主键冲突 500。
+    layoutCmd.command('rename')
+        .description('修改布局名称或描述；布局内容、引用节点与默认设置保持不变')
+        .argument('<formId>', '流程表单 formId')
+        .argument('<layout>', '布局 ID 或布局名称（同名多套会报歧义并列出 ID）')
+        .option('--name <name>', '新的布局名称（不传 = 保持原名）')
+        .option('--describe <text>', '新的布局描述（不传 = 保持原描述）')
+        .option('--workflow-id <id>', '工作流 ID（不传时用 formId 兜底，与 layout add 一致）')
+        .action(async (formId, layout, o) => {
+        try {
+            if (o.name === undefined && o.describe === undefined)
+                throw new Error('至少提供 --name 或 --describe');
+            const opts = program.opts();
+            const auth = await AuthSession.fromOptions(opts);
+            if (!auth)
+                throw new Error('无法加载认证');
+            const client = new ApiClient(auth);
+            const r = await updateFormLayout(client, {
+                formId, layout, name: o.name, describe: o.describe, workflowId: o.workflowId,
+            });
+            console.log(opts.json
+                ? JSON.stringify({ success: true, formId, ...r }, null, 2)
+                : (r.changed
+                    ? `布局已修改: 「${r.oldName}」→「${r.name}」${r.describe !== r.oldDescribe ? `  描述「${r.describe}」` : ''}（layoutId=${r.layoutId}，${r.terminalType}/${r.layoutType}${r.isDefault ? '，默认布局' : ''}）`
+                    : `布局「${r.name}」的名称与描述本来就是这样，未改动（layoutId=${r.layoutId}）`));
+        }
+        catch (e) {
+            console.error(`修改布局失败: ${e.message}`);
+            process.exitCode = 1;
+        }
+    });
+    // ---------- wf-form layout set-default（设为默认布局）----------
+    // 抓包（mulinquan 2026-10-29）：POST /api/workflow/core/form/layout/updateDefault
+    //   body: { module, formLayoutMultiple:{ id, form:{id:formId}, default:true, terminalType }, local:true }
+    // 默认布局是**表单维度、PC/移动端各一套** —— 终端取自目标布局自身，不让调用方另传。
+    layoutCmd.command('set-default')
+        .description('把某套布局设为该终端的默认布局（PC 与移动端各自一套，互不影响）')
+        .argument('<formId>', '流程表单 formId')
+        .argument('<layout>', '布局 ID 或布局名称（同名多套会报歧义并列出 ID）')
+        .option('--workflow-id <id>', '工作流 ID（不传时用 formId 兜底，与 layout add 一致）')
+        .action(async (formId, layout, o) => {
+        try {
+            const opts = program.opts();
+            const auth = await AuthSession.fromOptions(opts);
+            if (!auth)
+                throw new Error('无法加载认证');
+            const client = new ApiClient(auth);
+            const r = await setDefaultLayout(client, { formId, layout, workflowId: o.workflowId });
+            console.log(opts.json
+                ? JSON.stringify({ success: true, formId, ...r }, null, 2)
+                : (r.changed
+                    ? `已设为默认布局: 「${r.name}」（${r.terminalType}，layoutId=${r.layoutId}）`
+                        + `${r.previousDefaultId ? `，原默认 ${r.previousDefaultId}` : ''}`
+                    : `「${r.name}」本来就是 ${r.terminalType} 端默认布局，未改动（layoutId=${r.layoutId}）`));
+        }
+        catch (e) {
+            console.error(`设置默认布局失败: ${e.message}`);
+            process.exitCode = 1;
+        }
+    });
+    // ---------- wf-form layout add-system-field（摆流程系统字段）----------
+    // 走设计器保存那条：读 getFormLayout → 往 comps 末尾追加 → builder/saveFormAndLayout
+    // （抓包 2026-10-29：pageLayouts 原始 JSON 可直接落库，必须带 formLayout.multipleLayoutId）。
+    layoutCmd.command('add-system-field')
+        .description('把流程系统字段（提交人 / 流程编号 / 流程状态…）摆进布局；已存在的自动跳过')
+        .argument('<formId>', '流程表单 formId')
+        .argument('[fields...]', '系统字段名称或 key（如 提交人、REQUEST_NO）；加 --all 表示全部')
+        .option('--layout-id <id>', '目标布局（布局 ID 或名称）；不传 = PC 端默认布局')
+        .option('--all', '添加目录里的全部系统字段')
+        .option('--single-row', '新增的系统字段各占一行')
+        .option('--workflow-id <id>', '工作流 ID（不传时用 formId 兜底）')
+        .action(async (formId, fields, o) => {
+        try {
+            const opts = program.opts();
+            const auth = await AuthSession.fromOptions(opts);
+            if (!auth)
+                throw new Error('无法加载认证');
+            const client = new ApiClient(auth);
+            const r = await addSystemFieldsToLayout(client, {
+                formId,
+                layoutId: o.layoutId,
+                fields,
+                all: o.all === true,
+                singleRow: o.singleRow === true,
+                workflowId: o.workflowId,
+                tenantKey: auth.tenantKey,
+            });
+            if (opts.json) {
+                console.log(JSON.stringify({ success: true, formId, ...r }, null, 2));
+                return;
+            }
+            const where = `布局「${r.layoutName}」（${r.terminalType}，layoutId=${r.layoutId}）`;
+            if (!r.added.length) {
+                console.log(`${where} 已经包含所选系统字段，未改动`);
+            }
+            else {
+                console.log(`已添加 ${r.added.length} 个系统字段到${where}：`);
+                for (const a of r.added)
+                    console.log(`  + ${a.title}（${a.key}）`);
+            }
+            if (r.skipped.length) {
+                console.log(`已存在跳过 ${r.skipped.length} 个：${r.skipped.map((s) => s.title).join('、')}`);
+            }
+        }
+        catch (e) {
+            console.error(`添加系统字段失败: ${e.message}`);
+            process.exitCode = 1;
+        }
+    });
     // ---------- wf-form layout delete（删除布局）----------
     // 抓包（mulinquan 2026-08-25）：POST /api/bs/workflow/pathdef/form/layout/emptyNodeLayout
     //   body: { layoutId, workflowId, terminal:'PC' } → data=true，**效果=从布局列表删除该布局**