feat: 客户端灵动岛 + 上课时段紧急通知二次确认,并修复打包/校验脚本在 Electron 宿主下的多个缺陷
## 客户端灵动岛(动态岛)
- 新增独立透明置顶窗口:桌面中上方常驻、不占任务栏、不抢焦点(268x44 胶囊 / 404x316 详情 / 424x344 紧急)
- 三种形态与动画:隐藏 ↔ 胶囊 ↔ 详情,尺寸用 easeOutCubic 260ms 逐帧缓动、透明度单独淡入淡出
(尺寸与淡入使用各自动画令牌,避免互相打断导致窗口卡在胶囊尺寸)
- 行为:普通通知变「新消息 · 共 N 条」胶囊,点击展开详情;上课时段自动隐藏并进入待发队列,
下课后自动弹出;紧急通知无论是否上课立即展开(红色呼吸光晕 + 紧急角标,无需点击)
- 上课状态来自 GET /api/schedules/current(10s 心跳 + 下课时长定时器),
新增 src/main/island.ts(控制器/IPC)、src/preload/island.ts、src/island/IslandApp.vue、
src/renderer/island/bridge.ts、island.html 与多页 Vite 构建
## 上课时段发布紧急通知的二次确认
- 服务端:priority=URGENT 且当前处于上课时间段且未带 confirmDuringClass 时返回
409 URGENT_DURING_CLASS(携带 current/next/week/serverTime),绕过界面调接口同样被拦截
- 新增 GET /api/schedules/current(inClass/current/next,at 参数用于诊断与测试)
- Web 管理端:全屏警告遮罩(UrgentClassWarning.vue),显示正在上的课时段与待发布标题,
确认按钮带 3 秒倒计时(圆环进度,倒计时结束前禁用),取消即不发;并发命中 409 同样兜底弹窗
## 打包与验证脚本修复(Electron 宿主环境)
- scripts/lib/node-runtime.mjs:定位真正的 node.exe。此前经 pnpm 运行时 process.execPath 指向
Electron,dist:server 会把 Electron 复制成安装包内的 node.exe,dist:win 会让 electron-builder 报
Unknown argument: .../cli.js(改为显式使用真实 Node)
- scripts/lib/electron-env.mjs:启动 Electron 前清理继承的 ELECTRON_RUN_AS_NODE(否则 Electron 退化为
纯 Node,require('electron') 直接 MODULE_NOT_FOUND),并从 path.txt 定位 electron.exe
(process.versions.electron 存在时 import 'electron' 返回的是 API 对象而非路径)
- scripts/dist-server.mjs:新增构建产物新鲜度校验(曾出现 server 已重建但打进安装包的 shared/dist 是旧的,
安装后服务启动即报 does not provide an export named MAX_TERM_WEEK)
- scripts/ui-smoke:新增 live-probe.mjs 真实制造/清理上课时段,Electron 驱动真实点击断言全屏警告文案、
按钮禁用与 3 秒倒计时时长(实测 2966ms),测试后自动删除探针课表与测试通知
## 验证结果
- pnpm verify:e2e 62/62(新增上课时段拦截、二次确认后发布、普通通知不受限等 8 项)
- pnpm verify:web 8/8(新增上课时段紧急通知全屏警告 + 倒计时)
- pnpm verify:desktop 18/18(新增灵动岛窗口/上课隐藏/下课弹出/紧急立即展开/胶囊点击展开 + 截图)
- 打包后 EXE 冒烟 15/15(packaged: true,退出码 0)
- 服务端安装程序升级安装:.env 与数据库保持不变,/api/schedules/current 正常
- pnpm lint / format:check / typecheck 全部通过
This commit is contained in:
1 parent
5545ef6f55
commit
3a9f8812fc
40 files changed
+3062
-149
No files matched your search
@@ -1,5 +1,5 @@
|
||||
import { WEEKDAY_LABELS, WEEKDAYS } from './constants.js';
|
||||
import type { GradeLevel, ScheduleDto, ScheduleWeekView } from './types.js';
|
||||
import type { ClassPeriod, GradeLevel, ScheduleDto, ScheduleWeekView } from './types.js';
|
||||
|
||||
/* ------------------------------------------------------------------ 日期时间 */
|
||||
|
||||
@@ -207,3 +207,102 @@ export function truncate(text: string | null | undefined, max = 60): string {
|
||||
export function isValidTimeString(value: string): boolean {
|
||||
return /^([01]\d|2[0-3]):[0-5]\d$/.test(value);
|
||||
}
|
||||
|
||||
/* ------------------------------------------------------------------ 上课时段判定 */
|
||||
|
||||
/** HH:mm -> 分钟数(非法输入返回 -1) */
|
||||
export function timeToMinutes(value: string): number {
|
||||
const [hour, minute] = value.split(':').map(Number);
|
||||
if (hour === undefined || minute === undefined || Number.isNaN(hour) || Number.isNaN(minute)) return -1;
|
||||
return hour * 60 + minute;
|
||||
}
|
||||
|
||||
const MS_PER_DAY = 86_400_000;
|
||||
export const MAX_TERM_WEEK = 30;
|
||||
|
||||
/**
|
||||
* 依据学期起始日(第 1 教学周的周一)计算当前教学周。
|
||||
* 服务端与三端共用同一份实现,避免"周次"口径不一致。
|
||||
*/
|
||||
export function resolveCurrentWeek(
|
||||
termStartDate: string,
|
||||
now: Date = new Date(),
|
||||
maxWeek: number = MAX_TERM_WEEK,
|
||||
): number {
|
||||
if (!termStartDate) return 1;
|
||||
const start = toDate(termStartDate);
|
||||
if (Number.isNaN(start.getTime())) return 1;
|
||||
|
||||
const weekday = start.getDay() === 0 ? 7 : start.getDay();
|
||||
const monday = new Date(start.getTime() - (weekday - 1) * MS_PER_DAY);
|
||||
monday.setHours(0, 0, 0, 0);
|
||||
|
||||
const diffDays = Math.floor((now.getTime() - monday.getTime()) / MS_PER_DAY);
|
||||
const week = Math.floor(diffDays / 7) + 1;
|
||||
return clamp(week, 1, maxWeek);
|
||||
}
|
||||
|
||||
/** 把课表条目转换成时段信息 */
|
||||
export function toClassPeriod(schedule: ScheduleDto): ClassPeriod {
|
||||
return {
|
||||
scheduleId: schedule.id,
|
||||
courseId: schedule.courseId,
|
||||
courseName: schedule.course?.name ?? '课程',
|
||||
startTime: schedule.startTime,
|
||||
endTime: schedule.endTime,
|
||||
location: schedule.location,
|
||||
dayOfWeek: schedule.dayOfWeek,
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* 判断某一时刻是否处于上课时间段,并给出正在上的课与下一节课。
|
||||
*
|
||||
* @param schedules 该班级的课表(可含全部周次)
|
||||
* @param now 判定时刻
|
||||
* @param week 当前教学周;传 0 / 省略表示不按周次过滤(仅按星期与时间)
|
||||
*/
|
||||
export function resolveClassStatus(
|
||||
schedules: ScheduleDto[],
|
||||
now: Date = new Date(),
|
||||
week?: number,
|
||||
): { inClass: boolean; current: ClassPeriod | null; next: ClassPeriod | null } {
|
||||
const weekday = weekdayOf(now);
|
||||
const nowMinutes = now.getHours() * 60 + now.getMinutes();
|
||||
|
||||
const weekFiltered =
|
||||
week && week > 0 ? schedules.filter((item) => isScheduleActiveInWeek(item, week)) : schedules;
|
||||
const today = weekFiltered.filter((item) => item.dayOfWeek === weekday);
|
||||
|
||||
const current = today
|
||||
.filter((item) => {
|
||||
const start = timeToMinutes(item.startTime);
|
||||
const end = timeToMinutes(item.endTime);
|
||||
return start >= 0 && end > start && nowMinutes >= start && nowMinutes < end;
|
||||
})
|
||||
.sort((a, b) => timeToMinutes(a.startTime) - timeToMinutes(b.startTime))[0];
|
||||
|
||||
const next = today
|
||||
.filter((item) => timeToMinutes(item.startTime) > nowMinutes)
|
||||
.sort((a, b) => timeToMinutes(a.startTime) - timeToMinutes(b.startTime))[0];
|
||||
|
||||
return {
|
||||
inClass: Boolean(current),
|
||||
current: current ? toClassPeriod(current) : null,
|
||||
next: next ? toClassPeriod(next) : null,
|
||||
};
|
||||
}
|
||||
|
||||
/** 时段的可读文案,例如 "08:00-08:45 · 数学 · 教学楼 A301" */
|
||||
export function formatClassPeriod(period: ClassPeriod | null): string {
|
||||
if (!period) return '';
|
||||
const location = period.location ? ` · ${period.location}` : '';
|
||||
return `${period.startTime}-${period.endTime} · ${period.courseName}${location}`;
|
||||
}
|
||||
|
||||
/** 距离某个 HH:mm 还有多少分钟(已过则为负) */
|
||||
export function minutesUntil(time: string, now: Date = new Date()): number {
|
||||
const target = timeToMinutes(time);
|
||||
if (target < 0) return 0;
|
||||
return target - (now.getHours() * 60 + now.getMinutes());
|
||||
}
|
||||
Reference in new issue
Block a user