weaver-e10-builder 1.0.7-beta → 1.0.9-beta

package/dist/commands/workflow.js

@@ -90,7 +90,9 @@ export function registerWorkflowCommands(program) {
         .argument('<formObjId>', '表单 objId')
         .argument('<name>', '流程名称')
         .argument('[desc]', '流程描述', '')
+        .option('--workflow-type <type>', '工作流类型：名称(如"公文审批")或 ID(默认 -1=其它)', '-1')
         .option('--no-menu', '不自动添加发起菜单（默认建流程后自动加，指向表单新建页）')
+        .option('--no-auto-layout', '跳过建后自动排版节点（默认建完跑 auto-layout）')
         .action(async (appId, formObjId, name, desc, cmdOpts) => {
         const opts = program.opts();
         const auth = await AuthSession.fromOptions(opts);
@@ -106,6 +108,18 @@ export function registerWorkflowCommands(program) {
             process.exit(1);
         }
         console.error(`  objId ${formObjId} -> formId ${realFormId}`);
+        // 工作流类型：认 ID（如 -1=其它）或名称（如"公文审批"）。名称走 workflowPathTypeBrowser 解析。
+        // eb 流程也有流程类型概念，只是默认 -1（其它）。
+        let workflowType = cmdOpts.workflowType || '-1';
+        if (workflowType !== '-1' && !/^-?\d+$/.test(workflowType)) {
+            const tRes = await client.post(`${baseUrl}/api/workflow/pathdef/common/browser/complete/workflowPathTypeBrowser`, { browserMultiple: false, belongType: 1, showAddBtn: true, checkDetachable: true, newly: 1, searchValue: workflowType });
+            const types = tRes?.data?.data || [];
+            const hit = types.find((t) => t.name === workflowType || t.content === workflowType) || (types.length === 1 ? types[0] : null);
+            if (!hit)
+                throw new Error(`工作流类型 "${workflowType}" 未找到（可用: ${types.map((t) => t.name).join(', ')} 或 -1=其它）`);
+            workflowType = String(hit.id);
+            console.error(`  工作流类型: ${hit.name} (${workflowType})`);
+        }
         // Create workflow
         const ts = Date.now();
         const payload = {
@@ -113,7 +127,7 @@ export function registerWorkflowCommands(program) {
             createClient: '0', ebFormId: realFormId, createPcShow: ['0'], wfSymbol: '',
             orderId: '0.0', moduleCard: 0, createType: '0', workflowName: name,
             workflowDesc: desc, relateForm: '4', isLock: '0', isFree: '0',
-            addDefaultHide: 0, createPcShowCustom: '', workflowType: '-1', id: '0',
+            addDefaultHide: 0, createPcShowCustom: '', workflowType, id: '0',
             workflowNameMultiLang: { tablefiled: 'wfp_base.workflowname', targetId: String(ts), needReplaceTargetId: true },
             createMobileShowCustom: '', status: '1', createMobileShow: ['0'],
             formMode: '0', formId: 0, relateFormMode: '0', workflowId: -1,
@@ -179,6 +193,17 @@ export function registerWorkflowCommands(program) {
         catch {
             console.error('  警告: 无法自动设置发起权限，请手动设置');
         }
+        // 流程节点自动排版（建好即布局，避免节点堆叠在原点；与工作流程 create-workflow 对齐）。
+        if (cmdOpts.autoLayout) {
+            try {
+                const { autoLayoutWorkflow } = await import('../services/workflow-layout.js');
+                await autoLayoutWorkflow({ client, baseUrl, workflowId });
+                console.error('  节点已自动排版（auto-layout）');
+            }
+            catch (e) {
+                console.error(`  警告: 自动排版失败: ${e.message}（可用 workflow auto-layout <wf> 手动重排）`);
+            }
+        }
         const workflowUrl = `${baseUrl}/sp/workflow/flowpage/create/${workflowId}`;
         // Auto-add 发起 menu (LAYOUT → form create page, triggers bound workflow)
         let menuId = null;
@@ -256,7 +281,7 @@ export function registerWorkflowCommands(program) {
         const baseUrl = auth.getBaseUrl();
         const body = {
             isTemplate: 0,
-            belongType: parseInt(cmdOpts.belong) || 1,
+            belongType: cmdOpts.belong !== undefined && cmdOpts.belong !== '' ? parseInt(cmdOpts.belong) : 1,
             current: parseInt(cmdOpts.pageNo) || 1,
             pageSize: parseInt(cmdOpts.pageSize) || 20,
             searchParams: {
@@ -2324,18 +2349,70 @@ export function registerWorkflowCommands(program) {
             const fieldName = parsed.fieldName || '';
             const value = String(parsed.value);
             const nodeName = parsed.nodeName || '节点';
-            const trigger = parsed.trigger || 'pre';
+            const client = new ApiClient(auth);
+            const baseUrl = auth.getBaseUrl();
+            // 触发时机（抓包确认）：正向离开=after+["1"] / 退回到达=pre+["2"]。
+            //   trigger 值：pre(到达) / after 或 leave(正向离开) / back-arrive(退回到达) / delete / save / revert / pause / cancel
+            //   trigger 含 '-' 时为时机别名，拆出 triggerType + executeTime；其余直接当 triggerType，executeTime 默认 ["1"]。
+            const rawTrigger = parsed.trigger || 'pre';
+            let triggerType = rawTrigger;
+            let executeTime = ['1'];
+            if (rawTrigger === 'leave' || rawTrigger === 'after') {
+                triggerType = 'after';
+                executeTime = ['1'];
+            }
+            else if (rawTrigger === 'back-arrive' || rawTrigger === 'back') {
+                triggerType = 'pre';
+                executeTime = ['2'];
+            }
+            else if (Array.isArray(parsed.executeTime))
+                executeTime = parsed.executeTime;
+            // Select/SelectMultiple 字段常量赋值 customValue 必须存选项 valueKey：
+            //   流程表单 Select valueKey=序号(0/1/2)；eb 表 Select valueKey=雪花id(=selectionId)。
+            //   存选项名会导致设计器打开值空、actionName 值部分被清。
+            // 两类表单字段读取接口不同，需兼容：先 workflow 接口（流程表单），读不到再 eb 接口（eb 表关联流程）。
+            // formId 从 getDisplayLayoutForm 反查（流程表单=formId，eb 表=关联 eb 表 formId）。
+            let customValue = value;
+            try {
+                const dl = await client.get(`${baseUrl}/api/bs/workflow/pathdef/nodeLayout/getDisplayLayoutForm?workflowId=${wf}&nodeId=${nodeId}`);
+                const fid = String(dl?.data?.formId || '');
+                if (fid && parsed.fieldId) {
+                    let f = {};
+                    // ① workflow 接口（流程表单 Select，valueKey=0/1/2）
+                    try {
+                        const gf = await client.post(`${baseUrl}/api/workflow/core/form/field/manage/getFormField`, { module: 'workflow', formTableField: { formField: { id: parsed.fieldId, form: { id: fid } } } }, { ebbusinessid: fid });
+                        f = gf?.data || {};
+                    }
+                    catch { /* try eb */ }
+                    // ② workflow 接口读不到 options（eb 流程字段在 eb 表）→ eb 接口（valueKey=雪花id）
+                    // eb 接口需 customParam:{objId}（用 formId 当 objId 即可读到 options，抓包确认）
+                    if (!Array.isArray(f.options) || f.options.length === 0) {
+                        try {
+                            const gf2 = await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/getFormField`, { module: 'ebuilderform', customParam: { objId: fid }, formTableField: { formField: { id: parsed.fieldId, form: { id: fid } } } }, { ebbusinessid: fid });
+                            f = gf2?.data || {};
+                        }
+                        catch { /* 保持 */ }
+                    }
+                    if (/select/i.test(String(f.type || f.componentKey || ''))) {
+                        const opts = Array.isArray(f.options) ? f.options : [];
+                        const hit = opts.find((o) => o.name === value);
+                        if (hit)
+                            customValue = String(hit.valueKey);
+                    }
+                }
+            }
+            catch { /* 解析失败保持原值（非 Select 或字段读不到） */ }
             payload = {
                 workflowId: wf, objId: nodeId, triggerType: 'all',
                 data: [{
                         id: tempIdNeg(),
                         actionName: `${fieldName} = ${value}`.trim(),
-                        executeTime: ['1'], open: true, async: 0, actionType: 0,
-                        dateRuleStr: '', triggerType: trigger, order: 0,
+                        executeTime: executeTime, open: true, async: 0, actionType: 0,
+                        dateRuleStr: '', triggerType: triggerType, order: 0,
                         targetValue: parsed.fieldId,
                         firstValue: 'custom',
                         operatorValue: '', secondValue: '',
-                        customValue: value,
+                        customValue,
                         dateRule: [], isCreate: false,
                     }],
                 isNodeFlag: '1', objName: nodeName,