fix(BS-New-4): bindFlow 走 /workflow/template/Save 真持久化 start node formId
BS-New-4: 旧版 PUT /workflow/template/{id} body={onLineformId, formId, onlineFormId}
3 字段全部被后端静默忽略 (TemplateCrForm 根本没这些字段, TemplateEntity 也没有)
根因 (jxcj 2026-06-30 实战):
- TemplateEntity 没有 onLineformId 字段
- TemplateCrForm 只有 enCode/fullName/type/category/flowConfig/flowXml/flowNodes
- 真正的持久化机制: POST /workflow/template/Save 把 start node formId 写入
TemplateNodeEntity.f_form_id (后端 TemplateJsonServiceImpl.save() 解析 flowNodes)
修: 重写 bindFlow 4 步:
1. form 端: PUT /visualdev/Base/{formId} (enableFlow=1, flowId) (原本就有)
2. workflow 端:
- GET /workflow/template/Version/{flowId} 找启用版本
- GET /workflow/template/Info/{versionId} 拿 flowNodes + flowXml
- 修改 start node formId = formId
- POST /workflow/template/Save body={id, flowId, flowNodes modified, isAddVersion:false}
3. 验证: GET Info 看 start node formId 真存
4. 重新发布 form
测试场 (jxcj) 验证:
workflow 端: 持久化 PASS (start node formId=841604547875964997) ✓
form 端: PUT 仍 400 (VisualdevEntity 缺 enableFlow/flowId 字段, 已知限制)
总结: workflow 端绑定已可持久化, form 端需 web UI 兜底
This commit is contained in:
1 parent
effc9efeb7
commit
44c8a39482
1 file changed
+177
-62
+177
-62
@@ -1,22 +1,25 @@
|
||||
/**
|
||||
* commands/form/bindflow.ts — 表单绑工作流 (D-7 / BS-44 修复, v0.12+ 持久化验证)
|
||||
* commands/form/bindflow.ts — 表单绑工作流 (BS-New-4 持久化修复)
|
||||
*
|
||||
* 背景: dacli form create --enableFlow=1 --flowId=X 设了 form 的 enableFlow=1,
|
||||
* 但 backend 不持久化 flowId (PUT /visualdev/Base/{id} 的 flowId 字段被忽略).
|
||||
* 解决: 通过 PUT /visualdev/Base/{id} 设 enableFlow=1 + 通过 PUT /workflow/template/{id}
|
||||
* 反向绑 form 关系. 此外, JNPF web UI 在创建工作流模板时会显式选 form, 后台会建
|
||||
* tdp_workflow_template.onLineformId 关联. 我们走 API 路径近似等价:
|
||||
* 背景 (jxcj 2026-06-30 实战):
|
||||
* 1. TemplateEntity 没有 onLineformId 字段 (web 源码确认)
|
||||
* 2. TemplateCrForm 也没有 onLineformId 字段
|
||||
* 3. 旧的 PUT /workflow/template/{id} body={onLineformId, formId, onlineFormId} 全部被后端静默忽略
|
||||
* 4. 真正持久化机制: POST /workflow/template/Save 修改 start node 的 formId
|
||||
* 后端 TemplateJsonServiceImpl.save() 会保存到 TemplateNodeEntity.f_form_id
|
||||
*
|
||||
* 1. PUT /visualdev/Base/{formId} body={enableFlow:1, flowId:flowId} (form 端关联)
|
||||
* 2. PUT /workflow/template/{flowId} body={onLineformId: formId, formId, onlineFormId} (workflow 端关联)
|
||||
* 3. GET /workflow/template/{flowId} 验证 onLineformId 持久化 (v0.12+ 修复)
|
||||
* 4. POST /visualdev/Base/{formId}/Actions/Release 重新发布
|
||||
* v0.12+ BS-New-4 fix (2026-06-30 jxcj):
|
||||
* 1. form 端: PUT /visualdev/Base/{formId} 设 enableFlow=1, flowId (form-side 引用)
|
||||
* 2. workflow 端:
|
||||
* - GET /workflow/template/Version/{flowId} 找启用版本 id
|
||||
* - GET /workflow/template/Info/{versionId} 拿 flowNodes + flowXml
|
||||
* - 修改 start 节点 formId = formId (持久化绑定)
|
||||
* - POST /workflow/template/Save body={id, flowId, flowNodes, flowXml, ...}
|
||||
* 3. 验证: GET flowNodes 看 start node formId 持久化
|
||||
* 4. 重新发布 form
|
||||
*
|
||||
* 用法:
|
||||
* dacli form bind-flow --formId=836303723314554053 --flowId=836303152285230277
|
||||
*
|
||||
* 修复 (2026-06-29 jxcj P0-3): bindFlow 后必须 GET 验证 onLineformId 已持久化,
|
||||
* 不持久化则尝试 form 端 PUT 设 flowId, 都失败给明确错误 (避免 launch 400 "Data does not exist").
|
||||
* dacli form bindFlow --formId=836303723314554053 --flowId=836303152285230277
|
||||
*/
|
||||
import { Command } from 'commander'
|
||||
import { JnpfClient } from '../../core/client.ts'
|
||||
@@ -33,72 +36,184 @@ interface BindFlowOpts {
|
||||
export function buildFormBindFlowCommand(): Command {
|
||||
const cmd = new Command('bindFlow')
|
||||
.alias('bind-flow')
|
||||
.description('表单绑工作流 (D-7 修复 BS-44 + v0.12+ 持久化验证: form 端 flowId + workflow 端 onLineformId)')
|
||||
.description('表单绑工作流 (BS-New-4: form 端 flowId + workflow start node formId 双向持久化)')
|
||||
.requiredOption('--formId <f>', '表单 id')
|
||||
.requiredOption('--flowId <w>', '工作流模板 id')
|
||||
.option('--json', '原始 JSON 输出', false)
|
||||
.action(async (opts: BindFlowOpts) => {
|
||||
const c = await JnpfClient.fromToken()
|
||||
let persisted = false
|
||||
let formSideOk = false
|
||||
let workflowSideOk = false
|
||||
let persistedVersionId = ''
|
||||
|
||||
// 1. form 端: PUT enableFlow=1 + flowId (v0.12+ 新增, 解决 workflow 端不持久化)
|
||||
log.info(`PUT /visualdev/Base/${opts.formId} body={enableFlow:1, flowId:${opts.flowId}}`)
|
||||
const formPut = await c.putJson<unknown>(`/visualdev/Base/${opts.formId}`, {
|
||||
enableFlow: 1,
|
||||
flowId: opts.flowId,
|
||||
})
|
||||
if (formPut.code === 200) log.ok(' ↳ form 端关联 workflow (enableFlow=1, flowId)')
|
||||
else log.warn(` ↳ form PUT 返 code=${formPut.code}: ${(formPut as any).msg?.slice?.(0, 60)}`)
|
||||
|
||||
// 2. workflow 端: 关联 form (走 onLineformId / formId / onlineFormId 3 字段尝试)
|
||||
log.info(`PUT /workflow/template/${opts.flowId} body={onLineformId:${opts.formId}, formId:${opts.formId}, onlineFormId:${opts.formId}}`)
|
||||
const wfPut = await c.putJson<unknown>(`/workflow/template/${opts.flowId}`, {
|
||||
onLineformId: opts.formId,
|
||||
formId: opts.formId,
|
||||
onlineFormId: opts.formId,
|
||||
})
|
||||
if (wfPut.code === 200) log.ok(' ↳ workflow 关联 form (3 字段兜底) 返回 200')
|
||||
else log.warn(` ↳ workflow bind 返 code=${wfPut.code}: ${(wfPut as any).msg?.slice?.(0, 60)}`)
|
||||
|
||||
// 3. 验证持久化 (v0.12+ 修复: GET workflow template 看 onLineformId 是否真存)
|
||||
const wfGet = await c.get<{ data?: { onLineformId?: string; formId?: string; onlineFormId?: string } }>(`/workflow/template/${opts.flowId}`)
|
||||
const persistedFormId = wfGet?.data?.onLineformId || wfGet?.data?.formId || wfGet?.data?.onlineFormId
|
||||
if (persistedFormId === opts.formId) {
|
||||
log.ok(` ↳ 持久化验证 PASS (onLineformId=${persistedFormId})`)
|
||||
persisted = true
|
||||
} else {
|
||||
log.warn(` ↳ 持久化验证 FAIL: workflow 端 onLineformId=${persistedFormId || '(空)'}, 期望=${opts.formId}`)
|
||||
// === 1. form 端: 设 enableFlow=1, flowId (form-side 引用) ===
|
||||
log.info(`[1] PUT /visualdev/Base/${opts.formId} body={enableFlow:1, flowId:${opts.flowId}}`)
|
||||
try {
|
||||
const formPut = await c.putJson<unknown>(`/visualdev/Base/${opts.formId}`, {
|
||||
enableFlow: 1,
|
||||
flowId: opts.flowId,
|
||||
})
|
||||
if (formPut.code === 200) {
|
||||
log.ok(' ↳ form 端关联 workflow (enableFlow=1, flowId)')
|
||||
formSideOk = true
|
||||
} else {
|
||||
log.warn(` ↳ form PUT 返 code=${formPut.code}: ${(formPut as any).msg?.slice?.(0, 60)}`)
|
||||
}
|
||||
} catch (e) {
|
||||
log.warn(` ↳ form PUT 异常: ${(e as Error).message?.slice(0, 60)}`)
|
||||
}
|
||||
|
||||
// 4. 重新发布 form (确保 enableFlow 标志被后端处理) - v0.11+ webapi
|
||||
await initWebapi(c)
|
||||
log.info(`loadVisualDev.release (formId=${opts.formId})`)
|
||||
const rel = (await loadVisualDev.release(opts.formId)) as { code?: number; msg?: string }
|
||||
if (rel.code === 200 || rel.code === undefined) log.ok(' ↳ form 已重新发布 (state=1)')
|
||||
else log.warn(` ↳ release 返 code=${rel.code}: ${rel.msg?.slice(0, 60)}`)
|
||||
// === 2. workflow 端: 修改 start node formId, POST Save ===
|
||||
// 2.1 GET 启用版本列表, 找 enabledMark=1 的版本 id
|
||||
log.info(`[2] GET /workflow/template/Version/${opts.flowId}`)
|
||||
let versionId = ''
|
||||
let versionList: Array<{ id: string; state?: number; enabledMark?: number | null }> = []
|
||||
try {
|
||||
const vR = await c.get<{ data?: Array<{ id: string; state?: number; enabledMark?: number | null }> }>(`/workflow/template/Version/${opts.flowId}`)
|
||||
versionList = (vR.data as Array<{ id: string; state?: number; enabledMark?: number | null }>) || []
|
||||
// 优先 enabledMark=1, fallback state=1
|
||||
const enabled = versionList.find((v) => v.enabledMark === 1) || versionList.find((v) => v.state === 1)
|
||||
versionId = enabled?.id || versionList[0]?.id || ''
|
||||
log.ok(` ↳ 找到启用版本: ${versionId} (versionList=${versionList.length})`)
|
||||
} catch (e) {
|
||||
log.warn(` ↳ GET Version 异常: ${(e as Error).message?.slice(0, 60)}`)
|
||||
}
|
||||
|
||||
if (persisted) {
|
||||
log.ok(`✓ form ${opts.formId} <-> workflow ${opts.flowId} 绑定完成 (持久化已验证)`)
|
||||
if (opts.json) printJson({ formId: opts.formId, flowId: opts.flowId, status: 'persisted' })
|
||||
if (!versionId) {
|
||||
log.error(' ✗ 找不到 workflow 启用版本, 无法 POST Save')
|
||||
} else {
|
||||
log.error(`✗ form ${opts.formId} <-> workflow ${opts.flowId} 绑定未持久化`)
|
||||
log.error(` 失败原因: JNPF backend 忽略 workflow 端 onLineformId 字段`)
|
||||
log.error(` 解决方案: 在 JNPF web UI 操作: 表单设计器 → 属性 → 选工作流模板 → 保存`)
|
||||
log.error(` 然后重新发布 form (本命令已做, 但需要 form 端有 flowId 字段)`)
|
||||
if (opts.json) printJson({ formId: opts.formId, flowId: opts.flowId, status: 'failed', needWebUI: true })
|
||||
// 2.2 GET Info/{versionId} 拿 flowNodes + flowXml
|
||||
log.info(`[2.1] GET /workflow/template/Info/${versionId}`)
|
||||
let flowXml = ''
|
||||
let flowNodes: Record<string, any> = {}
|
||||
let templateMeta: any = {}
|
||||
try {
|
||||
const iR = await c.get<{ data?: any }>(`/workflow/template/Info/${versionId}`)
|
||||
const d = iR.data || {}
|
||||
templateMeta = d
|
||||
flowXml = d.flowXml || ''
|
||||
if (typeof d.flowNodes === 'string') {
|
||||
try { flowNodes = JSON.parse(d.flowNodes) } catch { flowNodes = {} }
|
||||
} else {
|
||||
flowNodes = d.flowNodes || {}
|
||||
}
|
||||
log.ok(` ↳ flowNodes count=${Object.keys(flowNodes).length}, flowXml len=${flowXml.length}`)
|
||||
} catch (e) {
|
||||
log.warn(` ↳ GET Info 异常: ${(e as Error).message?.slice(0, 60)}`)
|
||||
}
|
||||
|
||||
// 2.3 找 start 节点, 设置 formId
|
||||
const startNodeId = Object.keys(flowNodes).find(
|
||||
(nid) => flowNodes[nid]?.type === 'start' || flowNodes[nid]?.nodeJson?.includes('"type":"start"'),
|
||||
)
|
||||
if (startNodeId) {
|
||||
log.info(`[2.2] 找到 start node: ${startNodeId}, 设置 formId=${opts.formId}`)
|
||||
// 节点 formId 在 flowNodes[id].formId 或 .nodeJson (parse 后)
|
||||
if (typeof flowNodes[startNodeId].formId !== 'undefined') {
|
||||
flowNodes[startNodeId].formId = opts.formId
|
||||
} else if (flowNodes[startNodeId].nodeJson) {
|
||||
try {
|
||||
const nj = typeof flowNodes[startNodeId].nodeJson === 'string'
|
||||
? JSON.parse(flowNodes[startNodeId].nodeJson)
|
||||
: flowNodes[startNodeId].nodeJson
|
||||
nj.formId = opts.formId
|
||||
flowNodes[startNodeId].nodeJson = JSON.stringify(nj)
|
||||
} catch {}
|
||||
}
|
||||
} else {
|
||||
log.warn(` ↳ 未找到 start 节点 (类型 type==='start'), 跳过 node 修改`)
|
||||
}
|
||||
|
||||
// 2.4 POST /workflow/template/Save 持久化
|
||||
log.info(`[2.3] POST /workflow/template/Save body={id:${opts.flowId}, flowId:${versionId}, flowNodes modified}`)
|
||||
try {
|
||||
const saveBody = {
|
||||
id: opts.flowId,
|
||||
flowId: versionId,
|
||||
enCode: templateMeta.enCode || '',
|
||||
fullName: templateMeta.fullName || '',
|
||||
type: templateMeta.type ?? 0,
|
||||
category: templateMeta.category || '',
|
||||
icon: templateMeta.icon || '',
|
||||
iconBackground: templateMeta.iconBackground || '',
|
||||
description: templateMeta.description || '',
|
||||
sortCode: templateMeta.sortCode ?? 0,
|
||||
flowConfig: templateMeta.flowConfig || '',
|
||||
showType: templateMeta.showType ?? 0,
|
||||
visibleType: templateMeta.visibleType ?? 0,
|
||||
flowNodes: flowNodes,
|
||||
flowXml: flowXml,
|
||||
isAddVersion: false, // BS-New-4: 不创建新版本, 直接修改当前版本
|
||||
}
|
||||
const saveR = await c.postJson<unknown>('/workflow/template/Save', saveBody)
|
||||
if (saveR.code === 200) {
|
||||
log.ok(` ↳ workflow 端 Save 成功 (start node formId 已持久化)`)
|
||||
workflowSideOk = true
|
||||
persistedVersionId = versionId
|
||||
} else {
|
||||
log.warn(` ↳ workflow Save 返 code=${saveR.code}: ${(saveR as any).msg?.slice?.(0, 60)}`)
|
||||
}
|
||||
} catch (e) {
|
||||
log.warn(` ↳ workflow Save 异常: ${(e as Error).message?.slice(0, 60)}`)
|
||||
}
|
||||
}
|
||||
|
||||
// === 3. 验证持久化: GET Info 看 start node formId 真存了 ===
|
||||
log.info(`[3] GET /workflow/template/Info/${persistedVersionId} 验证`)
|
||||
let persistedFormId = ''
|
||||
try {
|
||||
const vR = await c.get<{ data?: any }>(`/workflow/template/Info/${persistedVersionId}`)
|
||||
const d = vR.data || {}
|
||||
let nodes: Record<string, any> = d.flowNodes || {}
|
||||
if (typeof d.flowNodes === 'string') {
|
||||
try { nodes = JSON.parse(d.flowNodes) } catch {}
|
||||
}
|
||||
const start = Object.values(nodes).find((n: any) => n.type === 'start')
|
||||
persistedFormId = (start as any)?.formId || ''
|
||||
if (persistedFormId === opts.formId) {
|
||||
log.ok(` ↳ 持久化验证 PASS (start node formId=${persistedFormId})`)
|
||||
} else {
|
||||
log.warn(` ↳ 持久化验证 FAIL: start node formId=${persistedFormId || '(空)'}, 期望=${opts.formId}`)
|
||||
}
|
||||
} catch (e) {
|
||||
log.warn(` ↳ 验证 GET 异常: ${(e as Error).message?.slice(0, 60)}`)
|
||||
}
|
||||
|
||||
// === 4. 重新发布 form (确保 enableFlow 标志被后端处理) ===
|
||||
log.info(`[4] 重新发布 form (formId=${opts.formId})`)
|
||||
await initWebapi(c)
|
||||
try {
|
||||
const rel = (await loadVisualDev.release(opts.formId)) as { code?: number; msg?: string }
|
||||
if (rel.code === 200 || rel.code === undefined) log.ok(' ↳ form 已重新发布 (state=1)')
|
||||
else log.warn(` ↳ release 返 code=${rel.code}: ${rel.msg?.slice(0, 60)}`)
|
||||
} catch (e) {
|
||||
log.warn(` ↳ release 异常: ${(e as Error).message?.slice(0, 60)}`)
|
||||
}
|
||||
|
||||
// === 总结 ===
|
||||
if (formSideOk && workflowSideOk && persistedFormId === opts.formId) {
|
||||
log.ok(`✓ form ${opts.formId} <-> workflow ${opts.flowId} 绑定完成 (双向持久化已验证)`)
|
||||
if (opts.json) printJson({ formId: opts.formId, flowId: opts.flowId, status: 'persisted', versionId: persistedVersionId })
|
||||
} else {
|
||||
log.error(`✗ form ${opts.formId} <-> workflow ${opts.flowId} 绑定未完全持久化`)
|
||||
log.error(` form 端: ${formSideOk ? '✓' : '✗'}, workflow 端: ${workflowSideOk ? '✓' : '✗'}, 持久化: ${persistedFormId === opts.formId ? '✓' : '✗'}`)
|
||||
log.error(` 兜底: 在 JNPF web UI 操作: 表单设计器 → 选工作流 → 保存 → 发布`)
|
||||
if (opts.json) printJson({ formId: opts.formId, flowId: opts.flowId, status: 'partial', formSideOk, workflowSideOk, persistedFormId })
|
||||
process.exit(1)
|
||||
}
|
||||
})
|
||||
|
||||
installAiHelpHook(cmd, {
|
||||
purpose: '表单绑工作流 (D-7 修复 BS-44 + v0.12+ 持久化验证). 4 步: form 端 enableFlow+flowId, workflow 端 onLineformId 3 字段, GET 验证, 重新发布.',
|
||||
purpose: '表单绑工作流 (BS-New-4: form 端 flowId + workflow start node formId 双向持久化).',
|
||||
required: { '--formId': '表单 id', '--flowId': '工作流模板 id' },
|
||||
example: 'dacli form bindFlow --formId=836303723314554053 --flowId=836303152285230277',
|
||||
source: { api: 'PUT /visualdev/Base/{formId} + PUT + GET /workflow/template/{flowId} + POST /visualdev/Base/{formId}/Actions/Release' },
|
||||
source: { api: 'PUT /visualdev/Base/{formId} + GET/POST /workflow/template/* + POST /visualdev/Base/{formId}/Actions/Release' },
|
||||
notes: [
|
||||
'v0.12+ 修复 (jxcj P0-3): bindFlow 后实际 GET 验证 onLineformId 持久化, 失败明确错误+web UI 指引',
|
||||
'失败兜底: 走 JNPF web UI 表单设计器 → 选工作流模板 → 保存 (同时保存 form 端 flowId 字段)',
|
||||
'v0.12+ BS-New-4 修复 (jxcj 2026-06-30): 旧版 PUT 3 字段 (onLineformId/formId/onlineFormId) 全被静默忽略',
|
||||
'新版走 /workflow/template/Save 真正修改 start node formId 字段 (后端 TemplateNodeEntity.f_form_id)',
|
||||
'镜像 web DesignForm.vue saveFlow(query) 行为 (修改 start node formId 后 POST Save)',
|
||||
'兜底: web UI 表单设计器 → 选工作流 → 保存',
|
||||
],
|
||||
})
|
||||
return cmd
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user