feat(主子表): 引用驱动联动 向导映射 UI + 真事件 e2e
- NewFeatureShell: 主子表步③加「引用联动」combo(引用列 → 目标子列 ← 源实体列),
childLinkage 透传 compile;构建时分支(不依赖 amis 运行时 step 跳步),页面 data seed []
- e2e/master-detail: 引用驱动联动用例——真后端 schema(GET /api/page/schema) + 真 picker
数据 + 真 Playwright 事件填充 + 提交落库验证(选物料→带出单价/规格,用户未手填仍随
_ADD 级联落库;引用 FK 本身也落库)
- e2e/linkage-probe: amis input-table 行内联动机制隔离验证(钉死 selectedItems 是对象非
数组;远程 source 选项携整行列;多行 ${index} 按行隔离防串台)
- NewFeatureShell.test: 修过时断言(c735f24 类型选择卡后需先选类型才出 amis 挂载点)
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -15,6 +15,10 @@ const CHILD = `EIP4PT_MDW${TS}C`;
|
||||
// 第二个用例(派生+汇总)专用表
|
||||
const MASTER2 = `EIP4PT_MDD${TS}M`;
|
||||
const CHILD2 = `EIP4PT_MDD${TS}C`;
|
||||
// 第三个用例(引用驱动联动)专用表:物料引用实体 + 主表 + 子表(含引用列)
|
||||
const MAT = `EIP4PT_MTL${TS}`;
|
||||
const MASTER3 = `EIP4PT_LKM${TS}`;
|
||||
const CHILD3 = `EIP4PT_LKC${TS}`;
|
||||
|
||||
function api(method: string, path: string, token?: string, body?: unknown): Promise<{ status: number; json: any }> {
|
||||
return new Promise((resolve, reject) => {
|
||||
@@ -71,9 +75,35 @@ test.afterAll(async () => {
|
||||
await api('DELETE', `/api/meta/entity/${MASTER}`, tok);
|
||||
await api('DELETE', `/api/meta/entity/${CHILD2}`, tok);
|
||||
await api('DELETE', `/api/meta/entity/${MASTER2}`, tok);
|
||||
// 子表引用物料,先删子/主,再删物料引用实体。
|
||||
await api('DELETE', `/api/meta/entity/${CHILD3}`, tok);
|
||||
await api('DELETE', `/api/meta/entity/${MASTER3}`, tok);
|
||||
await api('DELETE', `/api/meta/entity/${MAT}`, tok);
|
||||
} catch { /* best effort */ }
|
||||
});
|
||||
|
||||
// 建实体 → 取 entityId。attributes 见各列 {column,display,type,referenceTable?,mandatory?}。
|
||||
async function createEntity(tok: string, table: string, name: string, etype: string,
|
||||
attributes: Record<string, unknown>[], masterTable?: string): Promise<string> {
|
||||
const body: Record<string, unknown> = { tablename: table, name, entitytype: etype, attributes };
|
||||
if (masterTable) body.masterTable = masterTable;
|
||||
const r = await api('POST', '/api/meta/entity', tok, body);
|
||||
if (r.json?.status !== 0) throw new Error(`createEntity ${table} 失败: ${JSON.stringify(r.json)}`);
|
||||
return r.json.data.entityId as string;
|
||||
}
|
||||
|
||||
// 编译 maintenance-crud + 发布(建默认流),供物料实体可 _ADD 行(picker 读真实数据)。
|
||||
// menuName 须 ≤ sys_menu.name varchar(20);本测不走菜单导航(直接 embed schema),故用短名即可。
|
||||
async function compileAndPublish(tok: string, table: string, entityId: string, menuName: string): Promise<void> {
|
||||
const c = await api('POST', '/api/design/recipe/compile', tok,
|
||||
{ tableName: table, recipe: 'maintenance-crud-v1', title: `${table}页` });
|
||||
const tid = c.json?.data?.templateId;
|
||||
if (!tid) throw new Error(`compile ${table} 失败: ${JSON.stringify(c.json)}`);
|
||||
const p = await api('POST', '/api/design/publish', tok,
|
||||
{ entityId, tableName: table, templateId: tid, menuName, generateDeploymentPackage: false });
|
||||
if (p.json?.status !== 0) throw new Error(`publish ${table} 失败: ${JSON.stringify(p.json)}`);
|
||||
}
|
||||
|
||||
test('主子表 · 统一向导全程点穿(选主子表 → 建主+子 → 生成主子页 → 发布 → 级联保存子行)', async ({ page }) => {
|
||||
test.setTimeout(120_000);
|
||||
await openWizardAsMasterDetail(page);
|
||||
@@ -218,3 +248,138 @@ test('主子表派生字段+父级汇总 · 统一向导加派生/汇总 → 发
|
||||
expect(amts, '服务端派生 AMOUNT=数量×单价(3×10=30,2×12.5=25)').toEqual([25, 30]);
|
||||
expect(Number(loaded.json?.data?.result?.TOTAL), '服务端聚合 TOTAL=55').toBe(55);
|
||||
});
|
||||
|
||||
test('引用驱动联动 · 子表选物料(真 Playwright 事件)→带出单价/规格, 校验 schema + 真实填充 + 提交落库', async ({ page }) => {
|
||||
test.setTimeout(120_000);
|
||||
const tok = await adminToken();
|
||||
|
||||
// 取一个实体分类 id
|
||||
const types = await api('GET', '/api/meta/entity-types', tok);
|
||||
const etype = (types.json?.data ?? [])[0]?.id;
|
||||
expect(etype, '应有可用实体分类').toBeTruthy();
|
||||
|
||||
// ── 设置(API):物料引用实体(含 PRICE/SPEC)+ 发布建流 + 2 行(picker 读真实数据)──
|
||||
const matId = await createEntity(tok, MAT, '物料', etype, [
|
||||
{ column: 'MATNAME', display: '物料名', type: 'string', mandatory: true },
|
||||
{ column: 'PRICE', display: '单价', type: 'number' },
|
||||
{ column: 'SPEC', display: '规格', type: 'string' },
|
||||
]);
|
||||
await compileAndPublish(tok, MAT, matId, '物料联动');
|
||||
expect((await api('POST', `/api/flow/${MAT}_ADD`, tok,
|
||||
{ MATNAME: '水泥', PRICE: 10, SPEC: '袋装' })).json?.status, '物料水泥 _ADD').toBe(0);
|
||||
expect((await api('POST', `/api/flow/${MAT}_ADD`, tok,
|
||||
{ MATNAME: '钢筋', PRICE: 20, SPEC: '12mm' })).json?.status, '物料钢筋 _ADD').toBe(0);
|
||||
|
||||
// ── 设置(API):主表 + 子表(子表含引用列 ITEMID→物料、被带出列 ITEMPRICE/ITEMSPEC)──
|
||||
const masterId = await createEntity(tok, MASTER3, '采购联动', etype, [
|
||||
{ column: 'TITLE', display: '标题', type: 'string', mandatory: true },
|
||||
]);
|
||||
await createEntity(tok, CHILD3, '采购联动明细', etype, [
|
||||
{ column: 'ITEMNAME', display: '明细名', type: 'string' },
|
||||
{ column: 'ITEMID', display: '物料', type: 'reference', referenceTable: MAT },
|
||||
{ column: 'ITEMPRICE', display: '单价', type: 'number' },
|
||||
{ column: 'ITEMSPEC', display: '规格', type: 'string' },
|
||||
], MASTER3);
|
||||
|
||||
// ── 编译 master-detail + 引用驱动联动(ITEMID 选中→带出 ITEMPRICE←PRICE / ITEMSPEC←SPEC)──
|
||||
const compileResp = await api('POST', '/api/design/recipe/compile', tok, {
|
||||
tableName: MASTER3, recipe: 'master-detail-v1', title: '采购联动单',
|
||||
childTable: CHILD3, linkColumn: 'MASTERID', listColumn: 'DETAILS', listLabel: '明细',
|
||||
childLinkage: [{ refColumn: 'ITEMID', fills: [
|
||||
{ target: 'ITEMPRICE', source: 'PRICE' }, { target: 'ITEMSPEC', source: 'SPEC' }] }],
|
||||
});
|
||||
const tid = compileResp.json?.data?.templateId;
|
||||
expect(tid, 'master-detail compile 应返回 templateId').toBeTruthy();
|
||||
await api('POST', '/api/design/publish', tok,
|
||||
{ entityId: masterId, tableName: MASTER3, templateId: tid, menuName: '采购联动单', generateDeploymentPackage: false });
|
||||
|
||||
// ── 断言 1:生成的 schema 形态正确(select source=picker + onEvent setValue selectedItems.<src>,无 [0])──
|
||||
const schema = (await api('GET', `/api/page/schema/${tid}`, tok)).json;
|
||||
const sj = JSON.stringify(schema);
|
||||
expect(sj, 'ITEMID 列应为 picker select 取物料').toContain(`/api/picker/${MAT}/list`);
|
||||
expect(sj, '联动应发 setValue 带出 PRICE').toContain('${event.data.selectedItems.PRICE}');
|
||||
expect(sj, '联动目标列 ITEMPRICE 应挂 id=ITEMPRICE_${index}').toContain('ITEMPRICE_${index}');
|
||||
// 联动 onEvent 里单选 select 的 selectedItems 是对象非数组,绝不能写 event.data.selectedItems[0]
|
||||
// (这是上一会话 fill 失败的真因)。注意 CRUD 编辑按钮的 ${selectedItems[0]}=选中主行(数组)是另一回事,合法。
|
||||
expect(sj, '联动取值绝不能含 event.data.selectedItems[0]').not.toContain('event.data.selectedItems[0]');
|
||||
|
||||
// 取 picker 真实选项:找出「水泥」行的显示标签(_label 可能是显示名也可能是裸 id)与其 PRICE,
|
||||
// UI 按真实 _label 文本点选(不假设显示名=MATNAME,规避新实体无显示列时 _label=裸 id 的情况)。
|
||||
const picker = await api('GET', `/api/picker/${MAT}/list`, tok);
|
||||
const pickerItems: any[] = picker.json?.data?.items ?? [];
|
||||
const cement = pickerItems.find((i) => i.MATNAME === '水泥');
|
||||
expect(cement, 'picker 应返回水泥行').toBeTruthy();
|
||||
expect(String(cement.PRICE), 'picker items 应携带整行 PRICE 列(联动源)').toBe('10');
|
||||
const cementLabel = String(cement._label).trim();
|
||||
|
||||
// ── 断言 2:真实渲染 + 真 Playwright 事件填充 ──
|
||||
// 取真实 schema 的「新增」表单(含真实 input-table 引用列 select),seed 一行 + 探针 tpl,amis.embed
|
||||
// 用「真后端 token fetcher」渲染(picker 打真实 8094)。不是手写 schema——是后端真产物。
|
||||
await page.goto('/login');
|
||||
await page.waitForFunction(() => typeof (window as Window & { amisRequire?: unknown }).amisRequire === 'function',
|
||||
null, { timeout: 30_000 });
|
||||
|
||||
await page.evaluate(([realSchema, token, masterTable]) => {
|
||||
const w = window as unknown as { amisRequire: (p: string) => any };
|
||||
const host = document.createElement('div');
|
||||
host.id = 'lk-host';
|
||||
host.style.cssText = 'position:fixed;inset:0;z-index:99999;background:#fff;padding:24px;overflow:auto';
|
||||
document.body.appendChild(host);
|
||||
// 真后端 fetcher:复用 vite /api 代理到 8094,带 admin Bearer。
|
||||
const fetcher = async (opt: { url: string; method?: string; data?: unknown }) => {
|
||||
const method = (opt.method || 'get').toLowerCase();
|
||||
const res = await fetch(opt.url, {
|
||||
method,
|
||||
headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${token}` },
|
||||
body: method === 'get' ? undefined : JSON.stringify(opt.data || {}),
|
||||
});
|
||||
const json = await res.json().catch(() => ({}));
|
||||
return { status: res.status, headers: {}, data: json };
|
||||
};
|
||||
// 从真实 schema 取「新增」按钮的对话框表单(含真 input-table)。
|
||||
const hb = (realSchema as any).body.headerToolbar as any[];
|
||||
const addBtn = hb.find((b) => b && b.id === '新增');
|
||||
const form = addBtn.dialog.body;
|
||||
// 探针 tpl 放进表单内(数据域含 DETAILS),实时反映联动填充结果。
|
||||
form.body.push({ type: 'tpl',
|
||||
tpl: 'PROBELK price=[${DETAILS[0].ITEMPRICE}] spec=[${DETAILS[0].ITEMSPEC}]' });
|
||||
const pageSchema = { type: 'page',
|
||||
data: { TITLE: '联动单A', DETAILS: [{}] }, // seed 一行免点「新增行」
|
||||
body: [form] };
|
||||
void masterTable;
|
||||
w.amisRequire('amis/embed').embed(host, pageSchema, {}, { fetcher });
|
||||
}, [schema, tok, MASTER3] as const);
|
||||
|
||||
const host = page.locator('#lk-host');
|
||||
await expect(host.locator('table')).toBeVisible({ timeout: 15_000 });
|
||||
const probe = page.getByText(/PROBELK/);
|
||||
|
||||
// 真事件:打开子表行内 ITEMID select → 选「水泥」。
|
||||
const sel = host.locator('.cxd-Select').first();
|
||||
await sel.click();
|
||||
// 等真实 picker options 渲染(替固定 sleep),再在下拉里(scoped .cxd-Select-option)按 _label 点选——
|
||||
// 避免 getByText 误命中全屏 host 上的其它同文本节点。
|
||||
await page.locator('.cxd-Select-option').first().waitFor({ timeout: 8_000 });
|
||||
await page.locator('.cxd-Select-option', { hasText: cementLabel }).first().click();
|
||||
|
||||
// ★ 联动填充:选物料→自动带出单价 10 / 规格 袋装(真后端 schema + 真事件,非手写)。
|
||||
await expect(probe, '选水泥应带出 ITEMPRICE=10').toContainText('price=[10]', { timeout: 8_000 });
|
||||
await expect(probe, '选水泥应带出 ITEMSPEC=袋装').toContainText('spec=[袋装]', { timeout: 8_000 });
|
||||
|
||||
// ── 断言 3:提交 → 落库(_LOAD 回读子行 ITEMPRICE=10,证明填充值真随主表 _ADD 级联落库)──
|
||||
await host.getByRole('button', { name: '提交' }).click();
|
||||
await expect.poll(async () => {
|
||||
const s = await api('POST', `/api/flow/${MASTER3}_SEARCH`, tok, {});
|
||||
return (s.json?.data?.items ?? []).find((r: any) => r.TITLE === '联动单A') ? 'ok' : 'wait';
|
||||
}, { timeout: 20_000, message: '提交后主表应查到联动单A' }).toBe('ok');
|
||||
const s = await api('POST', `/api/flow/${MASTER3}_SEARCH`, tok, {});
|
||||
const rowA = (s.json?.data?.items ?? []).find((r: any) => r.TITLE === '联动单A');
|
||||
const pk = `${MASTER3}_ID`;
|
||||
const loaded = await api('POST', `/api/flow/${MASTER3}_LOAD`, tok, { [pk]: String(rowA[pk]).trim() });
|
||||
const child = (loaded.json?.data?.result?.DETAILS ?? [])[0];
|
||||
expect(child, '应级联落子行').toBeTruthy();
|
||||
// 所选物料(引用列 FK=_id)本身应落库——证明 select valueField=_id 绑定生效(fill 之外的主契约)。
|
||||
expect(String(child.ITEMID).trim(), '所选物料引用FK应落库').toBe(String(cement._id).trim());
|
||||
expect(Number(child.ITEMPRICE), '联动带出的单价应随提交落库=10(用户未手填)').toBe(10);
|
||||
expect(String(child.ITEMSPEC).trim(), '联动带出的规格应随提交落库=袋装').toBe('袋装');
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user