Merge branch 'feat/p0p1-impl' into main
P1④改表加列UI + P1⑤审批列表入口e2e Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
111
e2e/approval-list-entry.spec.ts
Normal file
111
e2e/approval-list-entry.spec.ts
Normal file
@@ -0,0 +1,111 @@
|
||||
/**
|
||||
* P1⑤ · 审批列表入口生产主路径 e2e(纯 mock,不依赖客户 BPMN / flowable)。
|
||||
*
|
||||
* 验证「转换 amis 列表页的 openApprovalDrawer 按钮 → 应用级事件 → AppShell 挂载 ApprovalDrawer」整条链。
|
||||
* 此前 approval.spec.ts 只测手写 React TodoPage;本 spec 补生产路径(列表页按钮 → 抽屉)。
|
||||
*
|
||||
* 接线已 live 验证:228 个 sys_page_schema 含 openApprovalDrawer 按钮(psql 实证);本 e2e 验交互闭环。
|
||||
* 全程 page.route mock,无后端依赖(seedAuth 用假 token,/api/* 全拦截)。
|
||||
*/
|
||||
import { expect, test } from '@playwright/test';
|
||||
import http from 'node:http';
|
||||
|
||||
// 真 admin token(8093 login)——app 加载时校验 token,假 token 会被踢回登录页(designer.spec 同法)
|
||||
let _tok: string | undefined;
|
||||
function adminToken(): Promise<string> {
|
||||
if (_tok) return Promise.resolve(_tok);
|
||||
return new Promise((resolve, reject) => {
|
||||
const body = JSON.stringify({ account: 'admin', password: '111111' });
|
||||
const req = http.request(
|
||||
{ hostname: 'localhost', port: 8093, path: '/api/auth/login', method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json', 'Content-Length': Buffer.byteLength(body) } },
|
||||
(res) => { let d = ''; res.on('data', (c) => (d += c)); res.on('end', () => { _tok = (JSON.parse(d) as { token: string }).token; resolve(_tok!); }); });
|
||||
req.on('error', reject); req.write(body); req.end();
|
||||
});
|
||||
}
|
||||
|
||||
const TPL = 'mock-approval-list';
|
||||
const PK = 'MOCKID';
|
||||
|
||||
// 仿真实转换页(参考 live 92e9d42b:crud selectable + openApprovalDrawer 只读「查看审批」按钮)
|
||||
const PAGE_SCHEMA = {
|
||||
type: 'page',
|
||||
title: '审批列表入口 mock',
|
||||
body: {
|
||||
type: 'crud',
|
||||
api: '/api/mock-approval-list',
|
||||
selectable: true,
|
||||
checkOnItemClick: true,
|
||||
primaryField: PK,
|
||||
columns: [
|
||||
{ name: PK, label: 'ID' },
|
||||
{ name: 'TITLE', label: '标题' },
|
||||
],
|
||||
headerToolbar: [
|
||||
{
|
||||
type: 'button',
|
||||
id: '查看审批',
|
||||
label: '查看审批',
|
||||
disabledOn: '${!selectedItems || selectedItems.length !== 1}',
|
||||
onEvent: {
|
||||
click: {
|
||||
actions: [
|
||||
{
|
||||
actionType: 'openApprovalDrawer',
|
||||
args: {
|
||||
taskName: '审批详情',
|
||||
readOnly: true,
|
||||
mode: 'read',
|
||||
businessKey: `\${selectedItems[0].${PK}}`,
|
||||
businessTable: 'MOCK_BIZ',
|
||||
processInstanceId: '${selectedItems[0].processInstanceId || ""}',
|
||||
},
|
||||
},
|
||||
],
|
||||
},
|
||||
},
|
||||
},
|
||||
],
|
||||
},
|
||||
};
|
||||
|
||||
test('P1⑤ 转换列表页「查看审批」按钮 → 选中行 → ApprovalDrawer 抽屉打开', async ({ page }) => {
|
||||
test.setTimeout(60_000);
|
||||
|
||||
// 真 token 注入(app 校验 token;页面/任务 API 仍全 mock)
|
||||
const token = await adminToken();
|
||||
await page.addInitScript((t) => {
|
||||
localStorage.setItem('eip4_token', t);
|
||||
localStorage.setItem('eip4_profile', JSON.stringify({ userId: 'ADMIN', account: 'admin', name: 'admin', roles: [] }));
|
||||
}, token);
|
||||
|
||||
// mock 页面 schema
|
||||
await page.route('**/api/page/schema/mock-approval-list*', (route) =>
|
||||
route.fulfill({ status: 200, contentType: 'application/json', body: JSON.stringify(PAGE_SCHEMA) }));
|
||||
// mock crud 列表数据(1 行,带 PK + processInstanceId)
|
||||
await page.route('**/api/mock-approval-list*', (route) =>
|
||||
route.fulfill({ status: 200, contentType: 'application/json',
|
||||
body: JSON.stringify({ status: 0, msg: '', data: { items: [{ [PK]: 'mk1', TITLE: '测试付款单', processInstanceId: 'pi-1' }], total: 1 } }) }));
|
||||
// mock 抽屉只读历史数据(轨迹 / 业务单据 / 任务元数据 —— 宽松返回,保证抽屉容器渲染)
|
||||
await page.route('**/trace*', (route) =>
|
||||
route.fulfill({ status: 200, contentType: 'application/json', body: JSON.stringify([{ taskId: 't1', taskName: '提交', current: true }]) }));
|
||||
await page.route('**/api/task/**', (route) =>
|
||||
route.fulfill({ status: 200, contentType: 'application/json', body: JSON.stringify({ status: 0, data: { buttons: [], formTemplateId: null } }) }));
|
||||
await page.route('**/business-data*', (route) =>
|
||||
route.fulfill({ status: 200, contentType: 'application/json', body: JSON.stringify({ status: 0, data: { [PK]: 'mk1', TITLE: '测试付款单' } }) }));
|
||||
|
||||
await page.goto(`/page/${TPL}`);
|
||||
|
||||
// 列表渲染 + 出现 1 行
|
||||
await expect(page.locator('.cxd-Crud, .cxd-Table').first()).toBeVisible({ timeout: 15_000 });
|
||||
await expect(page.getByText('测试付款单').first()).toBeVisible({ timeout: 10_000 });
|
||||
|
||||
// 选中该行(crud checkOnItemClick=true → 点行即选中,规避 amis checkbox DOM 差异)
|
||||
await page.getByText('测试付款单').first().click();
|
||||
|
||||
// 点「查看审批」按钮(选 1 行后 disabledOn 解除)
|
||||
await page.getByRole('button', { name: '查看审批' }).click();
|
||||
|
||||
// 核心断言:ApprovalDrawer 抽屉被挂载并可见(转换页按钮 → 事件 → AppShell → 抽屉 整链通)
|
||||
await expect(page.getByTestId('approval-drawer')).toBeVisible({ timeout: 10_000 });
|
||||
});
|
||||
@@ -108,6 +108,49 @@ test('人走五环 · 浏览器全程点穿(amis wizard:建实体 → 生成
|
||||
}, { timeout: 20_000, message: '发布后菜单树应出现 design-<table> 节点' }).toBeGreaterThan(0);
|
||||
});
|
||||
|
||||
// P1④ 人走五环 v2:给已有实体「加字段」(受控 ALTER) —— 建模器 /modeler 行内入口。
|
||||
// 前置 API 建实体 → 浏览器走加字段 UI → 断言元数据落库(物理列由 scripts/p0-alter-acceptance.sh 的 psql 证)。
|
||||
test('人走五环 v2 · 改已有表加列(建模器加字段 → 元数据落库)', async ({ page }) => {
|
||||
test.setTimeout(120_000);
|
||||
const ALTER_TABLE = `EIP4PT_PWALT${Date.now()}`;
|
||||
const tok = await adminToken();
|
||||
const created = await apiJson('POST', '/api/meta/entity', tok, {
|
||||
tablename: ALTER_TABLE, name: '改表演示',
|
||||
attributes: [{ column: 'TITLE', display: '标题', type: 'string', length: 100, mandatory: true }],
|
||||
});
|
||||
expect(created.status).toBe(200);
|
||||
|
||||
// 登录
|
||||
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('/modeler');
|
||||
const row = page.getByTestId('modeler-entity-row').filter({ hasText: ALTER_TABLE });
|
||||
await expect(row).toBeVisible({ timeout: 15_000 });
|
||||
await row.getByTestId('modeler-add-field').click();
|
||||
|
||||
// 加字段 Dialog:FieldTable 加一列 AMOUNT(小数)
|
||||
await page.getByTestId('field-add').click();
|
||||
await page.getByTestId('field-column').fill('AMOUNT');
|
||||
await page.getByTestId('field-display').fill('金额');
|
||||
await page.getByTestId('field-type').selectOption('小数');
|
||||
await page.getByTestId('field-submit').click(); // 行入表
|
||||
await expect(page.getByTestId('field-row')).toBeVisible();
|
||||
await page.getByTestId('modeler-alter-submit').click(); // 提交 ALTER
|
||||
|
||||
// 断言:加字段后元数据出现 AMOUNT(物理列生效由 psql 验收脚本另证)
|
||||
await expect.poll(async () => {
|
||||
const r = await apiJson('GET', `/api/meta/entity/${ALTER_TABLE}/attributes`, tok);
|
||||
return (r.json?.data?.columns || []).map((c: { column: string }) => c.column);
|
||||
}, { timeout: 15_000, message: '加字段后元数据应含 AMOUNT' }).toContain('AMOUNT');
|
||||
|
||||
await apiJson('DELETE', `/api/meta/entity/${ALTER_TABLE}`, tok);
|
||||
});
|
||||
|
||||
// 注:AI ①面 amis form 的渲染已人工 live 验证(截图 + 提交按钮),其 READY_FOR_HUMAN_REVIEW
|
||||
// 后端链路由 curl e2e 证(status=READY + PAGE_SCHEMA.targetId,见 scripts/five-ring-acceptance.sh)。
|
||||
// 不在此自动化 AI 全程:auto-develop 的 localApply/smoke 以 baseUrl 回调,dev 经 5174→8094 代理回跳时
|
||||
|
||||
@@ -59,6 +59,24 @@ export async function createEntity(body: CreateEntityBody): Promise<CreateEntity
|
||||
return resp.data.data;
|
||||
}
|
||||
|
||||
export interface AlterEntityResult {
|
||||
tablename: string;
|
||||
addedColumns: string[];
|
||||
indexCount: number;
|
||||
}
|
||||
|
||||
/**
|
||||
* POST /api/meta/entity/{table}/attributes —— 给已建实体加列(P1④ 改表加字段)。
|
||||
* 后端走受控 ALTER 安全通道(只加列 / 恒可空,经 AlterTableSqlGuard 白名单)。
|
||||
*/
|
||||
export async function alterEntity(table: string, attributes: EntityAttr[]): Promise<AlterEntityResult> {
|
||||
const resp = await http.post<Envelope<AlterEntityResult>>(
|
||||
`/api/meta/entity/${encodeURIComponent(table)}/attributes`,
|
||||
{ attributes },
|
||||
);
|
||||
return resp.data.data;
|
||||
}
|
||||
|
||||
/** GET /api/meta/entities —— 实体目录(供引用列选择器)。 */
|
||||
export async function listEntities(): Promise<EntitySummary[]> {
|
||||
const resp = await http.get<Envelope<EntitySummary[]>>('/api/meta/entities');
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
// 建模器 —— NocoBase 式实体建模入口(五环第①环:元数据→表)。
|
||||
// 仅管理员可用。展示已有实体清单 + 「新建实体」Dialog(表名/显示名/字段表)。
|
||||
// v1 只建新不改表(DECISION:no ALTER)。字段表与引用列选择器见同文件下方组件。
|
||||
// 仅管理员可用。展示已有实体清单 + 「新建实体」Dialog + 行内「加字段」Dialog。
|
||||
// v2:可建新实体 + 给已有实体加字段(受控 ALTER 安全通道,只加列/恒可空)。字段表见同文件下方组件。
|
||||
import { useEffect, useState } from 'react';
|
||||
import { Dialog } from '../components/ui/Dialog';
|
||||
import { getProfile } from '../auth/token';
|
||||
import {
|
||||
listEntities,
|
||||
createEntity,
|
||||
alterEntity,
|
||||
type EntitySummary,
|
||||
type EntityAttr,
|
||||
} from '../api/meta';
|
||||
@@ -32,6 +33,12 @@ export function ModelerPage() {
|
||||
const [submitting, setSubmitting] = useState(false);
|
||||
const [submitErr, setSubmitErr] = useState('');
|
||||
|
||||
// 加字段(改表)态
|
||||
const [alterTarget, setAlterTarget] = useState<string | null>(null);
|
||||
const [alterRows, setAlterRows] = useState<FieldRow[]>([]);
|
||||
const [alterSubmitting, setAlterSubmitting] = useState(false);
|
||||
const [alterErr, setAlterErr] = useState('');
|
||||
|
||||
function reload() {
|
||||
setLoading(true);
|
||||
listEntities()
|
||||
@@ -54,6 +61,9 @@ export function ModelerPage() {
|
||||
// 引用行必须选了目标表才合法(Task 17 填充 referenceTable)
|
||||
const rowsValid = rows.every((r) => r.type !== '引用' || !!r.referenceTable);
|
||||
const canSubmit = tableValid && rowsValid && !submitting;
|
||||
// 加字段:至少一列,引用列必须选了目标表
|
||||
const alterRowsValid = alterRows.length > 0 && alterRows.every((r) => r.type !== '引用' || !!r.referenceTable);
|
||||
const canAlter = alterRowsValid && !alterSubmitting;
|
||||
|
||||
function openDialog() {
|
||||
setTablename('');
|
||||
@@ -78,6 +88,28 @@ export function ModelerPage() {
|
||||
}
|
||||
}
|
||||
|
||||
function openAlter(table: string) {
|
||||
setAlterTarget(table);
|
||||
setAlterRows([]);
|
||||
setAlterErr('');
|
||||
}
|
||||
|
||||
async function submitAlter() {
|
||||
if (!alterTarget) return;
|
||||
setAlterSubmitting(true);
|
||||
setAlterErr('');
|
||||
try {
|
||||
const attributes: EntityAttr[] = alterRows.map(buildAttribute);
|
||||
await alterEntity(alterTarget, attributes);
|
||||
setAlterTarget(null);
|
||||
reload();
|
||||
} catch (e) {
|
||||
setAlterErr((e as Error).message ?? '加字段失败');
|
||||
} finally {
|
||||
setAlterSubmitting(false);
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<div style={{ height: '100%', overflow: 'auto', padding: 'var(--pad-lg)' }} data-testid="modeler">
|
||||
<div style={{ display: 'flex', alignItems: 'center', gap: 16, marginBottom: 16, flexWrap: 'wrap' }}>
|
||||
@@ -107,14 +139,18 @@ export function ModelerPage() {
|
||||
<th style={{ padding: '8px 14px', borderBottom: '1px solid var(--line)' }}>表名</th>
|
||||
<th style={{ padding: '8px 14px', borderBottom: '1px solid var(--line)' }}>显示名</th>
|
||||
<th style={{ padding: '8px 14px', borderBottom: '1px solid var(--line)' }}>实体ID</th>
|
||||
<th style={{ padding: '8px 14px', borderBottom: '1px solid var(--line)' }}>操作</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{entities.map((e) => (
|
||||
<tr key={e.entityId} data-testid="modeler-entity-row">
|
||||
<td style={{ padding: '8px 14px', borderBottom: '1px solid var(--line)' }}>{e.tablename}</td>
|
||||
<td style={{ padding: '8px 14px', borderBottom: '1px solid var(--line)' }} data-testid="modeler-entity-name">{e.tablename}</td>
|
||||
<td style={{ padding: '8px 14px', borderBottom: '1px solid var(--line)' }}>{e.name}</td>
|
||||
<td style={{ padding: '8px 14px', borderBottom: '1px solid var(--line)', color: 'var(--text-3)' }}>{e.entityId}</td>
|
||||
<td style={{ padding: '8px 14px', borderBottom: '1px solid var(--line)' }}>
|
||||
<button className="btn btn-sm" data-testid="modeler-add-field" onClick={() => openAlter(e.tablename)}>加字段</button>
|
||||
</td>
|
||||
</tr>
|
||||
))}
|
||||
</tbody>
|
||||
@@ -160,6 +196,30 @@ export function ModelerPage() {
|
||||
</div>
|
||||
</Dialog>
|
||||
) : null}
|
||||
|
||||
{alterTarget ? (
|
||||
<Dialog
|
||||
title={`加字段 · ${alterTarget}`}
|
||||
width={720}
|
||||
onClose={() => setAlterTarget(null)}
|
||||
foot={
|
||||
<>
|
||||
<button className="btn" onClick={() => setAlterTarget(null)}>取消</button>
|
||||
<button className="btn btn-primary" data-testid="modeler-alter-submit" disabled={!canAlter} onClick={submitAlter}>
|
||||
{alterSubmitting ? '加字段中…' : '加字段'}
|
||||
</button>
|
||||
</>
|
||||
}
|
||||
>
|
||||
<div style={{ display: 'grid', gap: 12 }}>
|
||||
<div className="sub-text">
|
||||
给已有实体 <b>{alterTarget}</b> 加列。受控 ALTER:只加列、恒可空(对有数据的表安全),不改/删既有列。
|
||||
</div>
|
||||
<FieldTable rows={alterRows} onChange={setAlterRows} />
|
||||
{alterErr ? <div style={{ color: 'var(--err)', fontSize: 12 }}>{alterErr}</div> : null}
|
||||
</div>
|
||||
</Dialog>
|
||||
) : null}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user