diff --git a/src/commands/form/validate.ts b/src/commands/form/validate.ts index fd92c6b..337b44a 100644 --- a/src/commands/form/validate.ts +++ b/src/commands/form/validate.ts @@ -3,9 +3,13 @@ * * 镜像 Java 版 `dacli form validate ` 能力 * 主要检查: - * - formData.fields 每项有 __config__ + * - formData.fields 每项有 __config__ (新 form: {fields:[]}; 老 form 流程表单: 直接是 array) * - columnData.fields 每项有 __config__ (新版 JNPF 缺会白屏) * - tables 有 dbLinkId + * + * 修复 (v0.8.1): formData=null / formData="[]" / 老 formData 直接是 array 不再误报 WARN. + * - 已知盲点 (v0.7.1): 老流程表单 formData 是 flat array, validate 报 "fields 不是数组" + * - 修复: 兼容 {fields:[...]} 和 直接 array 两种形态, 都视为合法 */ import { Command } from 'commander' import { JnpfClient } from '../../core/client.ts' @@ -20,7 +24,9 @@ interface ValidationIssue { } function safeParse(s: unknown): unknown { + if (s == null) return null if (typeof s !== 'string') return s + if (s === '') return null try { return JSON.parse(s) } catch { @@ -28,14 +34,33 @@ function safeParse(s: unknown): unknown { } } +function extractFields(formDataRaw: unknown): unknown[] | null { + if (formDataRaw == null) return null + // 形态 1: 新 form {fields: [...]} + if (typeof formDataRaw === 'object' && !Array.isArray(formDataRaw)) { + const fd = formDataRaw as { fields?: unknown[] } + if (Array.isArray(fd.fields)) return fd.fields + return [] + } + // 形态 2: 老 form (流程表单) 直接是 array + if (Array.isArray(formDataRaw)) return formDataRaw + return null +} + function validate(form: FormDetail): ValidationIssue[] { const issues: ValidationIssue[] = [] - const formData = safeParse(form.formData) as { fields?: unknown[] } | null + const formDataRaw = safeParse(form.formData) + const formDataFields = extractFields(formDataRaw) + + // 真实空 (formData=null 或 formData="") 才报 ERROR + if (formDataRaw == null) { + // formData 是 null/空串 → 留空表单 (如 type=4 视图允许), 用 WARN 不阻塞 + issues.push({ level: 'WARN', path: 'formData', message: 'formData 为空 (type=4 视图允许; type≠4 需补字段)' }) + } else if (formDataFields == null) { + issues.push({ level: 'WARN', path: 'formData', message: 'formData 既不是 {fields:[]} 也不是 array (老 form 兼容)' }) + } + const columnData = safeParse(form.columnData) as { fields?: unknown[] } | null - - if (!formData) issues.push({ level: 'ERROR', path: 'formData', message: 'formData 解析失败或为空' }) - else if (!Array.isArray(formData.fields)) issues.push({ level: 'WARN', path: 'formData.fields', message: 'fields 不是数组' }) - if (columnData?.fields) { columnData.fields.forEach((f, i) => { const ff = f as { __config__?: unknown; __vModel__?: string } diff --git a/src/commands/portal/release.ts b/src/commands/portal/release.ts index 00d6bdb..6c7c192 100644 --- a/src/commands/portal/release.ts +++ b/src/commands/portal/release.ts @@ -1,7 +1,13 @@ /** * commands/portal/release.ts — 发布门户 * - * API: PUT /api/visualdev/Portal/Actions/release/{portalId} + * 已知 (JNPF 6.2 + web 端 ReleaseModal.vue): + * - 端点: PUT /api/visualdev/Portal/Actions/release/{portalId} + * - 必填: pc (PC 端菜单 1/0) + app (App 端菜单 1/0) + platformRelease (JSON.stringify({pc,app})) + * - 兜底: 不传 --pc/--app 时, 默认只发 PC (pc=1, app=0), 让"门户在 PC 端可见" + * + * 注: 早期 v0.7.1 兜底 (传空 body) 后端报"缺 formData" 已知, + * 本轮 v0.8.1 补 pc/app/platformRelease 三参. */ import { Command } from 'commander' import { JnpfClient } from '../../core/client.ts' @@ -10,30 +16,53 @@ import { log } from '../../core/log.ts' interface ReleaseOpts { id: string + pc?: string + app?: string } export function buildPortalReleaseCommand(): Command { const cmd = new Command('release') - .description('发布门户 (state 0→1)') + .description('发布门户 (state 0→1, 必传 --pc/--app + platformRelease, 见 web ReleaseModal.vue)') .requiredOption('--id ', '门户 id') + .option('--pc <0|1>', 'PC 端是否发布 (1=发布, 0=不发布, 默认 1)', '1') + .option('--app <0|1>', 'App 端是否发布 (1=发布, 0=不发布, 默认 0)', '0') .action(async (opts: ReleaseOpts) => { const c = await JnpfClient.fromToken() - const r = await c.putJson(`/visualdev/Portal/Actions/release/${opts.id}`, {}) + // 关键: web 端 ReleaseModal.vue 把 {pc, app} JSON.stringify 塞进 platformRelease + const pc = opts.pc === '1' ? 1 : 0 + const app = opts.app === '1' ? 1 : 0 + const platformRelease = JSON.stringify({ pc, app }) + const body = { + pc, + app, + platformRelease, + } + const r = await c.putJson(`/visualdev/Portal/Actions/release/${opts.id}`, body) if (r.code !== 200) { - log.error(`portal release 失败: ${r.msg}`) + log.error(`portal release 失败 (code=${r.code}): ${r.msg}`) process.exit(1) } - log.info(`✓ 门户 id=${opts.id} 已发布`) + log.info(`✓ 门户 id=${opts.id} 已发布 (pc=${pc} app=${app})`) }) installAiHelpHook(cmd, { - purpose: '发布门户 (state 0→1, 菜单可挂)', + purpose: '发布门户 (state 0→1, 必传 pc/app/platformRelease 三参, 见 web ReleaseModal.vue)', required: { '--id': '门户 id' }, - example: 'dacli portal release --id=1234567890', + optional: { + '--pc': 'PC 端是否发布 (1/0, 默认 1)', + '--app': 'App 端是否发布 (1/0, 默认 0)', + }, + example: + 'dacli portal release --id=1234567890\ndacli portal release --id=1234567890 --pc=1 --app=1', source: { - web: 'web/apps/jnpf-web-apps-main/src/views/onlineDev/visualPortal/Form.vue', - api: 'PUT /api/visualdev/Portal/Actions/release/{portalId}', + web: 'web/apps/jnpf-web-apps-main/src/views/onlineDev/visualPortal/components/ReleaseModal.vue (handleSubmit 拼 platformRelease)', + api: 'PUT /api/visualdev/Portal/Actions/release/{portalId} (body: {pc, app, platformRelease})', ref: 'doc/v0.8-endpoints.md §1.3', }, + notes: [ + '**修复 (v0.8.1)**: 之前 body={} 后端报"缺 formData" → 现补 pc/app/platformRelease 三参', + '**web 真值**: ReleaseModal.vue:80 release(state.record.id, {pc, app, platformRelease: JSON.stringify({pc, app})})', + '**兜底**: 默认 --pc=1 --app=0, 单发 PC; 想双端发传 --app=1', + ], }) return cmd } diff --git a/src/commands/schedule/list.ts b/src/commands/schedule/list.ts index 17ca076..095793c 100644 --- a/src/commands/schedule/list.ts +++ b/src/commands/schedule/list.ts @@ -1,8 +1,20 @@ /** * commands/schedule/list.ts — 定时任务列表 * - * 注: JNPF GET /api/scheduletask 返 200 空 body (已知 JNPF 端点问题), - * schedule 列表只能通过 Info/{id} 单点查, 或从任务调度 Web UI 拿 id + * 已知端点事实 (JNPF 6.2): + * - GET /api/scheduletask → 200 Content-Length:0 (JNPF 端点 bug, list 不能用) + * - POST /api/scheduletask → 创建端点 (要 fullName/enCode/executeType/executeContent), 不能查 list + * - GET /api/scheduletask/Info/{id} → 详情 (返 null if id 不存在, 200 if 存在) + * - GET /api/scheduletask/TaskMethods → Quartz task class 列表 (OK) + * - GET /api/scheduletask/{id}/TaskLog → 任务执行日志 (OK) + * + * 对比 web 端: /api/system/Schedule 是"日历日程" (startTime/endTime), 不是 cron 任务 + * (见 web/apps/jnpf-web-apps-main/src/api/teamwork/schedule.ts). + * + * 兜底: list 命令走 GET /scheduletask, 拿到 200 空 body 后: + * 1. 提示"端点 bug, 改用 schedule info --id=X 单点查" + * 2. 提示"或从 web 端 任务调度 页面拿 id" + * 3. 提示"create 端点可建, trigger/log 可用, info 端点可单点查" */ import { Command } from 'commander' import { JnpfClient } from '../../core/client.ts' @@ -15,31 +27,38 @@ interface ListOpts { export function buildScheduleListCommand(): Command { const cmd = new Command('list') - .description('列定时任务 (JNPF list 端点已知返 200 空 body, 用 Info/{id} 兜底)') + .description('列定时任务 (JNPF 6.2 GET /api/scheduletask 返 200 空 body, 端点 bug)') .option('--json', '原始 JSON 输出', false) .action(async (opts: ListOpts) => { const c = await JnpfClient.fromToken() + // JNPF 6.2 端点 bug: GET 返 Content-Length:0, POST 是 create 端点 + // 兜底: 提示用户用 info/log/trigger 配合 web 端拿到的 id const r = await c.get('/scheduletask', { currentPage: 1, pageSize: 50 }) - log.warn('⚠ JNPF schedule list 端点已知返 200 空 body, JNPF 端点问题') - log.info(' 兜底方案: 用 Info/{id} 单点查, 或从 web 任务调度页面拿 id') - if (r.code === 200 && r.data) { + log.warn('⚠ JNPF 6.2 schedule list 端点已知 bug (GET 返空 body, POST 是 create)') + log.info(' 兜底方案:') + log.info(' 1. dacli schedule info --id= 单点查 (从 web 端 任务调度 拿 id)') + log.info(' 2. dacli schedule log --id= 查执行日志') + log.info(' 3. dacli schedule create ... 建新任务') + log.info(' 4. dacli schedule trigger --id= 手动触发') + if (r.data && (Array.isArray(r.data) || (typeof r.data === 'object' && 'list' in (r.data as object)))) { printJson(r.data) } else { - log.info(' (data 为空)') + log.info(' (data 为空 — JNPF 端点 bug 已知)') } if (opts.json) printJson(r.data) }) installAiHelpHook(cmd, { - purpose: '列定时任务 (JNPF list 端点已知坏, 用 Info/{id} 查单个)', + purpose: '列定时任务 (JNPF 6.2 端点 bug, 兜底用 info/log 单点查)', example: 'dacli schedule list (已知返空)\ndacli schedule info --id=1234567890', source: { - web: 'web/apps/jnpf-web-apps-main/src/views/teamwork/schedule/index.vue', - api: 'GET /api/scheduletask (JNPF 端点已知返 200 空 body)', + web: 'web/apps/jnpf-web-apps-main/src/views/teamwork/schedule/index.vue (web 走 /api/system/Schedule 日历端点, 跟 cron 任务不一样)', + api: 'GET /api/scheduletask (JNPF 6.2 端点 bug 返 200 空 body)', ref: 'doc/v0.8-endpoints.md §2.5', }, notes: [ - '**已知遗留**: JNPF GET /api/scheduletask 返 200 空 body (JNPF 6.2 端点问题)', - '**兜底**: 用 schedule info --id=X 单点查', + '**已知 JNPF bug**: GET /api/scheduletask 返 200 Content-Length:0', + '**真端点差异**: web /api/system/Schedule 是日历日程 (startTime/endTime), 不是 cron 任务', + '**兜底**: schedule info --id=X 单点查', ], }) return cmd