diff --git a/admin-frontend-vue/src/pages/account/MenusPage.vue b/admin-frontend-vue/src/pages/account/MenusPage.vue index 58f079cd..fca1e31e 100644 --- a/admin-frontend-vue/src/pages/account/MenusPage.vue +++ b/admin-frontend-vue/src/pages/account/MenusPage.vue @@ -1,11 +1,22 @@ @@ -28,7 +63,7 @@ onMounted(loadMenus)

菜单管理

维护后台菜单树和页面路由。权限粒度仅到菜单/页面。

- 新增菜单 + 新增菜单 @@ -43,5 +78,36 @@ onMounted(loadMenus) + + + + + + + + + + + + + + + + + + + + + + + diff --git a/admin-frontend-vue/src/pages/account/menu-manage-api.ts b/admin-frontend-vue/src/pages/account/menu-manage-api.ts index 01ff38ad..b1b007da 100644 --- a/admin-frontend-vue/src/pages/account/menu-manage-api.ts +++ b/admin-frontend-vue/src/pages/account/menu-manage-api.ts @@ -1,9 +1,13 @@ /** 菜单管理列表加载适配(任务 54):GET /api/admin/permission-menus(admin) → 展示树。 */ import { http } from '@/api/http' +import { unwrap } from '@/api/envelope' import { ADMIN_MENU_TYPE, buildMenuManageTree, + parseMenuManageItem, parseMenuManageList, + toMenuCreateRequest, + type MenuManageForm, type MenuManageNode, } from './menu-manage-model' @@ -19,3 +23,11 @@ export async function fetchMenuManageNodes(): Promise { export async function loadMenuManageTree(): Promise { return buildMenuManageTree(await fetchMenuManageNodes()) } + +/** 新建菜单:POST /api/admin/permission-menus,返回后端落库节点。 */ +export async function createMenu(form: MenuManageForm): Promise { + const { data } = await http.post(MENUS_ENDPOINT, toMenuCreateRequest(form)) + const created = parseMenuManageItem(unwrap(data)) + if (!created) throw new Error('创建菜单响应异常:缺少菜单数据') + return created +} diff --git a/admin-frontend-vue/src/pages/account/menu-manage-model.ts b/admin-frontend-vue/src/pages/account/menu-manage-model.ts index 680aa03b..2ab1c8eb 100644 --- a/admin-frontend-vue/src/pages/account/menu-manage-model.ts +++ b/admin-frontend-vue/src/pages/account/menu-manage-model.ts @@ -118,6 +118,37 @@ export function buildMenuManageTree(items: MenuManageNode[]): MenuManageNode[] { return roots } +/** 展平树为列表(前序),供父级下拉/统计复用。 */ +export function flattenMenuNodes(nodes: MenuManageNode[]): MenuManageNode[] { + const out: MenuManageNode[] = [] + const walk = (list: MenuManageNode[]) => { + for (const node of list) { + out.push(node) + if (node.children?.length) walk(node.children) + } + } + walk(nodes) + return out +} + +/** 同级建议排序:该父下最大 sortOrder + 1;无同级返回 0。 */ +export function nextSiblingSort(items: MenuManageNode[], parentId: number | null): number { + let max = -1 + for (const item of items) { + if (item.parentId === parentId && item.sortOrder > max) max = item.sortOrder + } + return max + 1 +} + +/** 新建菜单表单工厂:指定父节点与建议排序,其余默认(menuType=admin)。 */ +export function createMenuForm(parentId: number | null, sortOrder: number): MenuManageForm { + return { + ...emptyMenuManageForm(), + parentId: typeof parentId === 'number' ? parentId : null, + sortOrder: normalizeMenuSort(sortOrder), + } +} + /** 新建/编辑表单空值工厂:默认菜单类型为 admin、排序 0、根父节点。 */ export function emptyMenuManageForm(): MenuManageForm { return { name: '', columnKey: '', parentId: null, menuType: ADMIN_MENU_TYPE, routePath: '', sortOrder: 0 } diff --git a/admin-frontend-vue/tests/task-55.test.ts b/admin-frontend-vue/tests/task-55.test.ts new file mode 100644 index 00000000..deac5824 --- /dev/null +++ b/admin-frontend-vue/tests/task-55.test.ts @@ -0,0 +1,79 @@ +import test from 'node:test' +import assert from 'node:assert/strict' +import { readSource } from './helpers.ts' +import { + ADMIN_MENU_TYPE, + buildMenuManageTree, + createMenuForm, + flattenMenuNodes, + nextSiblingSort, + parseMenuManageList, +} from '../src/pages/account/menu-manage-model.ts' + +test('test_task_055_menu_create_form_normal_primary_path', () => { + // 正常主路径:根菜单表单默认 menuType=admin、排序可给。 + const form = createMenuForm(null, 0) + assert.equal(form.parentId, null) + assert.equal(form.menuType, ADMIN_MENU_TYPE) + assert.equal(form.sortOrder, 0) + assert.equal(form.name, '') +}) + +test('test_task_055_menu_create_form_normal_variant_input', () => { + // 正常变体:子菜单挂到指定父节点;排序按同级建议。 + const form = createMenuForm(3, 4) + assert.equal(form.parentId, 3) + assert.equal(form.sortOrder, 4) +}) + +test('test_task_055_menu_create_form_normal_repeated_operation_is_idempotent', () => { + // 正常重复:表单工厂稳定、不改输入。 + assert.deepEqual(createMenuForm(1, 2), createMenuForm(1, 2)) +}) + +test('test_task_055_menu_create_form_boundary_empty_input', () => { + // 边界空值:空树无同级 → 建议排序 0;flatten 空树为空。 + assert.equal(nextSiblingSort([], null), 0) + assert.deepEqual(flattenMenuNodes([]), []) +}) + +test('test_task_055_menu_create_form_boundary_single_item', () => { + // 边界单元素:单个同级 sort=2 → 建议 3。 + const items = parseMenuManageList([{ id: 1, name: 'A', column_key: 'a', parent_id: null, sort_order: 2 }]) + assert.equal(nextSiblingSort(items, null), 3) +}) + +test('test_task_055_menu_create_form_boundary_limit_or_missing_field', () => { + // 边界上限:同级含多节点取最大+1;不同父互不影响。 + const items = parseMenuManageList([ + { id: 1, name: 'A', column_key: 'a', parent_id: null, sort_order: 5 }, + { id: 2, name: 'B', column_key: 'b', parent_id: 1, sort_order: 1 }, + ]) + assert.equal(nextSiblingSort(items, null), 6) + assert.equal(nextSiblingSort(items, 1), 2) +}) + +test('test_task_055_menu_create_form_invalid_input_rejected', () => { + // 异常输入:flatten 递归含全部后代;排序缺省按 0 参与建议。 + const tree = buildMenuManageTree( + parseMenuManageList([ + { id: 1, name: '根', column_key: 'root', parent_id: null }, + { id: 2, name: '子', column_key: 'sub', parent_id: 1 }, + { id: 3, name: '孙', column_key: 'leaf', parent_id: 2 }, + ]), + ) + const flat = flattenMenuNodes(tree) + assert.deepEqual(flat.map((n) => n.id).sort((a, b) => a - b), [1, 2, 3]) +}) + +test('test_task_055_menu_create_form_dependency_failure_returns_actionable_message', () => { + // 依赖失败/创建走 adapter:POST /permission-menus,页面用模型校验 + createMenu,不内联 http。 + const api = readSource('src/pages/account/menu-manage-api.ts') + assert.match(api, /createMenu/) + assert.match(api, /http\.post/) + assert.match(api, /permission-menus/) + const page = readSource('src/pages/account/MenusPage.vue') + assert.match(page, /createMenu/) + assert.match(page, /menu-manage-model/) + assert.equal(/http\.(get|post)|unwrap\(/.test(page), false, '页面不内联请求') +})