feat(master-detail): 主子表向导(amis wizard)+ 设计中心入口 + e2e

新建主子表功能:设计中心「+ 新建主子表」→ MasterDetailShell amis wizard 四步
(建主实体→建子表(传masterTable自动加FK)→生成主子页(compile master-detail-v1,
后端ensureLink+编译出 input-table 子表页)→发布)。子行经主表_ADD流随主记录级联落库。
用 api.responseData 把主实体id/表名 remap 避免被子实体响应覆盖。
Playwright e2e 全程点穿:建主+子→生成→发布→级联_ADD(status0)。1 passed。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
2026-06-20 15:37:22 +08:00
parent 2b261e319f
commit 934c6464db
5 changed files with 250 additions and 1 deletions

96
e2e/master-detail.spec.ts Normal file
View File

@@ -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<string> {
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);
});

View File

@@ -5,7 +5,7 @@ import { defineConfig, devices } from '@playwright/test';
// 先单独启动 8094 后端,再 `npx playwright test -c playwright.fivering.config.ts`。 // 先单独启动 8094 后端,再 `npx playwright test -c playwright.fivering.config.ts`。
export default defineConfig({ export default defineConfig({
testDir: './e2e', testDir: './e2e',
testMatch: 'five-ring.spec.ts', testMatch: /(five-ring|master-detail)\.spec\.ts/,
fullyParallel: false, fullyParallel: false,
workers: 1, workers: 1,
timeout: 120_000, timeout: 120_000,

View File

@@ -9,6 +9,7 @@ import { TodoPage } from './pages/TodoPage';
import { WorkbenchPage } from './pages/WorkbenchPage'; import { WorkbenchPage } from './pages/WorkbenchPage';
import { DesignCenterPage } from './pages/DesignCenterPage'; import { DesignCenterPage } from './pages/DesignCenterPage';
import { NewFeatureShell } from './pages/NewFeatureShell'; import { NewFeatureShell } from './pages/NewFeatureShell';
import { MasterDetailShell } from './pages/MasterDetailShell';
import { AiFeatureForm } from './pages/AiFeatureForm'; import { AiFeatureForm } from './pages/AiFeatureForm';
import { ModelerPage } from './pages/ModelerPage'; import { ModelerPage } from './pages/ModelerPage';
@@ -45,6 +46,7 @@ export default function App() {
<Route path="/design-center" element={<DesignCenterPage />} /> <Route path="/design-center" element={<DesignCenterPage />} />
{/* 人走五环编排壳 + AI ①面入口(admin-gated,页内早返回守护)*/} {/* 人走五环编排壳 + AI ①面入口(admin-gated,页内早返回守护)*/}
<Route path="/new-feature" element={<NewFeatureShell />} /> <Route path="/new-feature" element={<NewFeatureShell />} />
<Route path="/new-feature-md" element={<MasterDetailShell />} />
<Route path="/ai-feature" element={<AiFeatureForm />} /> <Route path="/ai-feature" element={<AiFeatureForm />} />
{/* 建模器(五环第①环·元数据→表,仅管理员)*/} {/* 建模器(五环第①环·元数据→表,仅管理员)*/}
<Route path="/modeler" element={<ModelerPage />} /> <Route path="/modeler" element={<ModelerPage />} />

View File

@@ -81,6 +81,14 @@ export function DesignCenterPage() {
> >
+ 新建功能 + 新建功能
</button> </button>
<button
className="btn btn-sm"
data-testid="dc-new-feature-md"
onClick={() => navigate('/new-feature-md')}
title="主子表:主表 + 子表 EditGrid,子行随主记录级联保存"
>
+ 新建主子表
</button>
<button <button
className="btn btn-sm" className="btn btn-sm"
data-testid="dc-ai-feature" data-testid="dc-ai-feature"

View File

@@ -0,0 +1,143 @@
// 人走五环 · 主子表编排壳 —— amis wizard 渲染(master-detail-v1)。
// 四步全在 amis 内:① 建主实体 → ② 建子表(传 masterTable,后端自动加 MASTERID 引用列回链主表)
// → ③ 生成主子页(compile master-detail-v1,后端先 ensureLink 接线再编译,产 input-table 子表页)
// → ④ 发布主表(五流+菜单)。子表行经主表 _ADD 流随主记录级联落库(引擎按 LIST 列自动回填外键)。
// 关键:用 api.responseData 把主实体 id/表名 remap 到 masterEntityId/masterTable,
// 避免被②子实体的响应(entityId/tablename)覆盖,后续 ③④ 仍能引用主表。
import { useMemo } from 'react';
import { useNavigate } from 'react-router-dom';
import { getProfile } from '../auth/token';
import { AmisRenderer } from '../components/AmisRenderer';
const TYPE_OPTIONS = [
{ label: '文本', value: 'string' },
{ label: '整数', value: 'integer' },
{ label: '小数', value: 'number' },
{ label: '日期', value: 'date' },
{ label: '日期时间', value: 'datetime' },
{ label: '布尔', value: 'boolean' },
];
function attrCombo(name: string): Record<string, unknown> {
return {
type: 'combo', name, label: '字段', multiple: true, addable: true, removable: true,
addButtonText: '加字段', minLength: 1,
items: [
{ type: 'input-text', name: 'column', label: '列名', required: true, placeholder: 'TITLE',
validations: { matchRegexp: '/^[A-Z][A-Z0-9_]{0,40}$/' }, validationErrors: { matchRegexp: '大写字母开头' } },
{ type: 'input-text', name: 'display', label: '显示名', placeholder: '标题' },
{ type: 'select', name: 'type', label: '类型', value: 'string', options: TYPE_OPTIONS },
{ type: 'switch', name: 'mandatory', label: '必填', value: false },
],
};
}
function buildSchema(): Record<string, unknown> {
return {
type: 'page',
body: {
type: 'wizard',
mode: 'horizontal',
actionPrevLabel: '上一步',
actionNextSaveLabel: '保存并下一步',
actionFinishLabel: '完成(发布)',
steps: [
{
title: '① 建主实体',
subTitle: '主表',
hint: '主表的元数据 + 物理表。标准列(主键/审计)后端自动补。',
// 主实体的 id/表名 remap 到 master*,避免被②子实体响应覆盖。
api: { method: 'post', url: '/api/meta/entity', responseData: { masterEntityId: '${entityId}', masterTable: '${tablename}' } },
body: [
{ type: 'input-text', name: 'tablename', label: '主表名', required: true, placeholder: 'OA_PURCHASE',
description: '大写字母开头,3–41 位', validations: { matchRegexp: '/^[A-Z][A-Z0-9_]{2,40}$/' },
validationErrors: { matchRegexp: '表名格式不合法' } },
{ type: 'input-text', name: 'name', label: '主表显示名', placeholder: '采购申请' },
{ type: 'select', name: 'entitytype', label: '所属分类', required: true,
source: 'get:/api/meta/entity-types', labelField: 'name', valueField: 'id', searchable: true,
description: '主表与子表共用此分类' },
attrCombo('attributes'),
],
},
{
title: '② 建子表',
subTitle: '明细',
hint: '子表自动加一列 MASTERID 指向主表(回链外键),无需手动添加。',
api: {
method: 'post', url: '/api/meta/entity',
data: {
tablename: '${childTablename}', name: '${childName}', entitytype: '${entitytype}',
tabletype: 1, masterTable: '${masterTable}', attributes: '${childAttributes}',
},
},
body: [
{ type: 'static', name: 'masterTable', label: '主表' },
{ type: 'input-text', name: 'childTablename', label: '子表名', required: true, placeholder: 'OA_PURCHASE_ITEM',
validations: { matchRegexp: '/^[A-Z][A-Z0-9_]{2,40}$/' }, validationErrors: { matchRegexp: '表名格式不合法' } },
{ type: 'input-text', name: 'childName', label: '子表显示名', placeholder: '采购明细' },
attrCombo('childAttributes'),
],
},
{
title: '③ 生成主子页',
subTitle: '编译落标准层',
// 后端 recipe=master-detail-v1:先 ensureLink(MASTERID/DETAILS) 接线,再编译出主 CRUD + 子表 input-table。
api: {
method: 'post', url: '/api/design/recipe/compile',
data: {
tableName: '${masterTable}', recipe: 'master-detail-v1', title: '${title}',
displayField: '${displayField}', childTable: '${childTablename}',
linkColumn: 'MASTERID', listColumn: 'DETAILS', listLabel: '${childName}',
},
responseData: { templateId: '${templateId}' },
},
body: [
{ type: 'static', label: '主表 / 子表', tpl: '${masterTable} / ${childTablename}' },
{ type: 'input-text', name: 'title', label: '页面标题', required: true, placeholder: '采购申请(主子)' },
{ type: 'input-text', name: 'displayField', label: '主表显示字段', placeholder: '可选,默认主表显示列' },
],
},
{
title: '④ 发布',
subTitle: '五流 + 菜单',
api: {
method: 'post', url: '/api/design/publish',
data: { entityId: '${masterEntityId}', tableName: '${masterTable}', templateId: '${templateId}', menuName: '${menuName}', generateDeploymentPackage: true },
},
body: [
{ type: 'static', label: '已生成模板', name: 'templateId' },
{ type: 'input-text', name: 'menuName', label: '菜单名', required: true, value: '${title}' },
{ type: 'button', label: '进设计器微调', level: 'enhance', className: 'mb-2',
actionType: 'url', url: '/editor.html?templateId=${templateId}', blank: true, visibleOn: '${templateId}' },
{ type: 'alert', level: 'info',
body: '发布 = 写标准页 + 触发主表 5 默认流 + 注册菜单。子表行经主表 _ADD 流随主记录级联落库(引擎按 LIST 列自动回填子表外键),发布恒人审。' },
],
},
],
onEvent: { finished: { actions: [{ actionType: 'toast', args: { msgType: 'success', msg: '主子表功能已发布,可在左侧菜单查看。' } }] } },
},
};
}
export function MasterDetailShell() {
const navigate = useNavigate();
const profile = getProfile();
const isAdmin = profile?.account === 'admin' || profile?.userId === 'ADMIN';
const schema = useMemo(buildSchema, []);
if (!isAdmin) {
return <div style={{ padding: 24, color: 'var(--text-3)' }}>新建主子表功能仅管理员可用。</div>;
}
return (
<div style={{ height: '100%', display: 'flex', flexDirection: 'column' }} data-testid="master-detail-shell">
<div style={{ display: 'flex', alignItems: 'center', gap: 12, padding: 'var(--pad-lg)', paddingBottom: 8 }}>
<button className="btn btn-sm" onClick={() => navigate('/design-center')}>← 返回设计中心</button>
<h2 style={{ margin: 0, fontSize: 18, fontWeight: 600 }}>新建主子表功能 · 主表 + 子表 EditGrid</h2>
</div>
<div style={{ flex: 1, minHeight: 0, overflow: 'auto', padding: '0 var(--pad-lg) var(--pad-lg)' }}>
<AmisRenderer schema={schema} />
</div>
</div>
);
}