refactor(v0.11+): form validate/fixcolumndata/bindflow 改用 webapi
Phase 1 审计 (cmd-review/form.md) 标记 P0:
- form 22 调用待切 webapi
- 本 commit 切 5 调用 (validate 1 + fixcolumndata 3 + bindflow 1)
修复:
- form/validate → loadVisualDev.getInfo (1 调用)
- form/fixcolumndata → loadVisualDev.getInfo + update + release (3 调用)
- form/bindflow → loadVisualDev.release (1 调用)
- workflow/template/{id} PUT 暂留 c.putJson (在 workflow webapi, 后续可切)
未做 (下次续):
- form/import.ts (8 调用 - 最大机械重构)
- form/codegen.ts (4 调用)
- form/create.ts (4 调用)
- form/export.ts (1 调用 getInfo)
- form/clone.ts (1 调用 release)
- form/release.ts (已 webapi 化, 跳过)
Co-Authored-By: Claude <[email protected]>
This commit is contained in:
1 parent
3c312d71b9
commit
9c14cda665
3 files changed
+19
-17
No files matched your search
@@ -21,6 +21,7 @@ import { Command } from 'commander'
|
||||
import { JnpfClient } from '../../core/client.ts'
|
||||
import { installAiHelpHook } from '../../core/help.ts'
|
||||
import { log, printJson } from '../../core/log.ts'
|
||||
import { initWebapi, loadVisualDev } from '../../webapi/visualDev.ts'
|
||||
|
||||
interface BindFlowOpts {
|
||||
formId: string
|
||||
@@ -48,10 +49,11 @@ export function buildFormBindFlowCommand(): Command {
|
||||
if (wfPut.code === 200) log.ok(' ↳ workflow 关联 form (3 字段兜底) 返回 200')
|
||||
else log.warn(` ↳ workflow bind 返 code=${wfPut.code}: ${wfPut.msg?.slice(0, 60)}`)
|
||||
|
||||
// 2. 重新发布 form (确保 enableFlow 标志被后端处理)
|
||||
log.info(`POST /visualdev/Base/${opts.formId}/Actions/Release`)
|
||||
const rel = await c.postJson(`/visualdev/Base/${opts.formId}/Actions/Release`, {})
|
||||
if (rel.code === 200) log.ok(' ↳ form 已重新发布 (state=1)')
|
||||
// 2. 重新发布 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)}`)
|
||||
|
||||
log.ok(`✓ form ${opts.formId} <-> workflow ${opts.flowId} 绑定完成`)
|
||||
|
||||
@@ -30,6 +30,7 @@ import { JnpfClient } from '../../core/client.ts'
|
||||
import { installAiHelpHook } from '../../core/help.ts'
|
||||
import { log, printJson } from '../../core/log.ts'
|
||||
import type { FormDetail } from '../../core/types.ts'
|
||||
import { initWebapi, loadVisualDev } from '../../webapi/visualDev.ts'
|
||||
import { browserVerify } from './_browser_verify.ts'
|
||||
|
||||
const PERMISSION_FIELDS = [
|
||||
@@ -85,12 +86,9 @@ export function buildFormFixColumnDataCommand(): Command {
|
||||
.option('--no-republish', 'PUT 后不自动重新发布 (BS-53 默认开, 仅调试用)', false)
|
||||
.action(async (id: string, opts: { json?: boolean; dryRun?: boolean; noVerify?: boolean; verifyMode?: string; verifyTimeout?: string; republish?: boolean }) => {
|
||||
const c = await JnpfClient.fromToken()
|
||||
const r = await c.get<FormDetail>(`/visualdev/Base/${id}`)
|
||||
if (!c.ok(r)) {
|
||||
log.error(`拉 form 失败 code=${r.code}: ${r.msg}`)
|
||||
process.exit(1)
|
||||
}
|
||||
const form = r.data as FormDetail
|
||||
// v0.11+ Phase 2: 用 webapi getInfo 替代 c.get
|
||||
await initWebapi(c)
|
||||
const form = (await loadVisualDev.getInfo(id)) as FormDetail
|
||||
|
||||
const col = patchColumnData(typeof form.columnData === 'string' ? form.columnData : null)
|
||||
const app = patchColumnData(typeof form.appColumnData === 'string' ? form.appColumnData : null)
|
||||
@@ -138,9 +136,9 @@ export function buildFormFixColumnDataCommand(): Command {
|
||||
state: form.state,
|
||||
sortCode: form.sortCode,
|
||||
}
|
||||
log.info(`PUT /visualdev/Base/${id} (补 ${colMissing.length + appMissing.length} 个 use*Permission 字段)`)
|
||||
const rr = await c.putJson<unknown>(`/visualdev/Base/${id}`, body)
|
||||
if (rr.code !== 200) {
|
||||
log.info(`loadVisualDev.update (补 ${colMissing.length + appMissing.length} 个 use*Permission 字段)`)
|
||||
const rr = (await loadVisualDev.update({ id, ...body })) as { code?: number; msg?: string }
|
||||
if (rr.code !== 200 && rr.code !== undefined) {
|
||||
log.error(`修复失败 code=${rr.code}: ${rr.msg}`)
|
||||
if (opts.json) printJson({ ...summary, action: 'failed', error: rr })
|
||||
process.exit(1)
|
||||
@@ -156,8 +154,8 @@ export function buildFormFixColumnDataCommand(): Command {
|
||||
if (opts.republish !== false) {
|
||||
const prevState = form.state
|
||||
log.info(`原 state=${prevState}, PUT 后自动调用 Actions/Release 重新发布 (BS-53 防护)`)
|
||||
const rr2 = await c.postJson<unknown>(`/visualdev/Base/${id}/Actions/Release`, {})
|
||||
if (rr2.code === 200) {
|
||||
const rr2 = (await loadVisualDev.release(id)) as { code?: number; msg?: string }
|
||||
if (rr2.code === 200 || rr2.code === undefined) {
|
||||
log.ok(`✓ 已自动重新发布 (state 1/2 → 1), 表单前端可见`)
|
||||
if (opts.json) printJson({ ...summary, action: 'patched-and-republished' })
|
||||
} else {
|
||||
|
||||
@@ -31,6 +31,7 @@ import { JnpfClient } from '../../core/client.ts'
|
||||
import { installAiHelpHook } from '../../core/help.ts'
|
||||
import { log, printJson } from '../../core/log.ts'
|
||||
import type { FormDetail } from '../../core/types.ts'
|
||||
import { initWebapi, loadVisualDev } from '../../webapi/visualDev.ts'
|
||||
import { checkBsV2, checkBs23, checkBs31, checkBs32, checkBs15, checkBs52, type BlindspotIssue } from './_blindspots.ts'
|
||||
|
||||
export type ValidationIssue = BlindspotIssue
|
||||
@@ -53,8 +54,9 @@ export function buildFormValidateCommand(): Command {
|
||||
.option('--json', '原始 JSON', false)
|
||||
.action(async (id: string, opts: { json?: boolean }) => {
|
||||
const c = await JnpfClient.fromToken()
|
||||
const r = await c.get<FormDetail>(`/visualdev/Base/${id}`)
|
||||
const form = c.ok(r)
|
||||
// v0.11+ Phase 2: 用 webapi 调 web 端 getInfo (替代 c.get('/visualdev/Base/{id}'))
|
||||
await initWebapi(c)
|
||||
const form = (await loadVisualDev.getInfo(id)) as FormDetail
|
||||
const issues = validate(form)
|
||||
if (opts.json) {
|
||||
printJson({ id, enCode: form.enCode, issues, pass: issues.filter((i) => i.level === 'ERROR').length === 0 })
|
||||
|
||||
Reference in new issue
Block a user