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(
发布后的版本不可直接修改;后续调整需要创建新的草稿版本。
+发布后仍可通过“修改模板”更新当前模板;已经发起的调研会保留原始模板快照。
), 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({