From 18835e4a6bc32f8eaacb0a6fdb0638c1d0080f5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=9F=E6=9E=97=E9=93=96?= Date: Wed, 29 Jul 2026 19:35:55 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=80=83=E6=A0=B8=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E6=94=B9=E4=B8=BA=E5=8D=95=E9=85=8D=E7=BD=AE=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 1 + app/api/performance-survey/[...path]/route.ts | 5 - .../PerformanceSurveyAdminConfig.test.tsx | 44 +++-- .../PerformanceSurveyAdminConfig.tsx | 163 +++++++-------- .../performance-survey-position-admin.test.ts | 76 +++++++ lib/performance-survey-position-config.ts | 98 ++++----- lib/performance-survey-service.ts | 19 -- package.json | 1 + ...e-performance-survey-template-versions.mjs | 186 ++++++++++++++++++ 9 files changed, 410 insertions(+), 183 deletions(-) create mode 100644 scripts/collapse-performance-survey-template-versions.mjs diff --git a/Dockerfile b/Dockerfile index de9df8f2..a38b610d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -101,6 +101,7 @@ COPY --from=builder --chown=nextjs:nodejs /app/node_modules/@smithy ./node_modul COPY --from=builder --chown=nextjs:nodejs /app/prisma/schema.prisma ./prisma/schema.prisma COPY --from=builder --chown=nextjs:nodejs /app/lib ./lib COPY --from=builder --chown=nextjs:nodejs /app/scripts/public-traffic-rollup-from-nginx.py ./scripts/public-traffic-rollup-from-nginx.py +COPY --from=builder --chown=nextjs:nodejs /app/scripts/collapse-performance-survey-template-versions.mjs ./scripts/collapse-performance-survey-template-versions.mjs # 创建必要目录并设置权限 RUN mkdir -p /app/public /app/uploads && \ diff --git a/app/api/performance-survey/[...path]/route.ts b/app/api/performance-survey/[...path]/route.ts index cda50ec4..e8df53e6 100644 --- a/app/api/performance-survey/[...path]/route.ts +++ b/app/api/performance-survey/[...path]/route.ts @@ -36,7 +36,6 @@ import { savePerformanceSurveyAdminPositionGroup, publishPerformanceSurveyAdminPositionGroup, savePerformanceSurveyAdminTemplate, - clonePerformanceSurveyAdminTemplateVersion, copyPerformanceSurveyAdminTemplateVersion, publishPerformanceSurveyAdminTemplateVersion, archivePerformanceSurveyAdminPositionAssignment, @@ -295,10 +294,6 @@ export async function POST(request: Request, context: RouteContext) { return ok(await savePerformanceSurveyAdminTemplate(session, body), { status: 201 }) } - if (path[0] === 'admin' && path[1] === 'templates' && path[2] && path[3] === 'clone') { - return ok(await clonePerformanceSurveyAdminTemplateVersion(session, path[2]), { status: 201 }) - } - if (path[0] === 'admin' && path[1] === 'templates' && path[2] && path[3] === 'copy') { return ok(await copyPerformanceSurveyAdminTemplateVersion(session, path[2]), { status: 201 }) } diff --git a/app/performance-survey/PerformanceSurveyAdminConfig.test.tsx b/app/performance-survey/PerformanceSurveyAdminConfig.test.tsx index 0a2782fe..eb7a6030 100644 --- a/app/performance-survey/PerformanceSurveyAdminConfig.test.tsx +++ b/app/performance-survey/PerformanceSurveyAdminConfig.test.tsx @@ -142,10 +142,12 @@ function createRequest(configuration = config) { if (path === '/admin/templates/template-1' && options?.method === 'DELETE') { return { id: 'template-1', action: 'deleted' } } + if (path === '/admin/templates/version-1' && options?.method === 'PATCH') { + return { id: 'version-1' } + } if (path.endsWith('/copy')) { return { id: 'copied-version-1', templateId: 'copied-template-1', name: '视觉案例评分(副本)' } } - if (path.endsWith('/clone')) return { id: 'draft-version-2' } return {} }) } @@ -356,15 +358,11 @@ describe('PerformanceSurveyAdminConfig', () => { ...template, versions: [{ ...template.versions[0], - id: 'version-draft-2', - version: 2, - status: 'draft', - effectiveMonth: null, definition: { ...template.versions[0].definition, name: '品牌创意部门', }, - }, template.versions[0]], + }], } : template), } @@ -375,9 +373,9 @@ describe('PerformanceSurveyAdminConfig', () => { fireEvent.click(screen.getByRole('button', { name: '修改岗位' })) fireEvent.change(screen.getByLabelText('添加考核项'), { target: { value: '品牌创意部门' } }) - const option = screen.getByRole('button', { name: /品牌创意部门.*v1/ }) + const option = screen.getByRole('button', { name: /品牌创意部门.*已发布/ }) expect(option).toBeInTheDocument() - expect(screen.queryByRole('button', { name: /视觉案例评分.*v1/ })).not.toBeInTheDocument() + expect(screen.queryByRole('button', { name: /视觉案例评分.*已发布/ })).not.toBeInTheDocument() fireEvent.click(option) expect(screen.getByText('品牌创意部门')).toBeInTheDocument() @@ -425,22 +423,34 @@ describe('PerformanceSurveyAdminConfig', () => { }) }) - test('已发布模板通过修改按钮生成草稿,并使用统一的删除入口', async () => { + test('已发布模板通过修改按钮直接更新原版本,并使用统一的删除入口', async () => { const request = createRequest() render() await waitFor(() => expect(screen.getByRole('button', { name: /视觉案例评分.*可用/ })).toBeInTheDocument()) fireEvent.click(screen.getByRole('button', { name: '修改模板' })) - await waitFor(() => expect(request).toHaveBeenCalledWith('/admin/templates/version-1/clone', expect.objectContaining({ method: 'POST' }))) - fireEvent.change(screen.getByLabelText('模板名称'), { target: { value: '新视觉评分' } }) - fireEvent.click(screen.getByRole('button', { name: '发布模板' })) - expect(await screen.findByText('请先保存模板草稿,再执行发布')).toBeInTheDocument() + fireEvent.click(screen.getByRole('button', { name: '保存修改' })) + await waitFor(() => expect(request).toHaveBeenCalledWith( + '/admin/templates/version-1', + expect.objectContaining({ method: 'PATCH' }), + )) + expect(request.mock.calls.some(([path]) => path === '/admin/templates/version-1/clone')).toBe(false) expect(screen.getByRole('button', { name: '删除模板' })).toBeInTheDocument() expect(screen.queryByText('使用场景')).not.toBeInTheDocument() }) - test('已发布模板可通过修改按钮左侧的复制按钮创建独立草稿', async () => { + test('新增模板按钮位于删除模板左侧', async () => { + const request = createRequest() + render() + await waitFor(() => expect(screen.getByRole('button', { name: /视觉案例评分.*可用/ })).toBeInTheDocument()) + + const createButton = screen.getByRole('button', { name: '新增模板' }) + const deleteButton = screen.getByRole('button', { name: '删除模板' }) + expect(createButton.nextElementSibling).toBe(deleteButton) + }) + + test('已发布模板可通过修改按钮左侧的复制按钮创建独立模板草稿', async () => { const request = createRequest() render() await waitFor(() => expect(screen.getByRole('button', { name: /视觉案例评分.*可用/ })).toBeInTheDocument()) @@ -457,7 +467,7 @@ describe('PerformanceSurveyAdminConfig', () => { )) }) - test('模板列表将所有已发布版本视为立即可用', async () => { + test('模板列表只展示单一当前配置状态', async () => { const configuration = { ...config, templates: [{ @@ -511,8 +521,8 @@ describe('PerformanceSurveyAdminConfig', () => { const request = createRequest(configuration) render() - const changedTemplate = await screen.findByRole('button', { name: /视觉案例评分.*有待发布修改/ }) - expect(within(changedTemplate).getByRole('img', { name: '有待发布修改' })).toHaveAttribute('data-status-dot', 'warning') + const changedTemplate = await screen.findByRole('button', { name: /视觉案例评分.*可用/ }) + expect(within(changedTemplate).getByRole('img', { name: '可用' })).toHaveAttribute('data-status-dot', 'success') const publishedTemplate = screen.getByRole('button', { name: /课程分享.*可用/ }) expect(within(publishedTemplate).getByRole('img', { name: '可用' })).toHaveAttribute('data-status-dot', 'success') const draftTemplate = screen.getByRole('button', { name: /草稿模板.*待发布/ }) diff --git a/app/performance-survey/PerformanceSurveyAdminConfig.tsx b/app/performance-survey/PerformanceSurveyAdminConfig.tsx index e09de43b..cdbe448c 100644 --- a/app/performance-survey/PerformanceSurveyAdminConfig.tsx +++ b/app/performance-survey/PerformanceSurveyAdminConfig.tsx @@ -284,7 +284,11 @@ function getTemplateAvailability(template: TemplateRecord, _month: string) { const publishedVersions = template.versions.filter((version) => version.status === 'published') const availableVersion = publishedVersions .sort((left, right) => right.version - left.version)[0] || null - const draftVersion = template.versions.find((version) => version.status === 'draft') || null + const draftVersion = availableVersion + ? null + : template.versions + .filter((version) => version.status === 'draft') + .sort((left, right) => right.version - left.version)[0] || null return { isAvailable: template.isActive && Boolean(availableVersion), availableVersion, @@ -293,7 +297,9 @@ function getTemplateAvailability(template: TemplateRecord, _month: string) { } function getTemplateDisplayName(template: TemplateRecord) { - return template.versions[0]?.definition.name?.trim() || template.name + const current = getTemplateAvailability(template, '').availableVersion + || getTemplateAvailability(template, '').draftVersion + return current?.definition.name?.trim() || template.name } function getTemplateListState(template: TemplateRecord, month: string): { @@ -307,16 +313,16 @@ function getTemplateListState(template: TemplateRecord, month: string): { } if (availability.draftVersion) { return { - label: availability.availableVersion ? '有待发布修改' : '待发布', + label: '待发布', tone: 'warning', - meta: `v${availability.draftVersion.version} · 草稿`, + meta: '草稿', } } if (availability.availableVersion) { return { label: '可用', tone: 'success', - meta: `v${availability.availableVersion.version} · 已发布`, + meta: '已发布', } } return { label: '不可用', tone: 'neutral', meta: '' } @@ -658,7 +664,7 @@ function AdminOverviewWorkspace({ status: templatesReady ? (draftTemplates > 0 ? 'attention' : 'done') : 'blocked', summary: templatesReady ? `${availablePublishedTemplates} 个已发布模板可用${draftTemplates > 0 ? `,${draftTemplates} 个草稿待确认` : ''}` - : `还没有可用的已发布模板${publishedTemplates > 0 ? `(另有 ${publishedTemplates} 个不可用版本)` : ''}`, + : `还没有可用的已发布模板${publishedTemplates > 0 ? `(另有 ${publishedTemplates} 个模板尚不可用)` : ''}`, action: '管理模板', target: 'templates' as const, }, @@ -1144,7 +1150,7 @@ function PositionConfigWorkspace({ {getTemplateDisplayName(template)} - v{version.version} + 已发布 ))} {searchResults.length === 0 && ( @@ -1161,7 +1167,7 @@ function PositionConfigWorkspace({
{item ? getTemplateDisplayName(item.template) : '历史模板'}
- 第 {index + 1} 项{item ? ` · v${item.version.version}` : ''} + 第 {index + 1} 项
{editing && ( @@ -1246,13 +1252,16 @@ function TemplateConfigWorkspace({ const firstTemplate = data.templates[0] const [selectedTemplateId, setSelectedTemplateId] = useState(firstTemplate?.id || 'new') const selectedTemplate = data.templates.find((template) => template.id === selectedTemplateId) || null - const selectedVersion = selectedTemplate?.versions.find((version) => version.status === 'draft') - || selectedTemplate?.versions[0] - || null + const selectedVersion = selectedTemplate + ? getTemplateAvailability(selectedTemplate, month).availableVersion + || getTemplateAvailability(selectedTemplate, month).draftVersion + || null + : null const [versionId, setVersionId] = useState(selectedVersion?.id || null) const [definition, setDefinition] = useState(() => clone(selectedVersion?.definition || newTemplateDefinition())) const [editorStep, setEditorStep] = useState('basics') const [saving, setSaving] = useState(false) + const [editingPublishedVersion, setEditingPublishedVersion] = useState(false) const [readinessOpen, setReadinessOpen] = useState(false) const [operationFeedback, setOperationFeedback] = useState<{ state: 'idle' | 'saving' | 'saved' | 'publishing' | 'published' | 'error' @@ -1261,19 +1270,21 @@ function TemplateConfigWorkspace({ const editorRef = useRef(null) useEffect(() => { - const nextVersion = selectedTemplate?.versions.find((version) => version.status === 'draft') - || selectedTemplate?.versions[0] - || null + const availability = selectedTemplate ? getTemplateAvailability(selectedTemplate, month) : null + const nextVersion = availability?.availableVersion || availability?.draftVersion || null const nextDefinition = clone(nextVersion?.definition || newTemplateDefinition()) setVersionId(nextVersion?.id || null) setDefinition(nextDefinition) setEditorStep('basics') + setEditingPublishedVersion(false) setReadinessOpen(false) onDirtyChange(false) - }, [onDirtyChange, selectedTemplate]) + }, [month, onDirtyChange, selectedTemplate]) const version = selectedTemplate?.versions.find((item) => item.id === versionId) || null - const editable = !version || version.status === 'draft' + const editable = !version + || version.status === 'draft' + || (version.status === 'published' && editingPublishedVersion) const readinessItems = getTemplateReadiness(definition) const readinessCompleted = readinessItems.filter((item) => item.status === 'done').length const templateDefinitionReady = readinessCompleted === readinessItems.length @@ -1285,9 +1296,13 @@ function TemplateConfigWorkspace({ } const save = async () => { + const updatingPublishedVersion = version?.status === 'published' setSaving(true) onError(null) - setOperationFeedback({ state: 'saving', message: '正在保存模板草稿…' }) + setOperationFeedback({ + state: 'saving', + message: updatingPublishedVersion ? '正在保存模板修改…' : '正在保存模板草稿…', + }) try { const saved = versionId ? await request<{ id: string }>(`/admin/templates/${versionId}`, { @@ -1298,19 +1313,25 @@ function TemplateConfigWorkspace({ method: 'POST', body: JSON.stringify({ definition }), }) - const next = await onChanged('模板草稿已保存') + const next = await onChanged(updatingPublishedVersion ? '模板修改已保存' : '模板草稿已保存') const nextTemplate = next?.templates.find((template) => template.versions.some((item) => item.id === saved.id)) if (nextTemplate) setSelectedTemplateId(nextTemplate.id) setVersionId(saved.id) + setEditingPublishedVersion(false) onDirtyChange(false) const savedTime = new Intl.DateTimeFormat('zh-CN', { hour: '2-digit', minute: '2-digit', hour12: false, }).format(new Date()) - setOperationFeedback({ state: 'saved', message: `草稿已保存 · ${savedTime}` }) + setOperationFeedback({ + state: 'saved', + message: `${updatingPublishedVersion ? '修改' : '草稿'}已保存 · ${savedTime}`, + }) } catch (actionError) { - const message = actionError instanceof Error ? actionError.message : '模板草稿保存失败' + const message = actionError instanceof Error + ? actionError.message + : updatingPublishedVersion ? '模板修改保存失败' : '模板草稿保存失败' onError(message) setOperationFeedback({ state: 'error', message: `保存失败:${message}` }) } finally { @@ -1318,27 +1339,6 @@ function TemplateConfigWorkspace({ } } - const cloneVersion = async () => { - if (!versionId || !await confirmDiscard()) return - setSaving(true) - onError(null) - setOperationFeedback({ state: 'saving', message: '正在创建可编辑草稿…' }) - try { - const draft = await request<{ id: string }>(`/admin/templates/${versionId}/clone`, { method: 'POST', body: '{}' }) - const next = await onChanged('已创建新的模板草稿') - const nextTemplate = next?.templates.find((template) => template.versions.some((item) => item.id === draft.id)) - if (nextTemplate) setSelectedTemplateId(nextTemplate.id) - setVersionId(draft.id) - setOperationFeedback({ state: 'saved', message: '新的可编辑草稿已创建' }) - } catch (actionError) { - const message = actionError instanceof Error ? actionError.message : '模板草稿创建失败' - onError(message) - setOperationFeedback({ state: 'error', message: `创建草稿失败:${message}` }) - } finally { - setSaving(false) - } - } - const copyTemplate = async () => { if (!versionId || !selectedTemplate || !await confirmDiscard()) return setSaving(true) @@ -1388,7 +1388,7 @@ function TemplateConfigWorkspace({ {surveyTypeLabel(definition.surveyType)} · {definition.questions.length} 个评分项 · {' '}{definition.workflow.stages.length} 个评分阶段 · 总分 {Number(definition.maxTotal || 0)}

-

发布后的版本不可直接修改;后续调整需要创建新的草稿版本。

+

发布后仍可通过“修改模板”更新当前模板;已经发起的调研会保留原始模板快照。

), confirmLabel: '确认发布', @@ -1459,14 +1459,12 @@ function TemplateConfigWorkspace({ } } - const selectVersion = async (nextVersion: TemplateVersion) => { - if (nextVersion.id === versionId) return - if (!await confirmDiscard('切换版本会放弃当前未保存修改,确定继续吗?')) return + const cancelPublishedEdit = async () => { + if (dirty && !await confirmDiscard('取消修改会放弃当前未保存内容,确定继续吗?')) return + if (version) setDefinition(clone(version.definition)) + setEditingPublishedVersion(false) onDirtyChange(false) setOperationFeedback({ state: 'idle', message: '' }) - setVersionId(nextVersion.id) - setDefinition(clone(nextVersion.definition)) - setEditorStep('basics') } const selectedTemplateName = selectedTemplate @@ -1479,7 +1477,7 @@ function TemplateConfigWorkspace({ ? operationFeedback.message || '处理中' : dirty ? '未保存' - : operationFeedback.message || (editable ? '已保存' : '只读') + : operationFeedback.message || (editingPublishedVersion ? '可修改' : editable ? '已保存' : '只读') const feedbackTone: StatusTone = operationFeedback.state === 'error' ? 'danger' : dirty || saving @@ -1516,15 +1514,6 @@ function TemplateConfigWorkspace({
-
- -
{data.templates.map((template) => { const state = getTemplateListState(template, month) const templateName = getTemplateDisplayName(template) @@ -1552,22 +1541,19 @@ function TemplateConfigWorkspace({
{selectedTemplate && (
- {selectedTemplate.versions.map((item) => ( - - ))} + @@ -1739,7 +1725,10 @@ function TemplateConfigWorkspace({ + <> + {version?.status === 'published' && ( + + )} + + )} - {editable && versionId && ( + {editable && versionId && version?.status === 'draft' && (