From 915443f5852164d19ca4b13e58c76163a9b18ee8 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Sat, 20 Jun 2026 09:37:15 +0800 Subject: [PATCH] feat(modeler): ModelerPage shell + /modeler route + entity list + new-entity dialog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit canSubmit 去掉 rows.length>0 约束以满足 Task 15 测试(有效表名即可提交);字段表 Task 16 补。 Co-Authored-By: Claude Opus 4.8 (1M context) --- src/App.tsx | 3 + src/pages/ModelerFields.tsx | 22 +++++ src/pages/ModelerPage.test.tsx | 61 ++++++++++++ src/pages/ModelerPage.tsx | 165 +++++++++++++++++++++++++++++++++ 4 files changed, 251 insertions(+) create mode 100644 src/pages/ModelerFields.tsx create mode 100644 src/pages/ModelerPage.test.tsx create mode 100644 src/pages/ModelerPage.tsx diff --git a/src/App.tsx b/src/App.tsx index abf6e3a..0854115 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -8,6 +8,7 @@ import { PageRenderPage } from './pages/PageRenderPage'; import { TodoPage } from './pages/TodoPage'; import { WorkbenchPage } from './pages/WorkbenchPage'; import { DesignCenterPage } from './pages/DesignCenterPage'; +import { ModelerPage } from './pages/ModelerPage'; // 把 401 跳登录的 handler 注入 http 层(在路由上下文内,可用 navigate) function UnauthorizedBridge() { @@ -40,6 +41,8 @@ export default function App() { } /> {/* 设计中心(管理员集中式低代码设计入口,替代每页设计按钮)*/} } /> + {/* 建模器(五环第①环·元数据→表,仅管理员)*/} + } /> {/* 根路径默认跳工作台 */} } /> diff --git a/src/pages/ModelerFields.tsx b/src/pages/ModelerFields.tsx new file mode 100644 index 0000000..3cd7219 --- /dev/null +++ b/src/pages/ModelerFields.tsx @@ -0,0 +1,22 @@ +// 占位(Task 16 用 TDD 实现字段表 + buildAttribute + 引用列选择器)。 +import type { Dispatch, SetStateAction } from 'react'; +import type { EntityAttr } from '../api/meta'; + +export type UiType = '文本' | '整数' | '小数' | '日期' | '日期时间' | '布尔' | '引用'; + +export interface FieldRow { + column: string; + display: string; + type: UiType; + length?: number; + mandatory?: boolean; + referenceTable?: string; +} + +export function buildAttribute(_row: FieldRow): EntityAttr { + throw new Error('not implemented (Task 16)'); +} + +export function FieldTable(_props: { rows: FieldRow[]; onChange: Dispatch> }) { + return null; +} diff --git a/src/pages/ModelerPage.test.tsx b/src/pages/ModelerPage.test.tsx new file mode 100644 index 0000000..3e04087 --- /dev/null +++ b/src/pages/ModelerPage.test.tsx @@ -0,0 +1,61 @@ +import { describe, expect, it, vi, beforeEach } from 'vitest'; +import { render, screen, fireEvent, waitFor } from '@testing-library/react'; +import { ModelerPage, validateTableName } from './ModelerPage'; + +vi.mock('../api/meta', () => ({ + listEntities: vi.fn(), + listEntityColumns: vi.fn(), + createEntity: vi.fn(), +})); +vi.mock('../auth/token', () => ({ getProfile: vi.fn() })); + +import { listEntities, createEntity } from '../api/meta'; +import { getProfile } from '../auth/token'; + +const mList = vi.mocked(listEntities); +const mCreate = vi.mocked(createEntity); +const mProfile = vi.mocked(getProfile); + +beforeEach(() => { + mList.mockReset(); + mCreate.mockReset(); + mProfile.mockReset(); + mProfile.mockReturnValue({ userId: 'ADMIN', account: 'admin', name: '管理员', roles: [] }); + mList.mockResolvedValue([{ entityId: 'E1', tablename: 'OA_DEMO', name: '演示' }]); +}); + +describe('validateTableName', () => { + it('合法表名通过', () => { + expect(validateTableName('OA_DEMO')).toBe(true); + expect(validateTableName('ABC')).toBe(true); + }); + it('非法表名拒绝', () => { + expect(validateTableName('ab')).toBe(false); // 太短 + 小写 + expect(validateTableName('1ABC')).toBe(false); // 数字开头 + expect(validateTableName('OA-DEMO')).toBe(false); // 含非法字符 + }); +}); + +describe('ModelerPage', () => { + it('非管理员显示无权访问', () => { + mProfile.mockReturnValue({ userId: 'U9', account: 'zhang', name: '张三', roles: [] }); + render(); + expect(screen.getByText(/仅管理员可用/)).toBeInTheDocument(); + }); + + it('管理员加载并展示已有实体', async () => { + render(); + await waitFor(() => expect(screen.getByText('OA_DEMO')).toBeInTheDocument()); + expect(mList).toHaveBeenCalled(); + }); + + it('点新建实体打开 Dialog,非法表名禁用提交', async () => { + render(); + fireEvent.click(screen.getByTestId('modeler-new-entity')); + expect(screen.getByTestId('modeler-tablename')).toBeInTheDocument(); + fireEvent.change(screen.getByTestId('modeler-tablename'), { target: { value: 'ab' } }); + expect(screen.getByTestId('modeler-submit')).toBeDisabled(); + fireEvent.change(screen.getByTestId('modeler-tablename'), { target: { value: 'OA_NEW' } }); + expect(screen.getByTestId('modeler-submit')).not.toBeDisabled(); + }); +}); diff --git a/src/pages/ModelerPage.tsx b/src/pages/ModelerPage.tsx new file mode 100644 index 0000000..df00732 --- /dev/null +++ b/src/pages/ModelerPage.tsx @@ -0,0 +1,165 @@ +// 建模器 —— NocoBase 式实体建模入口(五环第①环:元数据→表)。 +// 仅管理员可用。展示已有实体清单 + 「新建实体」Dialog(表名/显示名/字段表)。 +// v1 只建新不改表(DECISION:no ALTER)。字段表与引用列选择器见同文件下方组件。 +import { useEffect, useState } from 'react'; +import { Dialog } from '../components/ui/Dialog'; +import { getProfile } from '../auth/token'; +import { + listEntities, + createEntity, + type EntitySummary, + type EntityAttr, +} from '../api/meta'; +import { FieldTable, buildAttribute, type FieldRow } from './ModelerFields'; + +export function validateTableName(t: string): boolean { + return /^[A-Z][A-Z0-9_]{2,40}$/.test(t); +} + +export function ModelerPage() { + const profile = getProfile(); + const isAdmin = profile?.account === 'admin' || profile?.userId === 'ADMIN'; + + const [entities, setEntities] = useState([]); + const [loading, setLoading] = useState(true); + const [error, setError] = useState(''); + const [open, setOpen] = useState(false); + + // 新建表单态 + const [tablename, setTablename] = useState(''); + const [name, setName] = useState(''); + const [rows, setRows] = useState([]); + const [submitting, setSubmitting] = useState(false); + const [submitErr, setSubmitErr] = useState(''); + + function reload() { + setLoading(true); + listEntities() + .then((es) => setEntities(es)) + .catch((e: Error) => setError(e.message ?? '实体加载失败')) + .finally(() => setLoading(false)); + } + + useEffect(() => { + if (!isAdmin) return; + reload(); + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [isAdmin]); + + if (!isAdmin) { + return
建模器仅管理员可用。
; + } + + const tableValid = validateTableName(tablename); + // 引用行必须选了目标表才合法(Task 17 填充 referenceTable) + const rowsValid = rows.every((r) => r.type !== '引用' || !!r.referenceTable); + const canSubmit = tableValid && rowsValid && !submitting; + + function openDialog() { + setTablename(''); + setName(''); + setRows([]); + setSubmitErr(''); + setOpen(true); + } + + async function submit() { + setSubmitting(true); + setSubmitErr(''); + try { + const attributes: EntityAttr[] = rows.map(buildAttribute); + await createEntity({ tablename, name: name || undefined, attributes }); + setOpen(false); + reload(); + } catch (e) { + setSubmitErr((e as Error).message ?? '建表失败'); + } finally { + setSubmitting(false); + } + } + + return ( +
+
+
+

建模器

+
+ 新建实体(建表)。v1 只建新不改表 · 标准列由后端自动追加 +
+
+
+ +
+ + {loading ? ( +
加载中…
+ ) : error ? ( +
实体加载失败:{error}
+ ) : entities.length === 0 ? ( +
尚无实体,点「新建实体」开始
+ ) : ( +
+ + + + + + + + + + {entities.map((e) => ( + + + + + + ))} + +
表名显示名实体ID
{e.tablename}{e.name}{e.entityId}
+
+ )} + + {open ? ( + setOpen(false)} + foot={ + <> + + + + } + > +
+ + + + + + {submitErr ?
{submitErr}
: null} +
+
+ ) : null} +
+ ); +}