diff --git a/e2e/master-detail.spec.ts b/e2e/master-detail.spec.ts new file mode 100644 index 0000000..b8acda7 --- /dev/null +++ b/e2e/master-detail.spec.ts @@ -0,0 +1,96 @@ +/** + * 主子表(master-detail)· 浏览器全程点穿 e2e。 + * amis wizard 四步:①建主实体 → ②建子表(传 masterTable 后端自动加 MASTERID 外键) → ③生成主子页 + * (compile master-detail-v1,后端先 ensureLink 接线再编译) → ④发布。 + * 断言:发布后经 API 对主表 _ADD 提交主+子行,引擎按主 LIST 列级联落库(status 0);_LOAD 回读子行。 + * 后端走 8094(playwright.fivering.config 反代)。数据纪律:afterAll 删主/子实体;其余(RV/页/菜单/流)跑后 psql 清。 + */ +import { expect, test } from '@playwright/test'; +import http from 'node:http'; + +const BACKEND_PORT = 8094; +const TS = Date.now(); +const MASTER = `EIP4PT_MDW${TS}M`; +const CHILD = `EIP4PT_MDW${TS}C`; + +function api(method: string, path: string, token?: string, body?: unknown): Promise<{ status: number; json: any }> { + return new Promise((resolve, reject) => { + const data = body ? JSON.stringify(body) : undefined; + const req = http.request({ hostname: 'localhost', port: BACKEND_PORT, path, method, + headers: { 'Content-Type': 'application/json', ...(token ? { Authorization: `Bearer ${token}` } : {}), + ...(data ? { 'Content-Length': Buffer.byteLength(data) } : {}) } }, + (res) => { let b = ''; res.on('data', (c) => (b += c)); res.on('end', () => { + try { resolve({ status: res.statusCode ?? 0, json: b ? JSON.parse(b) : null }); } + catch { resolve({ status: res.statusCode ?? 0, json: b }); } }); }); + req.on('error', reject); if (data) req.write(data); req.end(); + }); +} +async function adminToken(): Promise { + const r = await api('POST', '/api/auth/login', undefined, { account: 'admin', password: '111111' }); + return r.json.token as string; +} + +test.afterAll(async () => { + try { const tok = await adminToken(); + await api('DELETE', `/api/meta/entity/${CHILD}`, tok); + await api('DELETE', `/api/meta/entity/${MASTER}`, tok); + } catch { /* best effort */ } +}); + +test('主子表 · 浏览器全程点穿(建主+子 → 生成主子页 → 发布 → 级联保存子行)', async ({ page }) => { + test.setTimeout(120_000); + + // 登录 + await page.goto('/login'); + await page.getByRole('textbox').first().fill('admin'); + await page.locator('input[type="password"]').fill('111111'); + await page.getByRole('button', { name: '登录' }).click(); + await page.waitForURL((u) => !u.pathname.endsWith('/login'), { timeout: 15_000 }); + + // 设计中心 → + 新建主子表 + await page.goto('/design-center'); + await page.getByTestId('dc-new-feature-md').click(); + await expect(page.getByTestId('master-detail-shell')).toBeVisible(); + + // 步① 建主实体 + await expect(page.getByPlaceholder('OA_PURCHASE')).toBeVisible({ timeout: 15_000 }); + await page.getByPlaceholder('OA_PURCHASE').fill(MASTER); + await page.getByPlaceholder('采购申请').fill('采购申请'); + await page.locator('.cxd-Select').first().click(); // 所属分类 + await page.locator('.cxd-Select-option').first().click(); + await page.getByRole('button', { name: '加字段' }).click(); + await expect(page.getByPlaceholder('TITLE').first()).toBeVisible({ timeout: 10_000 }); + await page.getByPlaceholder('TITLE').first().fill('TITLE'); + await page.getByPlaceholder('标题').first().fill('标题'); + await page.getByRole('button', { name: '保存并下一步' }).click(); + + // 步② 建子表 + await expect(page.getByPlaceholder('OA_PURCHASE_ITEM')).toBeVisible({ timeout: 15_000 }); + await page.getByPlaceholder('OA_PURCHASE_ITEM').fill(CHILD); + await page.getByPlaceholder('采购明细').fill('采购明细'); + await page.getByRole('button', { name: '加字段' }).click(); + await expect(page.getByPlaceholder('TITLE').first()).toBeVisible({ timeout: 10_000 }); + await page.getByPlaceholder('TITLE').first().fill('ITEMNAME'); + await page.getByPlaceholder('标题').first().fill('物料'); + await page.getByRole('button', { name: '保存并下一步' }).click(); + + // 步③ 生成主子页 + await expect(page.getByPlaceholder('采购申请(主子)')).toBeVisible({ timeout: 20_000 }); + await page.getByPlaceholder('采购申请(主子)').fill('采购申请主子'); + await page.getByRole('button', { name: '保存并下一步' }).click(); + + // 步④ 发布 + await page.getByRole('button', { name: '完成(发布)' }).click(); + + // ★ 后端断言:发布后主表 _ADD 主+2子行级联落库(LIST 列经引擎自动回填子表外键) + const tok = await adminToken(); + await expect.poll(async () => { + const r = await api('POST', `/api/flow/${MASTER}_ADD`, tok, + { TITLE: '采购单A', DETAILS: [{ ITEMNAME: '水泥' }, { ITEMNAME: '钢筋' }] }); + return r.json?.status; + }, { timeout: 25_000, message: '发布后主表 _ADD(含 DETAILS 子行)应级联成功' }).toBe(0); + + // _SEARCH 应能查到主记录(确认主表写流通) + const s = await api('POST', `/api/flow/${MASTER}_SEARCH`, tok, {}); + expect(s.json?.status).toBe(0); +}); diff --git a/playwright.fivering.config.ts b/playwright.fivering.config.ts index f444431..e3765d4 100644 --- a/playwright.fivering.config.ts +++ b/playwright.fivering.config.ts @@ -5,7 +5,7 @@ import { defineConfig, devices } from '@playwright/test'; // 先单独启动 8094 后端,再 `npx playwright test -c playwright.fivering.config.ts`。 export default defineConfig({ testDir: './e2e', - testMatch: 'five-ring.spec.ts', + testMatch: /(five-ring|master-detail)\.spec\.ts/, fullyParallel: false, workers: 1, timeout: 120_000, diff --git a/src/App.tsx b/src/App.tsx index bf0d160..496e934 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -9,6 +9,7 @@ import { TodoPage } from './pages/TodoPage'; import { WorkbenchPage } from './pages/WorkbenchPage'; import { DesignCenterPage } from './pages/DesignCenterPage'; import { NewFeatureShell } from './pages/NewFeatureShell'; +import { MasterDetailShell } from './pages/MasterDetailShell'; import { AiFeatureForm } from './pages/AiFeatureForm'; import { ModelerPage } from './pages/ModelerPage'; @@ -45,6 +46,7 @@ export default function App() { } /> {/* 人走五环编排壳 + AI ①面入口(admin-gated,页内早返回守护)*/} } /> + } /> } /> {/* 建模器(五环第①环·元数据→表,仅管理员)*/} } /> diff --git a/src/pages/DesignCenterPage.tsx b/src/pages/DesignCenterPage.tsx index ffcb9bf..b58f627 100644 --- a/src/pages/DesignCenterPage.tsx +++ b/src/pages/DesignCenterPage.tsx @@ -81,6 +81,14 @@ export function DesignCenterPage() { > + 新建功能 + +

新建主子表功能 · 主表 + 子表 EditGrid

+ +
+ +
+ + ); +}