auto(bfc0cfa2c3a4): session end @ 2026-07-14T08:00:46 (+1f)
This commit is contained in:
1 parent
63c4321a9b
commit
44ff342d02
1 file changed
+36
-28
@@ -27,51 +27,59 @@ import { describe, it, expect } from 'vitest'
|
||||
import { readFileSync } from 'fs'
|
||||
|
||||
// baseline → rebuilt 映射 (seed=20260714 随机抽样 5)
|
||||
// v0.21+ BS-drift-M-1/M-2 fix: rebuiltId 已用 --moduleId/--sortCode 修复重建
|
||||
// 旧: 846614536537506245..846614632314438085 (DRIFT: moduleId='', sortCode=0)
|
||||
// 新: 846622823962116549..846622873668813253 (FIXED: moduleId/sortCode 跟 baseline 对齐)
|
||||
const REBUILT_MENUS = [
|
||||
{
|
||||
enCode: 'drift5m1',
|
||||
rebuiltId: '846614536537506245',
|
||||
rebuiltId: '846622823962116549',
|
||||
baselineId: '585020121039241989',
|
||||
baselineName: '复杂表头(主子表)示例',
|
||||
baselineUrl: 'model/09565695817',
|
||||
baselineType: 3,
|
||||
baselineModuleId: '469496902811974149',
|
||||
baselineSortCode: 1,
|
||||
},
|
||||
{
|
||||
enCode: 'drift5m2',
|
||||
rebuiltId: '846614597556240837',
|
||||
rebuiltId: '846622836045906373',
|
||||
baselineId: '584304870585008133',
|
||||
baselineName: '集成助手写入数据表',
|
||||
baselineUrl: 'model/zcc7229',
|
||||
baselineType: 3,
|
||||
baselineModuleId: '470913011435962821',
|
||||
baselineSortCode: 2,
|
||||
},
|
||||
{
|
||||
enCode: 'drift5m3',
|
||||
rebuiltId: '846614609203823045',
|
||||
rebuiltId: '846622848238748101',
|
||||
baselineId: '585019885524878085',
|
||||
baselineName: '列表树形表格',
|
||||
baselineUrl: 'model/lbsxa5688',
|
||||
baselineType: 3,
|
||||
baselineModuleId: '469136286624574597',
|
||||
baselineSortCode: 3,
|
||||
},
|
||||
{
|
||||
enCode: 'drift5m4',
|
||||
rebuiltId: '846614621035954629',
|
||||
rebuiltId: '846622860855214533',
|
||||
baselineId: '585019395336569605',
|
||||
baselineName: '事件管理',
|
||||
baselineUrl: 'model/shijianguanlic0965',
|
||||
baselineType: 3,
|
||||
baselineModuleId: '469065268790880645',
|
||||
baselineSortCode: 4,
|
||||
},
|
||||
{
|
||||
enCode: 'drift5m5',
|
||||
rebuiltId: '846614632314438085',
|
||||
rebuiltId: '846622873668813253',
|
||||
baselineId: 'fb4ae524555448ddadfbe514134e7bb6',
|
||||
baselineName: '电子签名',
|
||||
baselineUrl: 'extend/signature',
|
||||
baselineType: 2,
|
||||
baselineModuleId: '', // type=2 (Vue扩展) 无表单, moduleId 为空
|
||||
baselineSortCode: 5,
|
||||
},
|
||||
]
|
||||
|
||||
@@ -91,62 +99,62 @@ function parsePropertyJson(menu: any): any {
|
||||
try { return JSON.parse(raw) } catch { return {} }
|
||||
}
|
||||
|
||||
describe('menu-drift: propertyJson.moduleId 丢失 (BS-drift-M-1)', () => {
|
||||
describe('menu-drift: propertyJson.moduleId 保留 (BS-drift-M-1 ✅ RESOLVED)', () => {
|
||||
/**
|
||||
* 漂移模式: 低级模式重建菜单 (无 --formId) 不自动填 propertyJson.moduleId,
|
||||
* 但 baseline type=3 菜单 60/60 都关联表单 (moduleId 非空).
|
||||
* 影响: 浏览器点击菜单进入 urlAddress, 但 propertyJson.moduleId 空 → form 关联丢失.
|
||||
* 解决: 必须走 Actions/Module 高级路径 (dacli menu create --formId=X)
|
||||
* 或后续 dacli menu update --id=X --propertyJson='{"moduleId":"..."}'.
|
||||
* 解决 (v0.21+): dacli menu create 加 --moduleId=<id> 选项, 手动覆盖 propertyJson.moduleId
|
||||
* (D-9/D-12 找不到 form 时 fallback, 跨 app 引用也能填).
|
||||
*
|
||||
* v0.21+ 验证: 4/4 type=3 重建菜单 propertyJson.moduleId === baselineModuleId.
|
||||
*/
|
||||
it.each(REBUILT_MENUS.filter(m => m.baselineType === 3))(
|
||||
'rebuilt $enCode type=3 应保留 propertyJson.moduleId=$baselineModuleId',
|
||||
'rebuilt $enCode type=3 propertyJson.moduleId 跟 baseline 一致 ($baselineModuleId)',
|
||||
({ rebuiltId, baselineModuleId }) => {
|
||||
const rebuilt = getRebuiltMenu(rebuiltId)
|
||||
const pj = parsePropertyJson(rebuilt)
|
||||
// 当前已知漂移: low-level 模式 moduleId=""
|
||||
expect(pj.moduleId).toBe('')
|
||||
// 标记: 这是已知漂移, 后续 BS-drift-M-1 修复后会改成 === baselineModuleId
|
||||
expect(pj.moduleId).not.toBe(baselineModuleId)
|
||||
expect(pj.moduleId).toBe(baselineModuleId)
|
||||
}
|
||||
)
|
||||
|
||||
it('BS-drift-M-1: 5/5 type=3 重建菜单 propertyJson.moduleId 全丢失 (low-level 模式)', () => {
|
||||
it('BS-drift-M-1 修复: 4/4 type=3 重建菜单 propertyJson.moduleId 跟 baseline 完全一致', () => {
|
||||
const type3Rebuilt = REBUILT_MENUS.filter(m => m.baselineType === 3)
|
||||
let lostCount = 0
|
||||
let matchCount = 0
|
||||
for (const r of type3Rebuilt) {
|
||||
const pj = parsePropertyJson(getRebuiltMenu(r.rebuiltId))
|
||||
if (!pj.moduleId) lostCount++
|
||||
if (pj.moduleId === r.baselineModuleId) matchCount++
|
||||
}
|
||||
// 期望 100% 丢失 (低 level 模式不填 moduleId)
|
||||
expect(lostCount).toBe(type3Rebuilt.length)
|
||||
expect(lostCount).toBe(4) // 4 type=3 menus in this batch
|
||||
expect(matchCount).toBe(type3Rebuilt.length)
|
||||
expect(matchCount).toBe(4) // 4 type=3 menus in this batch
|
||||
})
|
||||
})
|
||||
|
||||
describe('menu-drift: sortCode 总是 0, 丢失 baseline 排序 (BS-drift-M-2)', () => {
|
||||
describe('menu-drift: sortCode 透传 baseline 顺序 (BS-drift-M-2 ✅ RESOLVED)', () => {
|
||||
/**
|
||||
* 漂移模式: 重建菜单 sortCode 总是 0 (默认), 不继承 baseline 的用户配置顺序.
|
||||
* 影响: 一次性导入多个菜单时, 浏览器侧显示顺序错乱.
|
||||
* 解决: 后续 dacli menu create 应支持 --sortCode=<n> 或从 baseline 自动取.
|
||||
* 解决 (v0.21+): dacli menu create 加 --sortCode=<n> 选项, 透传 baseline 排序.
|
||||
*
|
||||
* v0.21+ 验证: 5/5 rebuilt sortCode 跟 baseline 一致 (1, 2, 3, 4, 5).
|
||||
*/
|
||||
it.each(REBUILT_MENUS)(
|
||||
'rebuilt $enCode sortCode 总是 0 (与 baseline 不一致)',
|
||||
({ rebuiltId }) => {
|
||||
'rebuilt $enCode sortCode 跟 baseline 一致 ($baselineSortCode)',
|
||||
({ rebuiltId, baselineSortCode }) => {
|
||||
const rebuilt = getRebuiltMenu(rebuiltId)
|
||||
expect(rebuilt.sortCode).toBe(0)
|
||||
expect(rebuilt.sortCode).toBe(baselineSortCode)
|
||||
}
|
||||
)
|
||||
|
||||
it('BS-drift-M-2: 5/5 rebuilt sortCode=0, baseline 各异', () => {
|
||||
it('BS-drift-M-2 修复: 5/5 rebuilt sortCode 跟 baseline 各异 (1, 2, 3, 4, 5)', () => {
|
||||
const sortCodes = new Set<number>()
|
||||
for (const r of REBUILT_MENUS) {
|
||||
const rebuilt = getRebuiltMenu(r.rebuiltId)
|
||||
sortCodes.add(rebuilt.sortCode)
|
||||
}
|
||||
// 全部 sortCode=0, 没有继承 baseline 各异值
|
||||
expect(sortCodes.size).toBe(1)
|
||||
expect(sortCodes.has(0)).toBe(true)
|
||||
// 5/5 各异, 继承 baseline 排序
|
||||
expect(sortCodes.size).toBe(REBUILT_MENUS.length)
|
||||
expect(sortCodes.has(0)).toBe(false) // 不再有全 0 的退化情况
|
||||
})
|
||||
})
|
||||
|
||||
|
||||
Reference in new issue
Block a user