refactor(design-center): 编排壳/AI入口改用 amis 渲染(替手搓原生表单)
用户反馈手搓 input/select/嵌套弹窗又丑又不一致。改: - NewFeatureShell → amis wizard(建实体 combo字段含引用列 → 选recipe → 发布),三步 api 直打后端、数据自动透传 - AiFeatureForm → amis form(api adaptor 包裹非标响应 + ARRAYFILTER 取草稿 targetId) - 组件测试改为守 admin/容器(amis 内部交 Playwright);five-ring.spec 改驱动 amis wizard 与全站业务页同一套 AmisRenderer,外观一致。wizard e2e 1 passed / 72 vitest / build 绿。 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -1,10 +1,9 @@
|
||||
/**
|
||||
* 人走五环建新功能 · 浏览器全程点穿 e2e(实施计划 Section 6 / Task 24 的 UI 补全)
|
||||
*
|
||||
* 用真实浏览器走完整链路(curl e2e 之外补「UI 点穿」这一环):
|
||||
* 登录 → 设计中心「+ 新建功能」→ 编排壳 → [+新建实体] 弹窗(建模器:标量字段 + 引用列 OWNER→SYS_USER)
|
||||
* → 选 recipe + 填标题 → 生成页面(compile 拿 templateId) → 发布(五流+菜单+部署包)
|
||||
* → 经后端 API 断言:发布后 /api/menu 树含该 templateId 节点。
|
||||
* NewFeatureShell 现为 amis wizard。本 spec 用真实浏览器走完整链路:
|
||||
* 登录 → 设计中心「+ 新建功能」→ amis wizard:①建实体(combo 字段) → ②生成页(recipe+标题) → ③发布
|
||||
* → 经后端 API 断言:发布后 /api/menu 树出现该实体的 design-<table> 模板节点。
|
||||
*
|
||||
* 后端走 8094(含本特性新代码,不碰 dev 默认 8093)。运行:
|
||||
* 先 java -jar platform-app...jar --spring.profiles.active=dev --server.port=8094
|
||||
@@ -16,6 +15,7 @@ import http from 'node:http';
|
||||
|
||||
const BACKEND_PORT = 8094;
|
||||
const TABLE = `EIP4PT_PW${Date.now()}`;
|
||||
const TPL_PREFIX = `design-${TABLE.toLowerCase().replace(/_/g, '-')}`;
|
||||
|
||||
function apiJson(method: string, path: string, token?: string, body?: unknown): Promise<{ status: number; json: any }> {
|
||||
return new Promise((resolve, reject) => {
|
||||
@@ -50,17 +50,16 @@ async function adminToken(): Promise<string> {
|
||||
}
|
||||
|
||||
test.afterAll(async () => {
|
||||
// 清理:删测试实体(drops 表 + 元数据)。页/菜单/流残留由跑后 psql 清(无运行时删除端点)。
|
||||
try {
|
||||
const tok = await adminToken();
|
||||
await apiJson('DELETE', `/api/meta/entity/${TABLE}`, tok);
|
||||
} catch { /* 清理尽力而为 */ }
|
||||
});
|
||||
|
||||
test('人走五环 · 浏览器全程点穿(建实体含引用列 → compile → 发布 → 菜单可见)', async ({ page }) => {
|
||||
test('人走五环 · 浏览器全程点穿(amis wizard:建实体 → 生成页 → 发布 → 菜单可见)', async ({ page }) => {
|
||||
test.setTimeout(120_000);
|
||||
|
||||
// ── ① 登录(真实 React 表单)──
|
||||
// ── 登录(真实 React 表单)──
|
||||
await page.goto('/login');
|
||||
await page.getByRole('textbox').first().fill('admin');
|
||||
await page.locator('input[type="password"]').fill('111111');
|
||||
@@ -72,50 +71,39 @@ test('人走五环 · 浏览器全程点穿(建实体含引用列 → compile
|
||||
await page.getByTestId('dc-new-feature').click();
|
||||
await expect(page.getByTestId('new-feature-shell')).toBeVisible();
|
||||
|
||||
// ── ②③环·建模器:新建实体(标量字段 NAME + 引用列 OWNER→SYS_USER)──
|
||||
await page.getByTestId('nf-new-entity').click();
|
||||
await page.getByTestId('nf-create-tablename').fill(TABLE);
|
||||
// ── 环①②·amis wizard 步1 建实体(combo minLength=1 自带一行字段)──
|
||||
await expect(page.getByPlaceholder('OA_DEMO')).toBeVisible({ timeout: 15_000 });
|
||||
await page.getByPlaceholder('OA_DEMO').fill(TABLE);
|
||||
// combo 默认不带行(显示「<空>」),先点「加字段」再填
|
||||
await page.getByRole('button', { name: '加字段' }).click();
|
||||
await expect(page.getByPlaceholder('TITLE').first()).toBeVisible({ timeout: 10_000 });
|
||||
await page.getByPlaceholder('TITLE').first().fill('NAME'); // combo 行·列名
|
||||
await page.getByPlaceholder('标题').first().fill('名称'); // combo 行·显示名
|
||||
await page.getByRole('button', { name: '保存并下一步' }).click();
|
||||
|
||||
// 标量字段 NAME
|
||||
await page.getByTestId('field-add').click();
|
||||
await page.getByTestId('field-column').fill('NAME');
|
||||
await page.getByTestId('field-display').fill('名称');
|
||||
await page.getByTestId('field-submit').click();
|
||||
// ── 环③·步2 选 recipe + 标题 → compile ──
|
||||
await expect(page.getByPlaceholder('如:客户等级维护')).toBeVisible({ timeout: 20_000 });
|
||||
await page.getByPlaceholder('如:客户等级维护').fill('PW五环演示');
|
||||
await page.getByRole('button', { name: '保存并下一步' }).click();
|
||||
|
||||
// 引用列 OWNER → SYS_USER(DECISION-1 的 ReferencePicker)
|
||||
await page.getByTestId('field-add').click();
|
||||
await page.getByTestId('field-column').fill('OWNER');
|
||||
await page.getByTestId('field-display').fill('负责人');
|
||||
await page.getByTestId('field-type').selectOption('引用');
|
||||
await page.getByTestId('ref-target').selectOption('SYS_USER');
|
||||
await page.getByTestId('field-submit').click();
|
||||
// ── 环④·步3 发布(菜单名已由 ${title} 预填)──
|
||||
await page.getByRole('button', { name: '完成' }).click();
|
||||
|
||||
await expect(page.getByTestId('field-row')).toHaveCount(2);
|
||||
|
||||
// 建表并使用 → 进 recipe 步
|
||||
await page.getByTestId('nf-create-submit').click();
|
||||
await expect(page.getByTestId('nf-title')).toBeVisible({ timeout: 15_000 });
|
||||
|
||||
// ── ③环·选 recipe + 生成页面 ──
|
||||
await page.getByTestId('nf-title').fill('PW五环演示');
|
||||
await page.getByTestId('nf-compile').click();
|
||||
await expect(page.getByTestId('nf-template-id')).toBeVisible({ timeout: 20_000 });
|
||||
const tid = (await page.getByTestId('nf-template-id').textContent())?.trim() ?? '';
|
||||
expect(tid).toContain('design-');
|
||||
|
||||
// ── ④环·发布(五流 + 菜单 + 部署包)──
|
||||
await page.getByTestId('nf-publish').click();
|
||||
|
||||
// 后端断言:发布后 /api/menu 树应含该 templateId 节点(强端到端证据)
|
||||
// ── 后端断言:发布后 /api/menu 树出现该实体的 design-<table> 模板节点 ──
|
||||
const tok = await adminToken();
|
||||
await expect.poll(async () => {
|
||||
const r = await apiJson('GET', '/api/menu', tok);
|
||||
const hit: string[] = [];
|
||||
const walk = (ns: any[]) => (ns || []).forEach((n) => {
|
||||
if ((n.templateId || '') === tid) hit.push(n.name);
|
||||
if ((n.templateId || '').startsWith(TPL_PREFIX)) hit.push(n.name);
|
||||
walk(n.children);
|
||||
});
|
||||
walk(r.json?.roots || []);
|
||||
return hit.length;
|
||||
}, { timeout: 15_000, message: '发布后菜单树应出现新节点' }).toBeGreaterThan(0);
|
||||
}, { timeout: 20_000, message: '发布后菜单树应出现 design-<table> 节点' }).toBeGreaterThan(0);
|
||||
});
|
||||
|
||||
// 注: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 代理回跳时
|
||||
// SPA 路由会干扰 smoke(生产同源无此问题),属测试环境工件,故不纳入 Playwright 断言。
|
||||
|
||||
@@ -1,19 +1,16 @@
|
||||
import '@testing-library/jest-dom';
|
||||
import { render, screen, fireEvent, waitFor } from '@testing-library/react';
|
||||
import { render, screen } from '@testing-library/react';
|
||||
import { MemoryRouter } from 'react-router-dom';
|
||||
import { vi, describe, it, expect, beforeEach } from 'vitest';
|
||||
import { vi, describe, it, expect } from 'vitest';
|
||||
|
||||
// AiFeatureForm 现以 amis form 渲染(<AmisRenderer>)。amis 内部(auto-develop 提交、ARRAYFILTER 取
|
||||
// 草稿 targetId、审阅按钮)由 Playwright e2e 覆盖;单测仅守 admin 守卫 + 容器/amis 挂载点。
|
||||
let mockProfile: { userId: string; account: string; name: string; roles: string[] } | null = null;
|
||||
vi.mock('../auth/token', () => ({ getProfile: () => mockProfile }));
|
||||
vi.mock('../components/AmisRenderer', () => ({ AmisRenderer: () => <div data-testid="amis-mount" /> }));
|
||||
|
||||
import { AiFeatureForm } from './AiFeatureForm';
|
||||
|
||||
vi.mock('../auth/token', () => ({
|
||||
getProfile: () => ({ userId: 'ADMIN', account: 'admin', name: 'x', roles: [] }),
|
||||
}));
|
||||
|
||||
const autoDevelop = vi.fn();
|
||||
vi.mock('../api/ai', async (importOriginal) => {
|
||||
const actual = await importOriginal<typeof import('../api/ai')>();
|
||||
return { ...actual, autoDevelop: (...a: unknown[]) => autoDevelop(...a) };
|
||||
});
|
||||
|
||||
function renderForm() {
|
||||
return render(
|
||||
<MemoryRouter>
|
||||
@@ -22,44 +19,19 @@ function renderForm() {
|
||||
);
|
||||
}
|
||||
|
||||
describe('AiFeatureForm', () => {
|
||||
beforeEach(() => autoDevelop.mockReset());
|
||||
|
||||
it('READY_FOR_HUMAN_REVIEW 后审阅按钮打开正确 templateId', async () => {
|
||||
autoDevelop.mockResolvedValue({
|
||||
taskId: 't1',
|
||||
status: 'READY_FOR_HUMAN_REVIEW',
|
||||
development: { drafts: [{ artifactType: 'PAGE_SCHEMA', targetId: 'TPL-AI-9' }] },
|
||||
messages: ['ok'],
|
||||
});
|
||||
const openSpy = vi.spyOn(window, 'open').mockImplementation(() => null);
|
||||
describe('AiFeatureForm(amis form)', () => {
|
||||
it('非管理员:降级提示', () => {
|
||||
mockProfile = { userId: 'U1', account: 'user', name: 'u', roles: [] };
|
||||
renderForm();
|
||||
|
||||
fireEvent.change(screen.getByTestId('ai-objective'), { target: { value: '做个登记表' } });
|
||||
fireEvent.change(screen.getByTestId('ai-feature-name'), { target: { value: '登记' } });
|
||||
fireEvent.change(screen.getByTestId('ai-table-name'), { target: { value: 'OA_REG' } });
|
||||
fireEvent.change(screen.getByTestId('ai-entity-name'), { target: { value: '登记表' } });
|
||||
fireEvent.click(screen.getByTestId('ai-submit'));
|
||||
|
||||
const reviewBtn = await screen.findByTestId('ai-review');
|
||||
fireEvent.click(reviewBtn);
|
||||
expect(openSpy).toHaveBeenCalledWith('/editor.html?templateId=TPL-AI-9', '_blank');
|
||||
openSpy.mockRestore();
|
||||
expect(screen.getByText(/仅管理员可用/)).toBeInTheDocument();
|
||||
expect(screen.queryByTestId('ai-feature-form')).toBeNull();
|
||||
});
|
||||
|
||||
it('非 READY 状态展示 messages,不出审阅按钮', async () => {
|
||||
autoDevelop.mockResolvedValue({
|
||||
taskId: 't2',
|
||||
status: 'FAILED',
|
||||
messages: ['校验未通过:字段缺失'],
|
||||
});
|
||||
it('管理员:渲染容器 + 标题 + amis 挂载点', () => {
|
||||
mockProfile = { userId: 'ADMIN', account: 'admin', name: 'x', roles: [] };
|
||||
renderForm();
|
||||
fireEvent.change(screen.getByTestId('ai-objective'), { target: { value: 'x' } });
|
||||
fireEvent.change(screen.getByTestId('ai-feature-name'), { target: { value: 'x' } });
|
||||
fireEvent.change(screen.getByTestId('ai-table-name'), { target: { value: 'OA_X' } });
|
||||
fireEvent.change(screen.getByTestId('ai-entity-name'), { target: { value: 'x' } });
|
||||
fireEvent.click(screen.getByTestId('ai-submit'));
|
||||
await waitFor(() => expect(screen.getByText(/校验未通过/)).toBeInTheDocument());
|
||||
expect(screen.queryByTestId('ai-review')).not.toBeInTheDocument();
|
||||
expect(screen.getByTestId('ai-feature-form')).toBeInTheDocument();
|
||||
expect(screen.getByText('⚡ AI 建功能')).toBeInTheDocument();
|
||||
expect(screen.getByTestId('amis-mount')).toBeInTheDocument();
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1,181 +1,114 @@
|
||||
// AI ①面加速器入口页 —— 填需求,调外部 agent 起草,产物恒 READY_FOR_HUMAN_REVIEW,
|
||||
// 人点「审阅草稿」进 editor.html(edit-only,模板已由 auto-develop 写入 standard 层)。
|
||||
// AI ①面加速器入口 —— amis form 渲染(与全站一致)。填需求 → 外部 agent 起草,
|
||||
// 产物恒 READY_FOR_HUMAN_REVIEW,人点「审阅草稿」进 editor.html(edit-only)。
|
||||
// 红线:永不自动发布;平台进程内不内置生成 LLM。
|
||||
import { useState } from 'react';
|
||||
// 注意:/api/ai/features/auto-develop 直接返回 run 对象(status 为字符串,非 amis 的 {status:0}),
|
||||
// 故 api 用 adaptor 包成 {status:0,data:payload},再以 ARRAYFILTER 取 PAGE_SCHEMA 草稿 targetId。
|
||||
import { useMemo } from 'react';
|
||||
import { useNavigate } from 'react-router-dom';
|
||||
import { getProfile } from '../auth/token';
|
||||
import {
|
||||
autoDevelop,
|
||||
extractPageSchemaTemplateId,
|
||||
READY_STATUS,
|
||||
type AiAutoDevelopRun,
|
||||
type AiFeatureField,
|
||||
} from '../api/ai';
|
||||
import { toast } from '../components/ui/Toast';
|
||||
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 buildSchema(): Record<string, unknown> {
|
||||
// 进设计器用的 templateId = development.drafts 里 artifactType==PAGE_SCHEMA 的 targetId
|
||||
const reviewTpl = '${ARRAYFILTER(development.drafts, item.artifactType === "PAGE_SCHEMA")[0].targetId}';
|
||||
return {
|
||||
type: 'page',
|
||||
body: {
|
||||
type: 'form',
|
||||
title: '',
|
||||
mode: 'horizontal',
|
||||
actions: [{ type: 'submit', label: '开始 AI 起草', level: 'primary' }],
|
||||
// baseUrl=当前源(dev 经 vite 代理到后端);恒人审,故只产草稿
|
||||
api: {
|
||||
method: 'post',
|
||||
url: '/api/ai/features/auto-develop',
|
||||
data: {
|
||||
feature: {
|
||||
objective: '${objective}', featureName: '${featureName}', tableName: '${tableName}',
|
||||
entityName: '${entityName}', pageRecipe: '${pageRecipe}', fields: '${fields}',
|
||||
},
|
||||
baseUrl: window.location.origin,
|
||||
generateDeploymentPackage: true,
|
||||
},
|
||||
// auto-develop 返回裸 run 对象 → 包成 amis 信封,使 ${status}/${development}/${taskId} 进数据域
|
||||
adaptor: 'return { status: 0, msg: "", data: payload };',
|
||||
},
|
||||
messages: { saveSuccess: 'AI 起草完成,请看下方状态' },
|
||||
body: [
|
||||
{ type: 'textarea', name: 'objective', label: '需求目标', required: true, minRows: 2, placeholder: '如:新增客户等级维护功能' },
|
||||
{ type: 'input-text', name: 'featureName', label: '功能名', required: true, placeholder: '客户等级维护' },
|
||||
{
|
||||
type: 'input-text', name: 'tableName', label: '表名', required: true, placeholder: 'EIP4AI_CUSTOMER_LEVEL',
|
||||
validations: { matchRegexp: '/^[A-Z][A-Z0-9_]{2,40}$/' },
|
||||
validationErrors: { matchRegexp: '大写字母开头,3–41 位' },
|
||||
},
|
||||
{ type: 'input-text', name: 'entityName', label: '实体名', required: true, placeholder: '客户等级' },
|
||||
{
|
||||
type: 'radios', name: 'pageRecipe', label: '页面模板', value: 'maintenance-crud-v1',
|
||||
options: [
|
||||
{ label: '维护型 CRUD', value: 'maintenance-crud-v1' },
|
||||
{ label: '树形 CRUD', value: 'tree-crud-v1' },
|
||||
],
|
||||
},
|
||||
{
|
||||
type: 'combo', name: 'fields', label: '字段', multiple: true, addable: true, removable: true,
|
||||
addButtonText: '加字段', minLength: 1,
|
||||
items: [
|
||||
{ type: 'input-text', name: 'column', label: '列名', required: true, placeholder: 'NAME' },
|
||||
{ type: 'input-text', name: 'label', label: '显示名', placeholder: '名称' },
|
||||
{ type: 'select', name: 'type', label: '类型', value: 'string', options: TYPE_OPTIONS },
|
||||
{ type: 'switch', name: 'required', label: '必填' },
|
||||
],
|
||||
},
|
||||
{
|
||||
type: 'alert', level: 'info', visibleOn: '${status}',
|
||||
body: 'AI 起草状态:<b>${status}</b>(taskId=${taskId})。产物恒人审,平台不自动发布。',
|
||||
},
|
||||
{
|
||||
type: 'button', label: '审阅草稿(进设计器)', level: 'primary', className: 'mt-2',
|
||||
visibleOn: '${status === "READY_FOR_HUMAN_REVIEW"}',
|
||||
actionType: 'url', url: '/editor.html?templateId=' + reviewTpl, blank: true,
|
||||
},
|
||||
{
|
||||
type: 'alert', level: 'warning', visibleOn: '${status && status !== "READY_FOR_HUMAN_REVIEW"}',
|
||||
body: '未达人审就绪状态(${status})。运行信息:${JOIN(messages, ";")}',
|
||||
},
|
||||
],
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
export function AiFeatureForm() {
|
||||
const navigate = useNavigate();
|
||||
const profile = getProfile();
|
||||
const isAdmin = profile?.account === 'admin' || profile?.userId === 'ADMIN';
|
||||
|
||||
const [objective, setObjective] = useState('');
|
||||
const [featureName, setFeatureName] = useState('');
|
||||
const [tableName, setTableName] = useState('');
|
||||
const [entityName, setEntityName] = useState('');
|
||||
const [pageRecipe, setPageRecipe] = useState<'maintenance-crud-v1' | 'tree-crud-v1'>('maintenance-crud-v1');
|
||||
const [fields, setFields] = useState<AiFeatureField[]>([{ column: '', label: '', type: 'string' }]);
|
||||
|
||||
const [running, setRunning] = useState(false);
|
||||
const [run, setRun] = useState<AiAutoDevelopRun | null>(null);
|
||||
const schema = useMemo(buildSchema, []);
|
||||
|
||||
if (!isAdmin) {
|
||||
return <div style={{ padding: 24, color: 'var(--text-3)' }}>AI 建功能仅管理员可用。</div>;
|
||||
}
|
||||
|
||||
const reviewTemplateId = run && run.status === READY_STATUS ? extractPageSchemaTemplateId(run) : undefined;
|
||||
|
||||
function setField(i: number, patch: Partial<AiFeatureField>) {
|
||||
setFields((fs) => fs.map((f, idx) => (idx === i ? { ...f, ...patch } : f)));
|
||||
}
|
||||
function addField() {
|
||||
setFields((fs) => [...fs, { column: '', label: '', type: 'string' }]);
|
||||
}
|
||||
function removeField(i: number) {
|
||||
setFields((fs) => fs.filter((_, idx) => idx !== i));
|
||||
}
|
||||
|
||||
async function submit() {
|
||||
if (!objective.trim() || !featureName.trim() || !tableName.trim() || !entityName.trim()) {
|
||||
toast('请填写需求、功能名、表名、实体名', 'warn');
|
||||
return;
|
||||
}
|
||||
setRunning(true);
|
||||
setRun(null);
|
||||
try {
|
||||
const res = await autoDevelop({
|
||||
feature: {
|
||||
objective: objective.trim(),
|
||||
featureName: featureName.trim(),
|
||||
tableName: tableName.trim(),
|
||||
entityName: entityName.trim(),
|
||||
fields: fields.filter((f) => f.column.trim()),
|
||||
pageRecipe,
|
||||
},
|
||||
});
|
||||
setRun(res);
|
||||
if (res.status === READY_STATUS) {
|
||||
toast('草稿已就绪,请审阅后进设计器', 'ok');
|
||||
} else {
|
||||
toast(`未达人审就绪状态:${res.status}`, 'warn');
|
||||
}
|
||||
} catch (e) {
|
||||
toast((e as Error).message ?? 'AI 起草失败', 'err');
|
||||
} finally {
|
||||
setRunning(false);
|
||||
}
|
||||
}
|
||||
|
||||
function openReview() {
|
||||
if (!reviewTemplateId) return;
|
||||
window.open(`/editor.html?templateId=${encodeURIComponent(reviewTemplateId)}`, '_blank');
|
||||
}
|
||||
|
||||
return (
|
||||
<div style={{ height: '100%', overflow: 'auto', padding: 'var(--pad-lg)' }} data-testid="ai-feature-form">
|
||||
<div style={{ display: 'flex', alignItems: 'center', gap: 12, marginBottom: 16 }}>
|
||||
<div style={{ height: '100%', display: 'flex', flexDirection: 'column' }} data-testid="ai-feature-form">
|
||||
<div style={{ display: 'flex', alignItems: 'center', gap: 12, padding: 'var(--pad-lg)', paddingBottom: 4 }}>
|
||||
<button className="btn btn-sm" onClick={() => navigate('/design-center')}>← 返回设计中心</button>
|
||||
<h2 style={{ margin: 0, fontSize: 18, fontWeight: 600 }}>⚡ AI 建功能</h2>
|
||||
</div>
|
||||
<div className="sub-text" style={{ marginBottom: 16 }}>
|
||||
<div className="sub-text" style={{ padding: '0 var(--pad-lg)', marginBottom: 8 }}>
|
||||
外部 AI agent 起草,产物恒人审;点「审阅草稿」进设计器,平台不自动发布。
|
||||
</div>
|
||||
|
||||
<div className="card" style={{ padding: 16, maxWidth: 720 }}>
|
||||
<div style={{ display: 'flex', flexDirection: 'column', gap: 10 }}>
|
||||
<label>
|
||||
<div className="muted">需求目标 objective *</div>
|
||||
<textarea data-testid="ai-objective" rows={2} style={{ width: '100%' }}
|
||||
value={objective} onChange={(e) => setObjective(e.target.value)} />
|
||||
</label>
|
||||
<div style={{ display: 'flex', gap: 12, flexWrap: 'wrap' }}>
|
||||
<label>
|
||||
<div className="muted">功能名 featureName *</div>
|
||||
<input data-testid="ai-feature-name" value={featureName} onChange={(e) => setFeatureName(e.target.value)} />
|
||||
</label>
|
||||
<label>
|
||||
<div className="muted">表名 tableName *</div>
|
||||
<input data-testid="ai-table-name" value={tableName} onChange={(e) => setTableName(e.target.value)} />
|
||||
</label>
|
||||
<label>
|
||||
<div className="muted">实体名 entityName *</div>
|
||||
<input data-testid="ai-entity-name" value={entityName} onChange={(e) => setEntityName(e.target.value)} />
|
||||
</label>
|
||||
<label>
|
||||
<div className="muted">页面模板</div>
|
||||
<select data-testid="ai-recipe" value={pageRecipe}
|
||||
onChange={(e) => setPageRecipe(e.target.value as 'maintenance-crud-v1' | 'tree-crud-v1')}>
|
||||
<option value="maintenance-crud-v1">维护型 CRUD</option>
|
||||
<option value="tree-crud-v1">树型 CRUD</option>
|
||||
</select>
|
||||
</label>
|
||||
<div style={{ flex: 1, minHeight: 0, overflow: 'auto', padding: '0 var(--pad-lg) var(--pad-lg)' }}>
|
||||
<AmisRenderer schema={schema} />
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div className="muted" style={{ marginBottom: 6 }}>字段(column 留空的行忽略)</div>
|
||||
{fields.map((f, i) => (
|
||||
<div key={i} style={{ display: 'flex', gap: 6, marginBottom: 6 }}>
|
||||
<input placeholder="column" data-testid={`ai-field-col-${i}`}
|
||||
value={f.column} onChange={(e) => setField(i, { column: e.target.value })} />
|
||||
<input placeholder="label"
|
||||
value={f.label} onChange={(e) => setField(i, { label: e.target.value })} />
|
||||
<select value={f.type} onChange={(e) => setField(i, { type: e.target.value })}>
|
||||
<option value="string">string</option>
|
||||
<option value="integer">integer</option>
|
||||
<option value="number">number</option>
|
||||
<option value="date">date</option>
|
||||
<option value="datetime">datetime</option>
|
||||
<option value="boolean">boolean</option>
|
||||
</select>
|
||||
<label style={{ display: 'flex', alignItems: 'center', gap: 4 }}>
|
||||
<input type="checkbox" checked={!!f.required}
|
||||
onChange={(e) => setField(i, { required: e.target.checked })} /> 必填
|
||||
</label>
|
||||
<button className="btn btn-sm" onClick={() => removeField(i)}>删</button>
|
||||
</div>
|
||||
))}
|
||||
<button className="btn btn-sm" onClick={addField}>+ 加字段</button>
|
||||
</div>
|
||||
|
||||
<div style={{ marginTop: 8 }}>
|
||||
<button className="btn btn-primary" data-testid="ai-submit" disabled={running} onClick={submit}>
|
||||
{running ? 'AI 起草中…' : '开始 AI 起草'}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{run ? (
|
||||
<div className="card" style={{ padding: 16, maxWidth: 720, marginTop: 16 }}>
|
||||
<div style={{ marginBottom: 8 }}>
|
||||
状态:<b data-testid="ai-status">{run.status}</b>{' '}
|
||||
<span className="muted">taskId={run.taskId}</span>
|
||||
</div>
|
||||
{reviewTemplateId ? (
|
||||
<button className="btn btn-primary" data-testid="ai-review" onClick={openReview}>
|
||||
审阅草稿(进设计器)
|
||||
</button>
|
||||
) : (
|
||||
<div>
|
||||
<div className="sub-text" style={{ marginBottom: 6 }}>未生成可审阅的页面草稿,运行信息:</div>
|
||||
<ul>
|
||||
{(run.messages ?? ['(无消息)']).map((m, i) => (
|
||||
<li key={i} style={{ color: 'var(--text-3)' }}>{m}</li>
|
||||
))}
|
||||
</ul>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
) : null}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,37 +1,17 @@
|
||||
import '@testing-library/jest-dom';
|
||||
import { render, screen, waitFor, fireEvent } from '@testing-library/react';
|
||||
import { render, screen } from '@testing-library/react';
|
||||
import { MemoryRouter } from 'react-router-dom';
|
||||
import { vi, describe, it, expect, beforeEach } from 'vitest';
|
||||
import { vi, describe, it, expect } from 'vitest';
|
||||
|
||||
// NewFeatureShell 现以 amis wizard 渲染(<AmisRenderer>)。amis SDK(amisRequire) 是 index.html 注入的
|
||||
// 全局 UMD,jsdom 下不存在 → wizard 内部不在单测渲染;其端到端行为由 Playwright(e2e/five-ring.spec) 覆盖。
|
||||
// 单测仅守:① admin 守卫;② admin 下渲染壳容器 + 返回设计中心入口 + amis 挂载点。
|
||||
let mockProfile: { userId: string; account: string; name: string; roles: string[] } | null = null;
|
||||
vi.mock('../auth/token', () => ({ getProfile: () => mockProfile }));
|
||||
vi.mock('../components/AmisRenderer', () => ({ AmisRenderer: () => <div data-testid="amis-mount" /> }));
|
||||
|
||||
import { NewFeatureShell } from './NewFeatureShell';
|
||||
|
||||
vi.mock('../auth/token', () => ({
|
||||
getProfile: () => ({ userId: 'ADMIN', account: 'admin', name: 'x', roles: [] }),
|
||||
}));
|
||||
|
||||
const listEntities = vi.fn();
|
||||
const createEntity = vi.fn();
|
||||
vi.mock('../api/meta', () => ({
|
||||
listEntities: (...a: unknown[]) => listEntities(...a),
|
||||
createEntity: (...a: unknown[]) => createEntity(...a),
|
||||
}));
|
||||
|
||||
// listRecipes 在模块加载期被 NewFeatureShell 同步调用(const RECIPES = listRecipes()),
|
||||
// 故 mock 工厂直接返回静态数组(不能引用尚未初始化的外层 const,否则 hoist 期 ReferenceError)。
|
||||
const compileRecipe = vi.fn();
|
||||
vi.mock('../api/recipe', () => ({
|
||||
listRecipes: () => [
|
||||
{ id: 'maintenance-crud-v1', label: '维护型 CRUD' },
|
||||
{ id: 'tree-crud-v1', label: '树型 CRUD' },
|
||||
],
|
||||
compileRecipe: (...a: unknown[]) => compileRecipe(...a),
|
||||
}));
|
||||
|
||||
const publishFeature = vi.fn();
|
||||
vi.mock('../api/publish', () => ({ publishFeature: (...a: unknown[]) => publishFeature(...a) }));
|
||||
|
||||
const fetchMenu = vi.fn();
|
||||
vi.mock('../api/menu', () => ({ fetchMenu: (...a: unknown[]) => fetchMenu(...a), collectLeaves: vi.fn() }));
|
||||
|
||||
function renderShell() {
|
||||
return render(
|
||||
<MemoryRouter>
|
||||
@@ -40,103 +20,20 @@ function renderShell() {
|
||||
);
|
||||
}
|
||||
|
||||
describe('NewFeatureShell happy path', () => {
|
||||
beforeEach(() => {
|
||||
listEntities.mockReset().mockResolvedValue([
|
||||
{ entityId: 'E1', tablename: 'OA_DEMO', name: '演示表' },
|
||||
]);
|
||||
createEntity.mockReset();
|
||||
compileRecipe.mockReset().mockResolvedValue({ templateId: 'TPL-NEW-1', etag: 'e1' });
|
||||
publishFeature.mockReset().mockResolvedValue({ menuId: 'M9', flows: ['OA_DEMO_ADD'] });
|
||||
fetchMenu.mockReset().mockResolvedValue({ roots: [] });
|
||||
describe('NewFeatureShell(amis wizard 壳)', () => {
|
||||
it('非管理员:降级提示,不渲染壳', () => {
|
||||
mockProfile = { userId: 'U1', account: 'user', name: 'u', roles: [] };
|
||||
renderShell();
|
||||
expect(screen.getByText(/仅管理员可用/)).toBeInTheDocument();
|
||||
expect(screen.queryByTestId('new-feature-shell')).toBeNull();
|
||||
});
|
||||
|
||||
it('选实体→选 recipe→compile→进设计器按钮可用→发布', async () => {
|
||||
const openSpy = vi.spyOn(window, 'open').mockImplementation(() => null);
|
||||
it('管理员:渲染壳容器 + 返回设计中心 + amis 挂载点', () => {
|
||||
mockProfile = { userId: 'ADMIN', account: 'admin', name: 'x', roles: [] };
|
||||
renderShell();
|
||||
|
||||
// step entity:等实体列表加载,选中第一个
|
||||
await waitFor(() => expect(screen.getByTestId('nf-entity-OA_DEMO')).toBeInTheDocument());
|
||||
fireEvent.click(screen.getByTestId('nf-entity-OA_DEMO'));
|
||||
fireEvent.click(screen.getByTestId('nf-next-entity'));
|
||||
|
||||
// step recipe:默认选了第一个 recipe;填标题;compile
|
||||
await waitFor(() => expect(screen.getByTestId('nf-recipe-maintenance-crud-v1')).toBeInTheDocument());
|
||||
fireEvent.change(screen.getByTestId('nf-title'), { target: { value: '演示功能' } });
|
||||
fireEvent.click(screen.getByTestId('nf-compile'));
|
||||
|
||||
await waitFor(() => expect(compileRecipe).toHaveBeenCalledWith({
|
||||
tableName: 'OA_DEMO',
|
||||
recipe: 'maintenance-crud-v1',
|
||||
title: '演示功能',
|
||||
}));
|
||||
|
||||
// compile 成功 → 进设计器按钮出现且可用
|
||||
const designBtn = await screen.findByTestId('nf-open-designer');
|
||||
expect(designBtn).not.toBeDisabled();
|
||||
fireEvent.click(designBtn);
|
||||
expect(openSpy).toHaveBeenCalledWith('/editor.html?templateId=TPL-NEW-1', '_blank');
|
||||
|
||||
// 发布
|
||||
fireEvent.change(screen.getByTestId('nf-menu-name'), { target: { value: '演示功能' } });
|
||||
fireEvent.click(screen.getByTestId('nf-publish'));
|
||||
await waitFor(() => expect(publishFeature).toHaveBeenCalledWith(expect.objectContaining({
|
||||
entityId: 'E1',
|
||||
tableName: 'OA_DEMO',
|
||||
templateId: 'TPL-NEW-1',
|
||||
menuName: '演示功能',
|
||||
})));
|
||||
await waitFor(() => expect(fetchMenu).toHaveBeenCalled());
|
||||
|
||||
openSpy.mockRestore();
|
||||
});
|
||||
|
||||
it('compile 之前进设计器按钮不存在/禁用', async () => {
|
||||
renderShell();
|
||||
await waitFor(() => expect(screen.getByTestId('nf-entity-OA_DEMO')).toBeInTheDocument());
|
||||
fireEvent.click(screen.getByTestId('nf-entity-OA_DEMO'));
|
||||
fireEvent.click(screen.getByTestId('nf-next-entity'));
|
||||
await waitFor(() => expect(screen.getByTestId('nf-recipe-maintenance-crud-v1')).toBeInTheDocument());
|
||||
// 还没 compile:进设计器按钮要么不存在要么 disabled
|
||||
const btn = screen.queryByTestId('nf-open-designer');
|
||||
expect(btn === null || (btn as HTMLButtonElement).disabled).toBe(true);
|
||||
});
|
||||
});
|
||||
|
||||
describe('NewFeatureShell §B.9-4 新建实体可达(含引用列)', () => {
|
||||
beforeEach(() => {
|
||||
listEntities.mockReset().mockResolvedValue([
|
||||
{ entityId: 'E1', tablename: 'OA_DEMO', name: '演示表' },
|
||||
]);
|
||||
createEntity.mockReset().mockResolvedValue({
|
||||
entityId: 'E-NEW',
|
||||
tablename: 'OA_FRESH',
|
||||
attributeCount: 1,
|
||||
indexCount: 0,
|
||||
listApi: '/api/entity/OA_FRESH/list',
|
||||
});
|
||||
compileRecipe.mockReset();
|
||||
publishFeature.mockReset();
|
||||
fetchMenu.mockReset();
|
||||
});
|
||||
|
||||
it('实体步有 [+ 新建实体] 按钮,建成后用返回的 entity 进入 recipe 步', async () => {
|
||||
renderShell();
|
||||
await waitFor(() => expect(screen.getByTestId('nf-new-entity')).toBeInTheDocument());
|
||||
|
||||
fireEvent.click(screen.getByTestId('nf-new-entity'));
|
||||
// Dialog 打开:复用 ModelerFields/ReferencePicker(建模器表单 → field-add 证明复用)
|
||||
await waitFor(() => expect(screen.getByTestId('nf-create-tablename')).toBeInTheDocument());
|
||||
expect(screen.getByTestId('field-add')).toBeInTheDocument();
|
||||
|
||||
fireEvent.change(screen.getByTestId('nf-create-tablename'), { target: { value: 'OA_FRESH' } });
|
||||
fireEvent.click(screen.getByTestId('nf-create-submit'));
|
||||
|
||||
await waitFor(() => expect(createEntity).toHaveBeenCalledWith(
|
||||
expect.objectContaining({ tablename: 'OA_FRESH' }),
|
||||
));
|
||||
// 建成回填 selectedEntity 并进入 recipe 步
|
||||
await waitFor(() => expect(screen.getByTestId('nf-recipe-maintenance-crud-v1')).toBeInTheDocument());
|
||||
expect(screen.getAllByText(/OA_FRESH/).length).toBeGreaterThan(0);
|
||||
expect(screen.getByTestId('new-feature-shell')).toBeInTheDocument();
|
||||
expect(screen.getByText('新建功能 · 人走五环')).toBeInTheDocument();
|
||||
expect(screen.getByText('← 返回设计中心')).toBeInTheDocument();
|
||||
expect(screen.getByTestId('amis-mount')).toBeInTheDocument();
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1,361 +1,163 @@
|
||||
// 人走五环 · 编排壳 —— 从零搭建一个新功能页。
|
||||
// 步骤:① 选/建实体(元数据+表)→ ② 选 recipe + 填页面参数 → compileRecipe 写 standard 层拿 templateId
|
||||
// → ③ 可选「进设计器微调」(editor.html 是 edit-only,模板已存在才允许) → ④ 发布(menu+5默认流)。
|
||||
// 红线:发布恒人审;standard 写入恒走后端 PageSchemaWriter.upsertStandard(前端只调 compileRecipe)。
|
||||
// §B.9-4:实体步内置 [+ 新建实体] Dialog,复用 ModelerFields(FieldTable)/ReferencePicker,
|
||||
// 使「建含引用列的新实体」在编排流里可达;建成用返回 {entityId,tablename} 回填进入下一步。
|
||||
import { useEffect, useState } from 'react';
|
||||
// 人走五环 · 编排壳 —— 用 amis wizard 渲染(与全站业务页同一套 amis 渲染层,告别手搓原生表单)。
|
||||
// 三步全在 amis 内:① 建实体(post /api/meta/entity) → ② 生成页(post /api/design/recipe/compile)
|
||||
// → ③ 发布(post /api/design/publish)。amis wizard 把每步 api 的响应数据并入数据域,
|
||||
// 故 entityId(步①返)、templateId(步②返) 在后续步骤经 ${} 直接可用,无需 React 中转。
|
||||
// 红线:发布恒人审;standard 写入恒走后端 PageSchemaWriter(前端只调 /api/design/recipe/compile)。
|
||||
// §B.9-4:步① 的「字段」用 combo 多行,含引用列(type=引用 → 选 referenceTable,源 /api/meta/entities)。
|
||||
import { useMemo } from 'react';
|
||||
import { useNavigate } from 'react-router-dom';
|
||||
import { getProfile } from '../auth/token';
|
||||
import { listEntities, createEntity, type EntityAttr } from '../api/meta';
|
||||
import { listRecipes, compileRecipe } from '../api/recipe';
|
||||
import { publishFeature } from '../api/publish';
|
||||
import { fetchMenu } from '../api/menu';
|
||||
import { toast } from '../components/ui/Toast';
|
||||
import { Dialog } from '../components/ui/Dialog';
|
||||
import { FieldTable, buildAttribute, type FieldRow } from './ModelerFields';
|
||||
import { validateTableName } from './ModelerPage';
|
||||
import { AmisRenderer } from '../components/AmisRenderer';
|
||||
|
||||
interface EntityRow {
|
||||
entityId: string;
|
||||
tablename: string;
|
||||
name: string;
|
||||
const TYPE_OPTIONS = [
|
||||
{ label: '文本', value: 'string' },
|
||||
{ label: '整数', value: 'integer' },
|
||||
{ label: '小数', value: 'number' },
|
||||
{ label: '日期', value: 'date' },
|
||||
{ label: '日期时间', value: 'datetime' },
|
||||
{ label: '布尔', value: 'boolean' },
|
||||
{ label: '引用(外键)', value: 'reference' },
|
||||
];
|
||||
|
||||
const RECIPE_OPTIONS = [
|
||||
{ label: '维护型 CRUD(列表 + 增删改)', value: 'maintenance-crud-v1' },
|
||||
{ label: '树形 CRUD(自引用层级)', value: 'tree-crud-v1' },
|
||||
];
|
||||
|
||||
/** 人走五环建新功能向导 amis schema。 */
|
||||
function buildWizardSchema(): Record<string, unknown> {
|
||||
return {
|
||||
type: 'page',
|
||||
className: 'h-full',
|
||||
body: {
|
||||
type: 'wizard',
|
||||
mode: 'horizontal',
|
||||
actionPrevLabel: '上一步',
|
||||
actionNextLabel: '下一步',
|
||||
actionNextSaveLabel: '保存并下一步',
|
||||
actionFinishLabel: '完成',
|
||||
renderStepIndicator: true,
|
||||
steps: [
|
||||
{
|
||||
title: '① 建实体',
|
||||
subTitle: '元数据 + 物理表',
|
||||
hint: '标准列(主键/审计/版本)由后端自动补齐,无需在此添加。',
|
||||
api: { method: 'post', url: '/api/meta/entity' },
|
||||
body: [
|
||||
{
|
||||
type: 'input-text',
|
||||
name: 'tablename',
|
||||
label: '表名',
|
||||
required: true,
|
||||
placeholder: 'OA_DEMO',
|
||||
description: '大写字母开头,仅大写字母/数字/下划线,3–41 位',
|
||||
validations: { matchRegexp: '/^[A-Z][A-Z0-9_]{2,40}$/' },
|
||||
validationErrors: { matchRegexp: '表名格式不合法(大写字母开头,3–41 位)' },
|
||||
},
|
||||
{ type: 'input-text', name: 'name', label: '显示名', placeholder: '演示维护(可选)' },
|
||||
{
|
||||
type: 'combo',
|
||||
name: 'attributes',
|
||||
label: '字段',
|
||||
multiple: true,
|
||||
addable: true,
|
||||
removable: true,
|
||||
addButtonText: '加字段',
|
||||
minLength: 1,
|
||||
items: [
|
||||
{
|
||||
type: 'input-text', name: 'column', label: '列名', required: true,
|
||||
placeholder: 'TITLE', columnClassName: 'w-sm',
|
||||
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, columnClassName: 'w-xs' },
|
||||
{
|
||||
type: 'select', name: 'referenceTable', label: '引用目标实体',
|
||||
source: 'get:/api/meta/entities', labelField: 'tablename', valueField: 'tablename',
|
||||
searchable: true, visibleOn: '${type === "reference"}',
|
||||
description: '渲染时显该实体的显示列而非裸 id',
|
||||
},
|
||||
{ type: 'switch', name: 'mandatory', label: '必填', value: false },
|
||||
],
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
title: '② 生成页面',
|
||||
subTitle: '选 recipe → 落标准层',
|
||||
api: {
|
||||
method: 'post', url: '/api/design/recipe/compile',
|
||||
data: {
|
||||
tableName: '${tablename}', recipe: '${recipe}', title: '${title}',
|
||||
displayField: '${displayField}', pageSize: '${pageSize}',
|
||||
},
|
||||
},
|
||||
body: [
|
||||
{ type: 'static', name: 'tablename', label: '实体表' },
|
||||
{
|
||||
type: 'radios', name: 'recipe', label: '页面模板 recipe',
|
||||
value: 'maintenance-crud-v1', options: RECIPE_OPTIONS,
|
||||
},
|
||||
{ type: 'input-text', name: 'title', label: '页面标题', required: true, placeholder: '如:客户等级维护' },
|
||||
{ type: 'input-text', name: 'displayField', label: '显示字段', placeholder: '可选,默认取实体显示列' },
|
||||
{ type: 'input-number', name: 'pageSize', label: '每页条数', placeholder: '可选,默认 20', min: 1, max: 200 },
|
||||
],
|
||||
},
|
||||
{
|
||||
title: '③ 发布',
|
||||
subTitle: '五流 + 菜单 + 部署包',
|
||||
api: {
|
||||
method: 'post', url: '/api/design/publish',
|
||||
data: {
|
||||
entityId: '${entityId}', tableName: '${tablename}', templateId: '${templateId}',
|
||||
menuName: '${menuName}', generateDeploymentPackage: true,
|
||||
},
|
||||
},
|
||||
body: [
|
||||
{ type: 'static', name: 'templateId', label: '已生成模板' },
|
||||
{ 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 条默认服务流 + 注册菜单(当前环境立即可用),并生成生产部署包供人审上线(发布恒人审)。',
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
onEvent: {
|
||||
finished: {
|
||||
actions: [{ actionType: 'toast', args: { msgType: 'success', msg: '已发布:菜单已注册,可在左侧菜单查看新功能。' } }],
|
||||
},
|
||||
},
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
type Step = 'entity' | 'recipe';
|
||||
|
||||
const RECIPES = listRecipes(); // 静态清单(maintenance-crud-v1 / tree-crud-v1)
|
||||
|
||||
export function NewFeatureShell() {
|
||||
const navigate = useNavigate();
|
||||
const profile = getProfile();
|
||||
const isAdmin = profile?.account === 'admin' || profile?.userId === 'ADMIN';
|
||||
|
||||
const [step, setStep] = useState<Step>('entity');
|
||||
const [entities, setEntities] = useState<EntityRow[]>([]);
|
||||
const [loadErr, setLoadErr] = useState('');
|
||||
const [selectedEntity, setSelectedEntity] = useState<EntityRow | null>(null);
|
||||
|
||||
const [recipe, setRecipe] = useState<string>(RECIPES[0]?.id ?? 'maintenance-crud-v1');
|
||||
const [title, setTitle] = useState('');
|
||||
const [displayField, setDisplayField] = useState('');
|
||||
const [pageSize, setPageSize] = useState<number | ''>('');
|
||||
|
||||
const [templateId, setTemplateId] = useState('');
|
||||
const [compiling, setCompiling] = useState(false);
|
||||
const [menuName, setMenuName] = useState('');
|
||||
const [publishing, setPublishing] = useState(false);
|
||||
|
||||
// §B.9-4 新建实体 Dialog 态
|
||||
const [createOpen, setCreateOpen] = useState(false);
|
||||
const [newTable, setNewTable] = useState('');
|
||||
const [newName, setNewName] = useState('');
|
||||
const [newRows, setNewRows] = useState<FieldRow[]>([]);
|
||||
const [creating, setCreating] = useState(false);
|
||||
const [createErr, setCreateErr] = useState('');
|
||||
|
||||
useEffect(() => {
|
||||
if (!isAdmin) return;
|
||||
let alive = true;
|
||||
listEntities()
|
||||
.then((rows) => alive && setEntities(rows))
|
||||
.catch((e: Error) => alive && setLoadErr(e.message ?? '实体加载失败'));
|
||||
return () => {
|
||||
alive = false;
|
||||
};
|
||||
}, [isAdmin]);
|
||||
const schema = useMemo(buildWizardSchema, []);
|
||||
|
||||
if (!isAdmin) {
|
||||
return <div style={{ padding: 24, color: 'var(--text-3)' }}>新建功能仅管理员可用。</div>;
|
||||
}
|
||||
|
||||
const newTableValid = validateTableName(newTable);
|
||||
const newRowsValid = newRows.every((r) => r.type !== '引用' || !!r.referenceTable);
|
||||
const canCreate = newTableValid && newRowsValid && !creating;
|
||||
|
||||
function openCreate() {
|
||||
setNewTable('');
|
||||
setNewName('');
|
||||
setNewRows([]);
|
||||
setCreateErr('');
|
||||
setCreateOpen(true);
|
||||
}
|
||||
|
||||
async function doCreateEntity() {
|
||||
setCreating(true);
|
||||
setCreateErr('');
|
||||
try {
|
||||
const attributes: EntityAttr[] = newRows.map(buildAttribute);
|
||||
const res = await createEntity({ tablename: newTable, name: newName || undefined, attributes });
|
||||
// 用返回的 {entityId,tablename} 回填,并进入 recipe 步
|
||||
const created: EntityRow = { entityId: res.entityId, tablename: res.tablename, name: newName || res.tablename };
|
||||
setCreateOpen(false);
|
||||
setSelectedEntity(created);
|
||||
setStep('recipe');
|
||||
// 刷新实体清单(后台异步,失败不阻塞)
|
||||
listEntities()
|
||||
.then((rows) => setEntities(rows))
|
||||
.catch(() => undefined);
|
||||
toast(`已新建实体 ${res.tablename}`, 'ok');
|
||||
} catch (e) {
|
||||
setCreateErr((e as Error).message ?? '建表失败');
|
||||
} finally {
|
||||
setCreating(false);
|
||||
}
|
||||
}
|
||||
|
||||
async function doCompile() {
|
||||
if (!selectedEntity || !title.trim()) {
|
||||
toast('请先选实体并填写页面标题', 'warn');
|
||||
return;
|
||||
}
|
||||
setCompiling(true);
|
||||
try {
|
||||
const body: { tableName: string; recipe: string; title: string; displayField?: string; pageSize?: number } = {
|
||||
tableName: selectedEntity.tablename,
|
||||
recipe,
|
||||
title: title.trim(),
|
||||
};
|
||||
if (displayField.trim()) body.displayField = displayField.trim();
|
||||
if (pageSize !== '') body.pageSize = Number(pageSize);
|
||||
const res = await compileRecipe(body as Parameters<typeof compileRecipe>[0]);
|
||||
setTemplateId(res.templateId);
|
||||
if (!menuName.trim()) setMenuName(title.trim());
|
||||
toast('已生成页面,可进设计器微调或直接发布', 'ok');
|
||||
} catch (e) {
|
||||
toast((e as Error).message ?? '生成失败', 'err');
|
||||
} finally {
|
||||
setCompiling(false);
|
||||
}
|
||||
}
|
||||
|
||||
function openDesigner() {
|
||||
if (!templateId) return;
|
||||
window.open(`/editor.html?templateId=${encodeURIComponent(templateId)}`, '_blank');
|
||||
}
|
||||
|
||||
async function doPublish() {
|
||||
if (!selectedEntity || !templateId || !menuName.trim()) {
|
||||
toast('发布需先生成页面并填写菜单名', 'warn');
|
||||
return;
|
||||
}
|
||||
setPublishing(true);
|
||||
try {
|
||||
const res = await publishFeature({
|
||||
entityId: selectedEntity.entityId,
|
||||
tableName: selectedEntity.tablename,
|
||||
templateId,
|
||||
menuName: menuName.trim(),
|
||||
generateDeploymentPackage: true,
|
||||
});
|
||||
await fetchMenu(); // 刷新左侧菜单缓存(新节点)
|
||||
toast(`已发布:菜单 ${res.menuId},默认流 ${res.flows.join('、')}`, 'ok');
|
||||
} catch (e) {
|
||||
toast((e as Error).message ?? '发布失败', 'err');
|
||||
} finally {
|
||||
setPublishing(false);
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<div style={{ height: '100%', overflow: 'auto', padding: 'var(--pad-lg)' }} data-testid="new-feature-shell">
|
||||
<div style={{ display: 'flex', alignItems: 'center', gap: 12, marginBottom: 16 }}>
|
||||
<button className="btn btn-sm" onClick={() => navigate('/design-center')}>
|
||||
← 返回设计中心
|
||||
</button>
|
||||
<div style={{ height: '100%', display: 'flex', flexDirection: 'column' }} data-testid="new-feature-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 }}>新建功能 · 人走五环</h2>
|
||||
</div>
|
||||
|
||||
{/* 步骤指示 */}
|
||||
<div className="sub-text" style={{ marginBottom: 16 }}>
|
||||
{step === 'entity' ? '步骤 1 / 2 :选择或新建实体(元数据+表)' : '步骤 2 / 2 :选 recipe、生成页面、发布'}
|
||||
<div style={{ flex: 1, minHeight: 0, overflow: 'auto', padding: '0 var(--pad-lg) var(--pad-lg)' }}>
|
||||
<AmisRenderer schema={schema} />
|
||||
</div>
|
||||
|
||||
{loadErr ? <div style={{ padding: 12, color: 'var(--err)' }}>实体加载失败:{loadErr}</div> : null}
|
||||
|
||||
{step === 'entity' ? (
|
||||
<div className="card" style={{ padding: 16 }}>
|
||||
<div style={{ display: 'flex', alignItems: 'center', marginBottom: 10 }}>
|
||||
<div style={{ flex: 1, fontWeight: 600 }}>选择已有实体</div>
|
||||
<button className="btn btn-sm" data-testid="nf-new-entity" onClick={openCreate}>
|
||||
+ 新建实体
|
||||
</button>
|
||||
</div>
|
||||
<table style={{ width: '100%', borderCollapse: 'collapse' }}>
|
||||
<thead>
|
||||
<tr style={{ textAlign: 'left', color: 'var(--text-3)' }}>
|
||||
<th style={{ padding: '6px 8px' }}>名称</th>
|
||||
<th style={{ padding: '6px 8px' }}>表名</th>
|
||||
<th style={{ padding: '6px 8px', width: 80 }} />
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{entities.map((en) => (
|
||||
<tr
|
||||
key={en.entityId}
|
||||
style={{
|
||||
borderTop: '1px solid var(--line)',
|
||||
background: selectedEntity?.entityId === en.entityId ? 'var(--hover)' : undefined,
|
||||
}}
|
||||
>
|
||||
<td style={{ padding: '6px 8px' }}>{en.name}</td>
|
||||
<td style={{ padding: '6px 8px' }} className="muted">{en.tablename}</td>
|
||||
<td style={{ padding: '6px 8px' }}>
|
||||
<button
|
||||
className="btn btn-sm"
|
||||
data-testid={`nf-entity-${en.tablename}`}
|
||||
onClick={() => setSelectedEntity(en)}
|
||||
>
|
||||
{selectedEntity?.entityId === en.entityId ? '已选' : '选择'}
|
||||
</button>
|
||||
</td>
|
||||
</tr>
|
||||
))}
|
||||
</tbody>
|
||||
</table>
|
||||
<div style={{ marginTop: 16, display: 'flex', gap: 8 }}>
|
||||
<button
|
||||
className="btn"
|
||||
data-testid="nf-next-entity"
|
||||
disabled={!selectedEntity}
|
||||
onClick={() => setStep('recipe')}
|
||||
>
|
||||
下一步:选 recipe
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
) : (
|
||||
<div className="card" style={{ padding: 16 }}>
|
||||
<div style={{ marginBottom: 10 }}>
|
||||
实体:<b>{selectedEntity?.name}</b>{' '}
|
||||
<span className="muted">({selectedEntity?.tablename})</span>{' '}
|
||||
<span className="link" onClick={() => setStep('entity')}>更换</span>
|
||||
</div>
|
||||
|
||||
<div style={{ marginBottom: 12 }}>
|
||||
<div style={{ marginBottom: 6, fontWeight: 600 }}>页面模板 recipe</div>
|
||||
{RECIPES.map((r) => (
|
||||
<label key={r.id} style={{ marginRight: 16, cursor: 'pointer' }} data-testid={`nf-recipe-${r.id}`}>
|
||||
<input
|
||||
type="radio"
|
||||
name="recipe"
|
||||
checked={recipe === r.id}
|
||||
onChange={() => setRecipe(r.id)}
|
||||
/>{' '}
|
||||
{r.label}
|
||||
</label>
|
||||
))}
|
||||
</div>
|
||||
|
||||
<div style={{ display: 'flex', flexWrap: 'wrap', gap: 12, marginBottom: 12 }}>
|
||||
<label>
|
||||
<div className="muted">页面标题 *</div>
|
||||
<input data-testid="nf-title" value={title} onChange={(e) => setTitle(e.target.value)} />
|
||||
</label>
|
||||
<label>
|
||||
<div className="muted">显示字段(可选)</div>
|
||||
<input
|
||||
data-testid="nf-display-field"
|
||||
value={displayField}
|
||||
onChange={(e) => setDisplayField(e.target.value)}
|
||||
/>
|
||||
</label>
|
||||
<label>
|
||||
<div className="muted">页大小(可选)</div>
|
||||
<input
|
||||
data-testid="nf-page-size"
|
||||
type="number"
|
||||
value={pageSize}
|
||||
onChange={(e) => setPageSize(e.target.value === '' ? '' : Number(e.target.value))}
|
||||
/>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div style={{ display: 'flex', gap: 8, marginBottom: 16 }}>
|
||||
<button className="btn" data-testid="nf-compile" disabled={compiling || !title.trim()} onClick={doCompile}>
|
||||
{compiling ? '生成中…' : templateId ? '重新生成页面' : '生成页面'}
|
||||
</button>
|
||||
<button
|
||||
className="btn"
|
||||
data-testid="nf-open-designer"
|
||||
disabled={!templateId}
|
||||
onClick={openDesigner}
|
||||
title={templateId ? '在新标签页打开设计器微调' : '先生成页面才能进设计器'}
|
||||
>
|
||||
进设计器微调
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{templateId ? (
|
||||
<div className="card" style={{ padding: 12, background: 'var(--surface-2)' }}>
|
||||
<div style={{ marginBottom: 8 }}>
|
||||
已生成模板:<code data-testid="nf-template-id">{templateId}</code>
|
||||
</div>
|
||||
<div style={{ display: 'flex', alignItems: 'flex-end', gap: 8 }}>
|
||||
<label>
|
||||
<div className="muted">菜单名 *</div>
|
||||
<input data-testid="nf-menu-name" value={menuName} onChange={(e) => setMenuName(e.target.value)} />
|
||||
</label>
|
||||
<button
|
||||
className="btn btn-primary"
|
||||
data-testid="nf-publish"
|
||||
disabled={publishing || !menuName.trim()}
|
||||
onClick={doPublish}
|
||||
>
|
||||
{publishing ? '发布中…' : '发布'}
|
||||
</button>
|
||||
</div>
|
||||
<div className="sub-text" style={{ marginTop: 8 }}>
|
||||
发布 = 写标准页 + 触发 5 条默认流 + 注册菜单(当前后端立即可用);并生成生产部署包供人审上线。
|
||||
</div>
|
||||
</div>
|
||||
) : null}
|
||||
</div>
|
||||
)}
|
||||
|
||||
{createOpen ? (
|
||||
<Dialog
|
||||
title="新建实体(含引用列)"
|
||||
width={720}
|
||||
onClose={() => setCreateOpen(false)}
|
||||
foot={
|
||||
<>
|
||||
<button className="btn" onClick={() => setCreateOpen(false)}>取消</button>
|
||||
<button
|
||||
className="btn btn-primary"
|
||||
data-testid="nf-create-submit"
|
||||
disabled={!canCreate}
|
||||
onClick={doCreateEntity}
|
||||
>
|
||||
{creating ? '建表中…' : '建表并使用'}
|
||||
</button>
|
||||
</>
|
||||
}
|
||||
>
|
||||
<div style={{ display: 'grid', gap: 12 }}>
|
||||
<label style={{ display: 'grid', gap: 4 }}>
|
||||
<span className="sub-text">表名(大写字母开头,仅大写字母/数字/下划线,3–41 位)</span>
|
||||
<input
|
||||
data-testid="nf-create-tablename"
|
||||
value={newTable}
|
||||
onChange={(ev) => setNewTable(ev.target.value.toUpperCase())}
|
||||
placeholder="OA_DEMO"
|
||||
/>
|
||||
{newTable && !newTableValid ? (
|
||||
<span style={{ color: 'var(--err)', fontSize: 11 }}>表名格式不合法</span>
|
||||
) : null}
|
||||
</label>
|
||||
<label style={{ display: 'grid', gap: 4 }}>
|
||||
<span className="sub-text">显示名(可选)</span>
|
||||
<input value={newName} onChange={(ev) => setNewName(ev.target.value)} placeholder="演示维护" />
|
||||
</label>
|
||||
|
||||
<FieldTable rows={newRows} onChange={setNewRows} />
|
||||
|
||||
{createErr ? <div style={{ color: 'var(--err)', fontSize: 12 }}>{createErr}</div> : null}
|
||||
</div>
|
||||
</Dialog>
|
||||
) : null}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user