diff --git a/test/e2e/workbench.spec.ts b/test/e2e/workbench.spec.ts index 19c966f..1bb4955 100644 --- a/test/e2e/workbench.spec.ts +++ b/test/e2e/workbench.spec.ts @@ -117,7 +117,9 @@ test.describe('workbench editing shell', () => { await expect(page.getByLabel('路口编辑工作区')).toBeVisible(); await expect(page.getByText(`路口节点 ${nodeId}`)).toBeVisible(); await expect(page.getByText('设施与验证', { exact: true })).toBeVisible(); - await page.getByRole('switch', { name: '编辑模式' }).check(); + await expect(page.getByText('当前为浏览模式,开启编辑后可调整路口几何参数')).toBeVisible(); + await page.getByRole('button', { name: '开启编辑模式' }).click(); + await expect(page.getByRole('switch', { name: '编辑模式' })).toBeChecked(); await expect(page.getByLabel('路口编辑工作区').getByText('道路参数', { exact: true })).toBeVisible(); }); }); diff --git a/workbench/client/src/App.tsx b/workbench/client/src/App.tsx index 9120b2c..475b231 100644 --- a/workbench/client/src/App.tsx +++ b/workbench/client/src/App.tsx @@ -1049,6 +1049,8 @@ function App() { setStatus((error as Error).message); } }} + editMode={editMode} + onEnableEdit={() => setEditMode(true)} handles={junctionHandles} onDraft={draftValue} onSettle={(handle, value) => { diff --git a/workbench/client/src/junction/JunctionWorkspace.tsx b/workbench/client/src/junction/JunctionWorkspace.tsx index aaa51cb..7d3efb6 100644 --- a/workbench/client/src/junction/JunctionWorkspace.tsx +++ b/workbench/client/src/junction/JunctionWorkspace.tsx @@ -14,6 +14,8 @@ interface Props { onApply: () => void; onDiscard: () => void; onSave: () => void; + editMode?: boolean; + onEnableEdit?: () => void; handles?: EditHandle[]; onDraft?: (handle: EditHandle, value: number) => void; onSettle?: (handle: EditHandle, value: number) => void; @@ -28,6 +30,8 @@ export function JunctionWorkspace({ onApply, onDiscard, onSave, + editMode = false, + onEnableEdit, diagnostics = [], facilitySummary = { crosswalks: 0, stopLines: 0, signals: 0 }, handles = [], @@ -45,9 +49,18 @@ export function JunctionWorkspace({

{descriptor.ref.type === 'node' ? '路口节点' : '复杂路口上下文'} {descriptor.ref.id}

-

{editable ? '可编辑路口几何参数' : '只读上下文:当前路口类型暂不支持编辑'}

+

+ {editable + ? editMode + ? '可编辑路口几何参数' + : '当前为浏览模式,开启编辑后可调整路口几何参数' + : '只读上下文:当前路口类型暂不支持编辑'} +

+ +
+ {editable && !editMode ? : null} +
-
@@ -80,7 +93,7 @@ export function JunctionWorkspace({

当前路口没有诊断问题。

)} - {editable ? ( + {editable && editMode ? ( <>
+ ) : editable ? ( +

+ 开启编辑模式后,这里会显示进口宽度、cutback 和角部圆角控件。 +

) : null} diff --git a/workbench/client/src/styles.css b/workbench/client/src/styles.css index c2307b0..59e3fd8 100644 --- a/workbench/client/src/styles.css +++ b/workbench/client/src/styles.css @@ -549,6 +549,12 @@ pre { align-items: flex-start; gap: 1rem; } +.junction-workspace__header-actions { + display: flex; + align-items: center; + gap: 0.5rem; + flex-wrap: wrap; +} .junction-workspace__header h2 { margin: 0.2rem 0; } @@ -579,3 +585,10 @@ pre { gap: 0.5rem; margin-top: 1.5rem; } +.junction-workspace__browse-hint { + margin: 1.5rem 0 0; + padding: 0.75rem 1rem; + border-left: 3px solid #94a3b8; + background: #f8fafc; + color: #475569; +}