diff --git a/packages/server/scripts/verify-e2e.mjs b/packages/server/scripts/verify-e2e.mjs index 3cf4a0d..d47932f 100644 --- a/packages/server/scripts/verify-e2e.mjs +++ b/packages/server/scripts/verify-e2e.mjs @@ -697,11 +697,17 @@ async function main() { const createdCourse = await api('/courses', { method: 'POST', - token: teacherToken, + token: adminToken, body: { name: `联调验证课程 ${Date.now()}`, classId }, }); const createdCourseId = createdCourse.payload?.data?.id; record('新增课程 POST /courses', createdCourse.status === 201, `status=${createdCourse.status}`); + const deniedCourse = await api('/courses', { + method: 'POST', + token: teacherToken, + body: { name: `禁止自授权课程 ${Date.now()}`, classId }, + }); + record('教师不能通过建课建立任课关系', deniedCourse.status === 403, `status=${deniedCourse.status}`); if (createdCourseId) { const removedCourse = await api(`/courses/${createdCourseId}`, { method: 'DELETE', token: teacherToken }); record('删除课程 DELETE /courses/:id', removedCourse.status === 200, `status=${removedCourse.status}`); diff --git a/packages/server/src/modules/courses/courses.service.ts b/packages/server/src/modules/courses/courses.service.ts index 37fa4c1..b3d42ce 100644 --- a/packages/server/src/modules/courses/courses.service.ts +++ b/packages/server/src/modules/courses/courses.service.ts @@ -1,6 +1,11 @@ import { refreshClassSubscriptions } from '../../realtime/bus.js'; import type { CourseDto } from '@classhelper/shared'; -import { assertCanManageSchedule, classScopeWhere, resolveClassScope } from '../../lib/access.js'; +import { + assertCanAssignTeachers, + assertCanManageSchedule, + classScopeWhere, + resolveClassScope, +} from '../../lib/access.js'; import { prisma } from '../../lib/db.js'; import { ApiError } from '../../lib/http.js'; import type { TokenPayload } from '../../lib/jwt.js'; @@ -21,6 +26,9 @@ export async function listCourses(user: TokenPayload, classId?: string): Promise export async function createCourse(user: TokenPayload, input: CreateCourseInput): Promise { await assertCanManageSchedule(user, input.classId); + // 建课同时建立任课关系,只能由管理员执行,不能凭课表维护范围自授权。 + if (user.role !== 'ADMIN') throw ApiError.forbidden('新建科目会建立任课关系,请联系管理员配置'); + await assertCanAssignTeachers(user, input.classId); /* * 同名去重(一个班级里科目名唯一)。 diff --git a/packages/web-admin/src/views/ClassesView.vue b/packages/web-admin/src/views/ClassesView.vue index 739bcdf..74070f0 100644 --- a/packages/web-admin/src/views/ClassesView.vue +++ b/packages/web-admin/src/views/ClassesView.vue @@ -325,7 +325,7 @@ async function removeStudent(row: StudentDto): Promise { const courseForm = reactive({ name: '' }); async function addCourse(): Promise { - if (!canManageDetailCourses.value) return; + if (!auth.isAdmin || !canManageDetailCourses.value) return; if (!detail.value || !courseForm.name.trim()) { ElMessage.warning('请输入课程名称'); return; @@ -771,7 +771,7 @@ async function saveSettings() { { const SUBJECT_PREFIX = 'subject:'; const subjectOptions = computed(() => { + if (!auth.isAdmin) return []; const existing = new Set(courses.value.map((item) => item.name)); return SUBJECT_CATALOG.filter((name) => !existing.has(name)); }); @@ -221,7 +222,7 @@ const ownCourses = computed(() => ); /** 能不能在该班新建科目(与课表管理同权限:管理员或本班班主任) */ -const canCreateCourse = computed(() => auth.canManageClass('schedule:write', filter.classId)); +const canCreateCourse = computed(() => auth.isAdmin); /** 录入弹窗的默认科目:优先沿用页面筛选,但筛的是别人的科目时退回"我的科目"第一条 */ function defaultFormCourseId(): string { diff --git a/packages/web-admin/src/views/HomeworksView.vue b/packages/web-admin/src/views/HomeworksView.vue index d160176..0e89a0e 100644 --- a/packages/web-admin/src/views/HomeworksView.vue +++ b/packages/web-admin/src/views/HomeworksView.vue @@ -222,6 +222,7 @@ const formCoursesLoading = ref(false); /** 该班还没有的科目(来自 shared 的 SUBJECT_CATALOG) */ const newSubjectOptions = computed(() => { + if (!auth.isAdmin) return []; const existing = new Set(formCourses.value.map((item) => item.name)); return SUBJECT_CATALOG.filter((name) => !existing.has(name)); }); @@ -237,8 +238,8 @@ const ownFormCourses = computed(() => auth.isAdmin ? formCourses.value : formCourses.value.filter((item) => item.teacherId === auth.user?.id), ); -/** 该班里能不能新建科目:与课表管理同权限(管理员或本班班主任) */ -const canCreateCourse = computed(() => auth.canManageClass('schedule:write', form.classId)); +/** 新建科目会建立任课关系,仅管理员可操作。 */ +const canCreateCourse = computed(() => auth.isAdmin); async function loadFormCourses(): Promise { const classId = form.classId; @@ -325,10 +326,10 @@ async function resolveCourseId(): Promise { await loadFormCourses(); return reusedId; } - // 新建课程需要"管理员或本班班主任"权限(与课表管理一致),科任老师会被 403 拦截 + // 新建课程会建立任课关系,统一交给管理员配置。 ElMessage.error( `新建科目「${name}」失败:${ - error instanceof Error ? error.message : '仅班主任/管理员可以在班级下新建课程' + error instanceof Error ? error.message : '请联系管理员建立科目及任课关系' },可改用已有课程或直接留空发布`, ); throw error; @@ -622,7 +623,7 @@ function canEditContent(row: HomeworkDto): boolean { ? '正在加载该班课程…' : canCreateCourse ? '只列你任教的科目;该班还没有的科目在「其他科目(新建)」里,选中后自动建课再发布' - : '只列你任教的科目;需要别的科目请先由班主任/管理员在课表管理里建好并分配任课老师' + : '只列你任教的科目;需要别的科目请联系管理员建立科目并分配任课老师' }} diff --git a/packages/web-admin/src/views/PlanEditorView.vue b/packages/web-admin/src/views/PlanEditorView.vue index 203733d..450a080 100644 --- a/packages/web-admin/src/views/PlanEditorView.vue +++ b/packages/web-admin/src/views/PlanEditorView.vue @@ -504,10 +504,10 @@ watch(tab, () => { selectedLayout.value = plan.value.timeLayoutId; }); const missingSubjects = computed(() => - SUBJECT_CATALOG.filter((name) => !courses.value.some((c) => c.name === name)), + auth.isAdmin ? SUBJECT_CATALOG.filter((name) => !courses.value.some((c) => c.name === name)) : [], ); async function addSubject(name: string) { - if (!canWrite.value) return; + if (!canWrite.value || !auth.isAdmin) return; try { const created = await courseApi.create({ classId: classId.value, name }); courses.value.push(created); diff --git a/packages/web-admin/src/views/SchedulesView.vue b/packages/web-admin/src/views/SchedulesView.vue index 5f3b192..62808f8 100644 --- a/packages/web-admin/src/views/SchedulesView.vue +++ b/packages/web-admin/src/views/SchedulesView.vue @@ -107,6 +107,7 @@ async function loadCourses(): Promise { const SUBJECT_PREFIX = 'subject:'; const subjectOptions = computed(() => { + if (!auth.isAdmin) return []; const existing = new Set(courses.value.map((item) => item.name)); return SUBJECT_CATALOG.filter((name) => !existing.has(name)); }); diff --git a/scripts/ui-smoke/class-relations.cjs b/scripts/ui-smoke/class-relations.cjs index e3b3d3c..e9f71bc 100644 --- a/scripts/ui-smoke/class-relations.cjs +++ b/scripts/ui-smoke/class-relations.cjs @@ -107,10 +107,15 @@ async function checkClassRelations(win, options, record) { return { studentWrite: Array.from(drawer.querySelectorAll('#pane-students button')).some(button => button.textContent.trim() === '添加学生'), courseCreate: Boolean(drawer.querySelector('#pane-courses input')), gradeQueryEnabled: !drawer.querySelector('#pane-settings .el-switch')?.classList.contains('is-disabled') }; })()`); record( - '班主任本人班级仍可维护名单、课程和成绩查询开关', - owner.studentWrite && owner.courseCreate && owner.gradeQueryEnabled, + '班主任可维护本班名单和成绩查询开关,但不能通过建课取得任课关系', + owner.studentWrite && !owner.courseCreate && owner.gradeQueryEnabled, JSON.stringify(owner), ); + const created = await request('/courses', admin.token, 'POST', { + classId: other.id, + name: '管理员建课验证', + }); + record('管理员仍可建立课程与任课关系', created.status === 201, `status=${created.status}`); const members = await data('/permissions/users', admin.token); const previous = members.find((member) => member.id === teacher.user.id).assignments; const groups = [];