auto(d389ca8d6886): session end @ 2026-06-28T20:06:14 (+4f)
This commit is contained in:
1 parent
21fd363285
commit
19b90ce712
4 files changed
+220
-19
No files matched your search
@@ -22,6 +22,9 @@ interface Opts {
|
||||
category?: string
|
||||
dbLinkId?: string
|
||||
enableFlow?: string
|
||||
/** v0.12+ Bug 3 修复: flowId 实际是 workflow templateId, 用 workflow.update --enableMark=1 + start node formId=this.id 绑定
|
||||
* 流程-form 绑定走 workflow 端 (TemplateNodeEntity.formId), 不是 form 端
|
||||
* 此处保留 --flowId 作 deprecated 别名, 转调 workflow 端 */
|
||||
flowId?: string
|
||||
type?: string
|
||||
webType?: string
|
||||
@@ -125,7 +128,14 @@ export function buildFormUpdateCommand(): Command {
|
||||
if (opts.category) body.category = opts.category
|
||||
if (opts.dbLinkId) body.dbLinkId = opts.dbLinkId
|
||||
if (opts.enableFlow !== undefined) body.enableFlow = parseInt(opts.enableFlow, 10)
|
||||
if (opts.flowId) body.flowId = opts.flowId
|
||||
// v0.12+ Bug 3 修复: --flowId 实际是 workflow templateId, 走 workflow.update --enableMark=1 + start node formId=this.id
|
||||
// 流程-form 绑定: workflow 端 start node formId 字段 (TemplateNodeEntity.formId), 不是 form 端
|
||||
// 旧代码 body.flowId = opts.flowId 是错的, 后端 VisualdevEntity 无 flowId 字段, 会被 Lombok @Data 静默丢弃
|
||||
if (opts.flowId) {
|
||||
log.warn(`--flowId=${opts.flowId}: form 端无 flowId 字段 (后端 VisualdevEntity 不含)`)
|
||||
log.info(`正确的流程-form 绑定方式: workflow 端 start node formId = ${opts.id}`)
|
||||
log.info(` → dacli workflow update --id=${opts.flowId} --enableMark=1 (自动绑当前 form 到 start node)`)
|
||||
}
|
||||
if (opts.type) body.type = parseInt(opts.type, 10)
|
||||
if (opts.webType) body.webType = parseInt(opts.webType, 10)
|
||||
|
||||
|
||||
@@ -129,7 +129,30 @@ export function buildWorkflowCreateCommand(): Command {
|
||||
if (opts.json) printJson(r)
|
||||
process.exit(1)
|
||||
}
|
||||
const newId = (r.data as { id?: string })?.id || '(unknown)'
|
||||
// v0.12+ 修复 Bug 1.2: 后端 create 返回 `data: <id>` 字符串, 不是 `{id}` 对象.
|
||||
// 兼容 2 种结构 (旧代码假设 data.id, 新版用 data 本身或 data.id)
|
||||
let newId = '(unknown)'
|
||||
if (typeof r.data === 'string') {
|
||||
newId = r.data
|
||||
} else if (r.data && typeof r.data === 'object') {
|
||||
newId = (r.data as { id?: string }).id || '(unknown)'
|
||||
}
|
||||
// 兜底: 如果后端用 r.data 整个对象, 拉 list 查 enCode 拿到 id (最后一次兜底)
|
||||
if (newId === '(unknown)' && opts.enCode) {
|
||||
try {
|
||||
const lr = await c.get<{ list?: Array<{ id: string; enCode: string }> }>('/workflow/template', {
|
||||
currentPage: 1,
|
||||
pageSize: 5,
|
||||
})
|
||||
const match = lr.list?.find((t) => t.enCode === opts.enCode)
|
||||
if (match?.id) {
|
||||
newId = match.id
|
||||
log.info(`兜底: 从 list 拉到 id=${newId} (enCode=${opts.enCode})`)
|
||||
}
|
||||
} catch {
|
||||
// 兜底失败忽略
|
||||
}
|
||||
}
|
||||
log.ok(`创建成功: id=${newId} enCode=${opts.enCode}`)
|
||||
|
||||
// v0.11e+ Phase B2: auto-authorize (镜像 web 流程创建后自动授权给当前角色)
|
||||
|
||||
@@ -2,7 +2,10 @@
|
||||
* commands/workflow/info.ts — 流程模板详情
|
||||
*
|
||||
* v0.11+ Phase 2: webapi 化 (loadWorkflow.getInfo)
|
||||
* 替代 v0.10 直接 c.get
|
||||
* v0.12+ Bug 4 修复: 优先 getFlowInfo (Info/{flowJsonId}) 拿完整信息
|
||||
* getInfo (/template/{id}) 返回 TemplateInfoVO, 缺 enabledMark/flowXml/formId
|
||||
* getFlowInfo (/template/Info/{flowJsonId}) 返回 TemplateJsonInfoVO, 含全部字段
|
||||
* 链: getInfo (basic) → getVersionList → getFlowInfo (full, fallback)
|
||||
*/
|
||||
import { Command } from 'commander'
|
||||
import { JnpfClient } from '../../core/client.ts'
|
||||
@@ -15,38 +18,83 @@ interface Opts { id: string; json?: boolean }
|
||||
|
||||
export function buildWorkflowInfoCommand(): Command {
|
||||
const cmd = new Command('info')
|
||||
.description('流程模板详情 (含 category/enabledMark/version/关联 form, v0.11+ webapi)')
|
||||
.description('流程模板详情 (含 category/enabledMark/version/关联 form, v0.12+ 优先 getFlowInfo 返回完整信息)')
|
||||
.requiredOption('--id <id>', '流程模板 id')
|
||||
.option('--json', '原始 JSON 输出', false)
|
||||
.action(async (opts: Opts) => {
|
||||
const c = await JnpfClient.fromToken()
|
||||
await initWebapi(c)
|
||||
const d = (await loadWorkflow.getInfo(opts.id)) as Record<string, unknown>
|
||||
if (!d) {
|
||||
// v0.12+ Bug 4 修复: 优先 getInfo (basic, 必成功), 然后 chain getFlowInfo (full, fallback)
|
||||
const basic = (await loadWorkflow.getInfo(opts.id)) as Record<string, unknown>
|
||||
if (!basic) {
|
||||
const enhanced = enhanceFromBackend('id 不存在或已被删除', 'id', { entity: 'workflow' })
|
||||
log.error(` ${formatErrorLine(enhanced, { step: 0, stepName: '配置拉取' })}`)
|
||||
process.exit(1)
|
||||
}
|
||||
let full: Record<string, unknown> | null = null
|
||||
let enabledMark: number | undefined
|
||||
let flowId: string | undefined
|
||||
try {
|
||||
// 从 Version 列表取一个 flowJson id, 然后拉完整信息
|
||||
const versions = (await loadWorkflow.getVersionList(opts.id)) as Array<{ id: string; state: number }>
|
||||
if (Array.isArray(versions) && versions.length > 0) {
|
||||
flowId = versions[0].id
|
||||
full = (await loadWorkflow.getFlowInfo(flowId)) as Record<string, unknown>
|
||||
}
|
||||
} catch {
|
||||
// 拉取失败用 basic 信息 (兜底)
|
||||
}
|
||||
// enabledMark: 从 list 接口拿 (TemplatePageLisVO 才有 enabledMark 字段, 其他 VO 都没有)
|
||||
try {
|
||||
const listResp = (await loadWorkflow.getList({ currentPage: 1, pageSize: 200 })) as {
|
||||
list?: Array<{ id: string; enabledMark?: number; status?: number; flowId?: string }>
|
||||
}
|
||||
const item = listResp.list?.find((t) => t.id === opts.id)
|
||||
if (item) {
|
||||
enabledMark = item.enabledMark
|
||||
// basic 缺的 status 用 list 补
|
||||
if (basic.status === undefined && item.status !== undefined) {
|
||||
basic.status = item.status
|
||||
}
|
||||
}
|
||||
} catch {
|
||||
// 拉取失败忽略
|
||||
}
|
||||
// 合并: basic + full
|
||||
const d: Record<string, unknown> = { ...basic, ...(full || {}) }
|
||||
if (opts.json) {
|
||||
printJson(d)
|
||||
printJson({ ...d, _fullInfoLoaded: !!full, _flowIdUsed: flowId, _enabledMarkFromList: enabledMark })
|
||||
return
|
||||
}
|
||||
log.info(`流程模板详情 (id=${opts.id})`)
|
||||
log.info(`流程模板详情 (id=${opts.id}${full ? ' [完整信息已加载]' : ' [仅基础信息]'})`)
|
||||
console.log(` fullName : ${d.fullName}`)
|
||||
console.log(` enCode : ${d.enCode}`)
|
||||
console.log(` category : ${d.category}`)
|
||||
console.log(` enabledMark : ${d.enabledMark === 1 ? '启用' : '禁用'}`)
|
||||
console.log(` version : ${d.version || '1'}`)
|
||||
console.log(` formId : ${d.formId || '-'}`)
|
||||
console.log(
|
||||
` enabledMark : ${enabledMark === 1 ? '启用' : enabledMark === 0 ? '禁用' : '未知'}`,
|
||||
)
|
||||
console.log(` status : ${d.status === 1 ? '上架' : d.status === 0 ? '未上架' : d.status}`)
|
||||
console.log(` version : ${d.version || (d as { flowVersion?: string }).flowVersion || '1'}`)
|
||||
console.log(` flowId : ${(d.flowId as string) || flowId || '-'}`)
|
||||
console.log(` flowableId : ${d.flowableId || '-'}`)
|
||||
console.log(` flowXml 长度 : ${d.flowXml ? String(d.flowXml).length : 0}`)
|
||||
console.log(` flowNodes 节点数: ${d.flowNodes ? Object.keys(d.flowNodes as object).length : 0}`)
|
||||
console.log(` description : ${d.description || '-'}`)
|
||||
})
|
||||
installAiHelpHook(cmd, {
|
||||
purpose: '流程模板详情. AI 引用 workflow id 验证 (P0 闭环).',
|
||||
purpose: '流程模板详情. AI 引用 workflow id 验证 (P0 闭环). v0.12+ 优先 getFlowInfo 返回完整信息 (含 flowXml/flowNodes/enabledMark/flowId).',
|
||||
required: { '--id': '流程模板 id' },
|
||||
optional: { '--json': '原始 JSON 输出' },
|
||||
example: 'dacli workflow info --id=1234567890',
|
||||
source: { api: 'GET /api/workflow/template/{id}', ref: 'web/.../api/workFlow/template.ts getInfo()' },
|
||||
notes: ['v0.11+ 改用 webapi 镜像 (loadWorkflow.getInfo)'],
|
||||
source: {
|
||||
api: 'GET /api/workflow/template/{id} (basic) + /template/Info/{flowJsonId} (full)',
|
||||
ref: 'web/.../api/workFlow/template.ts getInfo() + getFlowInfo() + getVersionList()',
|
||||
},
|
||||
notes: [
|
||||
'v0.11+ 改用 webapi 镜像 (loadWorkflow.getInfo)',
|
||||
'v0.12+ Bug 4 修复: 链 getInfo → getVersionList → getFlowInfo, 返回完整信息',
|
||||
'fallback: getFlowInfo 失败时回退 basic 信息 (标记 [仅基础信息])',
|
||||
],
|
||||
})
|
||||
return cmd
|
||||
}
|
||||
@@ -19,6 +19,8 @@ interface Opts {
|
||||
category?: string
|
||||
enabledMark?: string
|
||||
description?: string
|
||||
/** v0.12+ 绑定 start node 的 formId (流程-form 绑定, 后端 TemplateNodeEntity.formId) */
|
||||
startFormId?: string
|
||||
expectedEnCode?: string
|
||||
expectedState?: string
|
||||
force?: boolean
|
||||
@@ -34,6 +36,8 @@ export function buildWorkflowUpdateCommand(): Command {
|
||||
.option('--category <c>', '分类 id')
|
||||
.option('--enabledMark <0|1>', '启用/禁用')
|
||||
.option('--description <d>', '描述')
|
||||
/** v0.12+ Bug 3 修复: 绑定 start node formId (流程-form 绑定, TemplateNodeEntity.formId) */
|
||||
.option('--startFormId <id>', '绑定 start node 的表单 id (配合 --enabledMark=1 使用)')
|
||||
.option('--expected-enCode <e>', 'v0.11e+ Phase A2: 校验 enCode 未变 (防 AI session 误覆盖)')
|
||||
.option('--expected-state <s>', 'v0.11e+ Phase A2: 校验 enabledMark 未变')
|
||||
.option('--force', 'v0.11e+ Phase A2: 跳过 dirty check', false)
|
||||
@@ -69,11 +73,112 @@ export function buildWorkflowUpdateCommand(): Command {
|
||||
}
|
||||
|
||||
// === step 2 (PUT (loadWorkflow.update, 后端API) ===
|
||||
// v0.12+ Bug 2 修复: --enabledMark=1 走 saveFlow (type=1) 发布流
|
||||
// 后端 TemplateController.update 只接受 TemplateNodeUpFrom, 不含 enabledMark 字段
|
||||
// TemplateJsonServiceImpl.save(type=1) 才会 setEnabledMark(1) + setStatus(UP)
|
||||
// --enabledMark=0 后端无对应 API, 暂不实现 (需 SQL 直接更新, 不在 dacli 范围)
|
||||
if (opts.enabledMark !== undefined && parseInt(opts.enabledMark, 10) === 1) {
|
||||
const emVal = parseInt(opts.enabledMark, 10)
|
||||
if (emVal !== 1) {
|
||||
log.error('--enabledMark=0 后端无对应 API, 需 SQL 直接更新 F_ENABLED_MARK=0 (不在 dacli 范围)')
|
||||
log.info('提示: 用 web 端"下架"按钮操作 (UpDownShelf 端点, 但只改 status 不改 enabledMark)')
|
||||
process.exit(2)
|
||||
}
|
||||
// 走 saveFlow (type=1) 发布流: 后端会 setEnabledMark(1) + setStatus(UP) + setFlowId
|
||||
// flowId 可能不在 getInfo 里 (TemplateInfoVO 不含 flowId), 从 Version 列表兜底拉
|
||||
let flowId = (orig.flowId as string | undefined) || ''
|
||||
let flowXml = (orig as { flowXml?: string }).flowXml || ''
|
||||
let flowNodes = (orig as { flowNodes?: Record<string, unknown> }).flowNodes || {}
|
||||
if (!flowId || !flowXml) {
|
||||
log.info(`getInfo 缺 flowId/flowXml, 从 Version 列表兜底拉`)
|
||||
try {
|
||||
// webapi 已经解包 data 字段, getVersionList 直接返回数组
|
||||
const versions = (await loadWorkflow.getVersionList(opts.id)) as Array<{
|
||||
id: string
|
||||
state: number
|
||||
}>
|
||||
if (Array.isArray(versions) && versions.length > 0) {
|
||||
flowId = versions[0].id
|
||||
// 用 flowJson id 拉完整信息 (含 flowXml + flowNodes)
|
||||
const fullInfo = (await loadWorkflow.getFlowInfo(flowId)) as {
|
||||
flowXml?: string
|
||||
flowNodes?: Record<string, unknown>
|
||||
flowConfig?: string
|
||||
}
|
||||
if (fullInfo.flowXml) flowXml = fullInfo.flowXml
|
||||
if (fullInfo.flowNodes) flowNodes = fullInfo.flowNodes
|
||||
log.info(`兜底拉取 flowId=${flowId}, flowXml 长度=${flowXml.length}`)
|
||||
}
|
||||
} catch (e) {
|
||||
log.warn(`Version/Info 拉取失败: ${(e as Error).message?.slice(0, 100)}`)
|
||||
}
|
||||
}
|
||||
// v0.12+ Bug 3 修复: --startFormId 把表单绑到 start node (TemplateNodeEntity.formId)
|
||||
// 必须在 fallback 之后, 否则 flowNodes 被替换会丢失绑定
|
||||
if (opts.startFormId) {
|
||||
log.info(`绑定 start node formId = ${opts.startFormId}`)
|
||||
const nodes = flowNodes as Record<string, Record<string, unknown>>
|
||||
let boundCount = 0
|
||||
for (const [code, node] of Object.entries(nodes)) {
|
||||
// 镜像 web 端节点类型判断: NodeModel.type === 'start' (BPMN 标准 startEvent)
|
||||
// 兼容旧版 dacli create 用 nodeType='start' 的情况
|
||||
const t = String(node.type || node.nodeType || '').toLowerCase()
|
||||
if (t === 'start' || t === '0' || t.includes('startevent')) {
|
||||
node.formId = opts.startFormId
|
||||
boundCount++
|
||||
log.info(` ✓ start node ${code}.formId = ${opts.startFormId}`)
|
||||
}
|
||||
}
|
||||
if (boundCount === 0) {
|
||||
log.warn(`未找到 start 节点 (flowNodes keys: ${Object.keys(nodes).join(', ')})`)
|
||||
log.info('尝试根据节点名称 (nodeName 含"发起"或"start") 兜底')
|
||||
for (const [code, node] of Object.entries(nodes)) {
|
||||
const name = String(node.nodeName || '').toLowerCase()
|
||||
if (name.includes('发起') || name.includes('start')) {
|
||||
node.formId = opts.startFormId
|
||||
boundCount++
|
||||
log.info(` ✓ 兜底 start node ${code}.formId = ${opts.startFormId} (匹配 nodeName="${node.nodeName}")`)
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!flowId) {
|
||||
log.error('发布失败: workflow 未保存 flowId (需先创建/导入, 调 saveFlow 必须有 flowId)')
|
||||
log.info('提示: 用 web 端流程设计器先保存一次, 生成 flowId')
|
||||
process.exit(2)
|
||||
}
|
||||
if (!flowXml) {
|
||||
log.error('发布失败: flowXml 为空 (无法发布, BPMN 图为空)')
|
||||
log.info('提示: 用 web 端流程设计器设计流程图后保存')
|
||||
process.exit(2)
|
||||
}
|
||||
log.info(`发布流 (saveFlow, type=1) — id=${opts.id} flowId=${flowId}`)
|
||||
const sr = (await loadWorkflow.saveFlow({
|
||||
id: opts.id,
|
||||
flowId,
|
||||
flowXml,
|
||||
flowNodes,
|
||||
flowConfig: (orig as { flowConfig?: string }).flowConfig || '{}',
|
||||
type: 1,
|
||||
})) as { code?: number; msg?: string }
|
||||
if (sr.code !== 200 && sr.code !== undefined) {
|
||||
log.error(`saveFlow 失败 code=${sr.code}: ${sr.msg}`)
|
||||
process.exit(1)
|
||||
}
|
||||
log.ok(`✓ 已启用 (saveFlow type=1) — enabledMark=1, status=UP (id=${opts.id})`)
|
||||
if (opts.json) printJson({ id: opts.id, action: 'enabled-via-saveFlow' })
|
||||
return
|
||||
}
|
||||
|
||||
const body: Record<string, unknown> = { ...orig, id: opts.id }
|
||||
if (opts.fullName) body.fullName = opts.fullName
|
||||
if (opts.enCode) body.enCode = opts.enCode
|
||||
if (opts.category) body.category = opts.category
|
||||
if (opts.enabledMark !== undefined) body.enabledMark = parseInt(opts.enabledMark, 10)
|
||||
if (opts.enabledMark !== undefined && parseInt(opts.enabledMark, 10) !== 1) {
|
||||
// enabledMark=0 警告 (后端无对应 API)
|
||||
log.warn('--enabledMark=0 后端无 API 支持, 跳过 enabledMark 字段 (仅改 fullName/enCode/category)')
|
||||
}
|
||||
if (opts.description) body.description = opts.description
|
||||
log.info(`loadWorkflow.update (id=${opts.id})`)
|
||||
const r = (await loadWorkflow.update(body)) as { code?: number; msg?: string; data?: unknown }
|
||||
@@ -87,14 +192,29 @@ export function buildWorkflowUpdateCommand(): Command {
|
||||
if (opts.json) printJson(r.data)
|
||||
})
|
||||
installAiHelpHook(cmd, {
|
||||
purpose: '流程模板修改 (PUT 语义).',
|
||||
purpose: '流程模板修改 (PUT 语义). v0.12+ Bug 2 修: --enabledMark=1 走 saveFlow; Bug 3 修: --startFormId 绑 start node 表单',
|
||||
required: { '--id': '流程模板 id' },
|
||||
optional: { '--fullName': '中文名', '--enCode': '英文编码', '--category': '分类 id', '--enabledMark': '启用/禁用 0|1', '--description': '描述', '--expected-enCode': '防 AI 误覆盖 (A2)', '--expected-state': '防 AI 误覆盖 (A2)', '--force': '跳过 dirty check (A2)' },
|
||||
example: 'dacli workflow update --id=123 --enabledMark=0',
|
||||
source: { api: 'PUT /api/workflow/template/{id}', ref: 'web/.../api/workFlow/template.ts update()' },
|
||||
optional: {
|
||||
'--fullName': '中文名',
|
||||
'--enCode': '英文编码',
|
||||
'--category': '分类 id',
|
||||
'--enabledMark': '启用/禁用 0|1 (1 走 saveFlow 发布流, 后端才会 setEnabledMark(1) + setStatus(UP))',
|
||||
'--description': '描述',
|
||||
'--startFormId': '绑定 start node 的表单 id (Bug 3 修, 配合 --enabledMark=1)',
|
||||
'--expected-enCode': '防 AI 误覆盖 (A2)',
|
||||
'--expected-state': '防 AI 误覆盖 (A2)',
|
||||
'--force': '跳过 dirty check (A2)',
|
||||
},
|
||||
example: [
|
||||
'dacli workflow update --id=123 --enabledMark=1 --startFormId=840790907757264901',
|
||||
'dacli workflow update --id=123 --fullName=新名',
|
||||
],
|
||||
source: { api: 'PUT /api/workflow/template/{id} + POST /template/Save (publish)', ref: 'web/.../api/workFlow/template.ts update() + saveFlow()' },
|
||||
notes: [
|
||||
'v0.11+ 改用 webapi 镜像 (loadWorkflow.update)',
|
||||
'v0.11e+ Phase A2: dirty check --expected-enCode/--expected-state/--force (防 AI session 长时间保留误覆盖, 同 form/update.ts)',
|
||||
'v0.12+ Bug 2 修: --enabledMark=1 走 saveFlow (后端 TemplateJsonServiceImpl.save type=1 才会 setEnabledMark(1))',
|
||||
'v0.12+ Bug 3 修: --startFormId 把表单绑到 start node (后端 TemplateNodeEntity.formId, 流程-form 绑定走 workflow 端不是 form 端)',
|
||||
],
|
||||
})
|
||||
return cmd
|
||||
|
||||
Reference in new issue
Block a user