From 4e7a95cc2032fe64aa425d638b424a344f270cae Mon Sep 17 00:00:00 2001 From: zhengwr Date: Sat, 20 Jun 2026 09:39:39 +0800 Subject: [PATCH] feat(modeler): reference-column picker (target entity + display column) per DECISION-1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 引用列加载改用内部 selected 态(父级 onChange 不一定回写 value,列加载不能只依赖 value)。 Co-Authored-By: Claude Opus 4.8 (1M context) --- src/pages/ReferencePicker.test.tsx | 47 ++++++++++++++++ src/pages/ReferencePicker.tsx | 88 +++++++++++++++++++++++++++--- 2 files changed, 127 insertions(+), 8 deletions(-) create mode 100644 src/pages/ReferencePicker.test.tsx diff --git a/src/pages/ReferencePicker.test.tsx b/src/pages/ReferencePicker.test.tsx new file mode 100644 index 0000000..8fea1b9 --- /dev/null +++ b/src/pages/ReferencePicker.test.tsx @@ -0,0 +1,47 @@ +import { describe, expect, it, vi, beforeEach } from 'vitest'; +import { render, screen, fireEvent, waitFor } from '@testing-library/react'; +import { ReferencePicker } from './ReferencePicker'; + +vi.mock('../api/meta', () => ({ listEntities: vi.fn(), listEntityColumns: vi.fn() })); +import { listEntities, listEntityColumns } from '../api/meta'; +const mList = vi.mocked(listEntities); +const mCols = vi.mocked(listEntityColumns); + +beforeEach(() => { + mList.mockReset(); + mCols.mockReset(); + mList.mockResolvedValue([ + { entityId: 'E1', tablename: 'SYS_DEPART', name: '部门' }, + { entityId: 'E2', tablename: 'SYS_ORG', name: '组织' }, + ]); + mCols.mockResolvedValue({ + tablename: 'SYS_DEPART', + displayColumn: 'DEPARTNAME', + columns: [ + { column: 'DEPARTNAME', display: '部门名', type: 'string' }, + { column: 'DEPARTCODE', display: '部门编码', type: 'string' }, + ], + }); +}); + +describe('ReferencePicker', () => { + it('加载目标实体清单', async () => { + render( {}} />); + await waitFor(() => expect(screen.getByTestId('ref-target')).toBeInTheDocument()); + expect(mList).toHaveBeenCalled(); + // 选项含 SYS_DEPART + expect(screen.getByRole('option', { name: /SYS_DEPART/ })).toBeInTheDocument(); + }); + + it('选目标实体→回写 referenceTable + 加载其列', async () => { + const onChange = vi.fn(); + render(); + await waitFor(() => expect(screen.getByTestId('ref-target')).toBeInTheDocument()); + fireEvent.change(screen.getByTestId('ref-target'), { target: { value: 'SYS_DEPART' } }); + expect(onChange).toHaveBeenCalledWith('SYS_DEPART'); + await waitFor(() => expect(mCols).toHaveBeenCalledWith('SYS_DEPART')); + // 显示列下拉默认选中 displayColumn + await waitFor(() => expect(screen.getByTestId('ref-display-col')).toBeInTheDocument()); + expect((screen.getByTestId('ref-display-col') as HTMLSelectElement).value).toBe('DEPARTNAME'); + }); +}); diff --git a/src/pages/ReferencePicker.tsx b/src/pages/ReferencePicker.tsx index 89a9cd8..a19943f 100644 --- a/src/pages/ReferencePicker.tsx +++ b/src/pages/ReferencePicker.tsx @@ -1,11 +1,83 @@ -// 占位(Task 17 实现引用列选择器)。 -export function ReferencePicker(props: { value: string; onChange: (t: string) => void }) { +// 引用列选择器(DECISION-1)。type=引用时选目标实体 + 显示列。 +// 父级只需 referenceTable;显示列默认取目标表 displayColumn,仅做预览, +// 实际渲染时由 recipe 按目标表 displayColumn 解析显示名(非裸 id)。 +import { useEffect, useState } from 'react'; +import { listEntities, listEntityColumns, type EntitySummary, type EntityColumn } from '../api/meta'; + +interface ReferencePickerProps { + value: string; // 已选目标表名(父级权威) + onChange: (referenceTable: string) => void; +} + +export function ReferencePicker({ value, onChange }: ReferencePickerProps) { + const [entities, setEntities] = useState([]); + const [cols, setCols] = useState([]); + const [displayCol, setDisplayCol] = useState(''); + const [err, setErr] = useState(''); + // 内部选中态:以父级 value 为初值,select onChange 即时更新,驱动列加载 + // (父级 onChange 不一定立刻回写 value,故列加载不能只依赖 value)。 + const [selected, setSelected] = useState(value); + + useEffect(() => { + setSelected(value); + }, [value]); + + useEffect(() => { + let alive = true; + listEntities() + .then((es) => alive && setEntities(es)) + .catch((e: Error) => alive && setErr(e.message ?? '实体清单加载失败')); + return () => { alive = false; }; + }, []); + + useEffect(() => { + if (!selected) { + setCols([]); + setDisplayCol(''); + return; + } + let alive = true; + listEntityColumns(selected) + .then((c) => { + if (!alive) return; + setCols(c.columns); + setDisplayCol(c.displayColumn || c.columns[0]?.column || ''); + }) + .catch((e: Error) => alive && setErr(e.message ?? '目标列加载失败')); + return () => { alive = false; }; + }, [selected]); + + function handleSelect(table: string) { + setSelected(table); + onChange(table); + } + return ( - props.onChange(e.target.value)} - placeholder="目标表(Task 17 改为下拉)" - /> +
+ + {selected ? ( + + ) : null} + {err ?
{err}
: null} +
); }