## 灵动岛修复与动画优化(用户反馈) - **收回不再出现"方框"闪烁**:卡片改为**固定逻辑尺寸 + 顶部居中锚定**, 窗口只负责露出/裁切透明区域。此前卡片随窗口拉伸,形变过程中会看到被拉扁的圆角方块, 胶囊里的铃铛/文字还会被垂直居中而"从上跳到下";两条问题同源,现已消除。 冒烟用 15 次采样断言卡片尺寸恒为固定值(`396x308` / `260x38`),一旦出现中间值即失败。 - **点击屏幕任意位置收回**:展开态临时 `setFocusable(true)` 并取焦,点到别处即失焦 → 自动回缩为胶囊; 收起后立即释放可聚焦性。断言覆盖 `focusable=true → 失焦后 mode=pill、focusable=false`。 - 动画继续打磨:危险/叫人形态改为**内部光晕**(卡片四周再留 4px 透明边,彻底避免窗口边界裁切出硬边)、 尖角与圆角统一、形态尺寸各异(胶囊 268×44 / 详情 404×316 / 紧急 424×344 / 叫人 440×360)。 ## 灵动岛"标为已读"真正同步通知中心 - 新增链路:灵动岛 `mark-read` → 主进程 `setMarkReadHandler` → 主窗口渲染进程 → `notificationApi.markRead` + 刷新 store(未读红点即时减少)。 - 真机链路断言:点击"标为已读"后 `read=false → true`、未读数 `1 → 0`(此前只从灵动岛队列移除)。 ## 作业发布也上岛 - `homework:new` → 灵动岛 `kind=homework`:胶囊显示"新作业"(青蓝描边 + 书本图标), 展开显示作业说明与"截止时间:…"。 ## 新增"叫人"功能 - 服务端:新模块 `modules/calls`(`POST /api/calls`)——校验班级可写 + 学生属于该班, 落库一条 HIGH 级通知(进通知中心、可用已读状态),广播 `notification:new` 到班级房间, 并定向 `call:new` 给被叫学生。 - 共享层:`CALL_QUICK_PHRASES`(8 条快捷短语)、`buildCallTitle()`("请 XXX 同学找 XXX 老师",老师名已含"老师"不重复)、 `ServerToClientEvents['call:new']`、`CreateCallRequest`。 - Web 管理端:学生管理列表新增 **叫人** 按钮 → 弹窗显示对象、快捷短语(点选/取消)、自定义消息(优先),发送即通知。 - 客户端:`call:new` → 灵动岛 `kind=call`,**上课时段也立即展开**(老师正在等这名学生), 琥珀金卡片 +"叫人"徽标 +"收到"按钮,90 秒后自动收起。 ## 客户端界面改为 ClassIsland 同款 Fluent 风格 - 主题令牌:Mica 浅底 `#f3f3f3`、亚克力卡片 `rgba(255,255,255,.7)` + `backdrop-filter`、 强调色 `#0F6CBD`、半透明描边、卡片 8px / 控件 4px 圆角、极轻阴影。 - Element Plus 变量整体对齐(`--el-color-primary`、圆角、表头/行分隔、滚动条等)。 - 侧边导航改为 Fluent NavigationView 观感:白色半透明底、选中项强调色淡底 + 左侧 3px 强调条; 品牌标改为强调色渐变圆角方块。附客户端五个页面实拍(`docs/screenshots/client/`)。 ## 验证 - `pnpm verify:e2e` **68/68**(新增 6 项叫人:201 + 标题模板、自定义消息优先、上课时段允许、学生 403、通知中心可见、清理) - `pnpm verify:desktop` **33/33**(新增:卡片固定尺寸、点击任意处收回、标为已读同步、作业上岛、叫人上课中立即展开、真实通知链路) - `pnpm verify:web` **16/16**(新增叫人入口:弹窗、8 条快捷短语、自定义输入、短语可选中) - `pnpm lint` / `format:check` / `typecheck` 全部通过;服务端安装包已重打并安装验证
167 lines
5.2 KiB
TypeScript
167 lines
5.2 KiB
TypeScript
import { computed, ref } from 'vue';
|
|
import { defineStore } from 'pinia';
|
|
import { ElMessage } from 'element-plus';
|
|
import { io, type Socket } from 'socket.io-client';
|
|
import {
|
|
PRIORITY_LABELS,
|
|
SOCKET_EVENTS,
|
|
type GradeDto,
|
|
type HomeworkDto,
|
|
type NotificationDto,
|
|
type ServerToClientEvents,
|
|
} from '@classhelper/shared';
|
|
import { socketUrlOf } from '../config.js';
|
|
import { pushCallToIsland, pushHomeworkToIsland, pushNotificationToIsland } from '../island/bridge.js';
|
|
|
|
type RealtimeEventName = keyof ServerToClientEvents;
|
|
type EventHandler = (payload: unknown) => void;
|
|
|
|
/**
|
|
* 实时通道(学生端)。
|
|
* 与 Web 管理端使用同一套事件名;收到事件后除了通知用户,
|
|
* 还会把数据写回 IndexedDB,保证断网时看到的是最后同步到的内容。
|
|
*/
|
|
export const useRealtimeStore = defineStore('realtime', () => {
|
|
const connected = ref(false);
|
|
const connecting = ref(false);
|
|
const lastEventName = ref<string | null>(null);
|
|
const lastEventAt = ref<number | null>(null);
|
|
const eventCount = ref(0);
|
|
|
|
const handlers = new Map<string, Set<EventHandler>>();
|
|
let socket: Socket | null = null;
|
|
|
|
const statusText = computed(() => {
|
|
if (connected.value) return '实时连接正常';
|
|
if (connecting.value) return '正在连接服务器';
|
|
return '实时连接已断开';
|
|
});
|
|
|
|
function dispatch(event: string, payload: unknown): void {
|
|
for (const handler of handlers.get(event) ?? []) handler(payload);
|
|
}
|
|
|
|
function mark(event: string): void {
|
|
lastEventName.value = event;
|
|
lastEventAt.value = Date.now();
|
|
eventCount.value += 1;
|
|
}
|
|
|
|
function bind(instance: Socket): void {
|
|
instance.on('connect', () => {
|
|
connected.value = true;
|
|
connecting.value = false;
|
|
dispatch('__connected__', null);
|
|
});
|
|
instance.on('disconnect', () => {
|
|
connected.value = false;
|
|
dispatch('__disconnected__', null);
|
|
});
|
|
instance.on('connect_error', (error: Error) => {
|
|
connected.value = false;
|
|
connecting.value = false;
|
|
dispatch('__connect_error__', error.message);
|
|
});
|
|
|
|
instance.on(SOCKET_EVENTS.notificationNew, (payload: NotificationDto) => {
|
|
mark(SOCKET_EVENTS.notificationNew);
|
|
ElMessage({
|
|
message: `【${PRIORITY_LABELS[payload.priority] ?? payload.priority}】${payload.title}`,
|
|
type: payload.priority === 'URGENT' ? 'error' : 'info',
|
|
duration: 5000,
|
|
showClose: true,
|
|
});
|
|
// 投递到桌面灵动岛:紧急通知立即展开;上课期间的非紧急通知会暂存,下课后自动弹出
|
|
pushNotificationToIsland(payload);
|
|
dispatch(SOCKET_EVENTS.notificationNew, payload);
|
|
});
|
|
|
|
instance.on(SOCKET_EVENTS.homeworkNew, (payload: HomeworkDto) => {
|
|
mark(SOCKET_EVENTS.homeworkNew);
|
|
ElMessage.success(`新作业:${payload.title}`);
|
|
// 作业发布也上岛:胶囊提示"新作业",点击展开看截止时间与要求
|
|
pushHomeworkToIsland(payload);
|
|
dispatch(SOCKET_EVENTS.homeworkNew, payload);
|
|
});
|
|
|
|
instance.on(SOCKET_EVENTS.callNew, (payload: NotificationDto) => {
|
|
mark(SOCKET_EVENTS.callNew);
|
|
ElMessage({
|
|
message: payload.title,
|
|
type: 'warning',
|
|
duration: 8000,
|
|
showClose: true,
|
|
});
|
|
// 叫人:无论是否上课都立即展开(老师正在等这位同学)
|
|
pushCallToIsland(payload);
|
|
dispatch(SOCKET_EVENTS.callNew, payload);
|
|
});
|
|
|
|
instance.on(SOCKET_EVENTS.homeworkUpdated, (payload: HomeworkDto & { deleted?: boolean }) => {
|
|
mark(SOCKET_EVENTS.homeworkUpdated);
|
|
dispatch(SOCKET_EVENTS.homeworkUpdated, payload);
|
|
});
|
|
|
|
instance.on(SOCKET_EVENTS.gradeUpdated, (payload: GradeDto) => {
|
|
mark(SOCKET_EVENTS.gradeUpdated);
|
|
ElMessage.success(`成绩更新:${payload.examName} ${payload.score}/${payload.totalScore}`);
|
|
dispatch(SOCKET_EVENTS.gradeUpdated, payload);
|
|
});
|
|
|
|
instance.on(SOCKET_EVENTS.scheduleUpdated, (payload: unknown) => {
|
|
mark(SOCKET_EVENTS.scheduleUpdated);
|
|
dispatch(SOCKET_EVENTS.scheduleUpdated, payload);
|
|
});
|
|
}
|
|
|
|
function connect(serverUrl: string, token: string): void {
|
|
disconnect();
|
|
connecting.value = true;
|
|
socket = io(socketUrlOf(serverUrl), {
|
|
auth: { token, clientType: 'desktop' },
|
|
transports: ['websocket', 'polling'],
|
|
reconnection: true,
|
|
reconnectionDelay: 1500,
|
|
reconnectionDelayMax: 10000,
|
|
});
|
|
bind(socket);
|
|
}
|
|
|
|
function disconnect(): void {
|
|
socket?.removeAllListeners();
|
|
socket?.disconnect();
|
|
socket = null;
|
|
connected.value = false;
|
|
connecting.value = false;
|
|
}
|
|
|
|
function on(
|
|
event: RealtimeEventName | '__connected__' | '__disconnected__' | '__connect_error__',
|
|
handler: EventHandler,
|
|
): void {
|
|
const set = handlers.get(event) ?? new Set<EventHandler>();
|
|
set.add(handler);
|
|
handlers.set(event, set);
|
|
}
|
|
|
|
function off(
|
|
event: RealtimeEventName | '__connected__' | '__disconnected__' | '__connect_error__',
|
|
handler: EventHandler,
|
|
): void {
|
|
handlers.get(event)?.delete(handler);
|
|
}
|
|
|
|
return {
|
|
connected,
|
|
connecting,
|
|
statusText,
|
|
lastEventName,
|
|
lastEventAt,
|
|
eventCount,
|
|
connect,
|
|
disconnect,
|
|
on,
|
|
off,
|
|
};
|
|
});
|