fix(homework,island,verify): 全屏作业看板自适应 + 已安装副本覆盖升级 + 新增打包版冒烟
① 全屏作业看板自适应（用户反馈：全屏模式没有自适应，卡片挤在左上角） - 全屏看板按「可用宽 × 可用高」枚举 1..N 列，取**单卡面积最大且宽高比最接近 1.15** 的方案， 注入 `--board-cols`（不再靠 CSS auto-fit 猜）；列数变了再量一次缩放系数， `transform-origin: top center` 保证整体居中、不溢出屏幕 - 两个全屏弹窗各自持有 ref（原来共用同名 ref，后挂载的会覆盖前一个，量到的是另一个弹窗）； 列表型「单个科目全屏」补上 `transform: scale()`（该规则原先只作用于 `.board`，列表全屏从未缩放） - 弹窗 `@opened` 后轮询等待布局就绪（最多 20×60ms）再计算；窗口 resize 时自动重算； 另加一条全局 `.board-fullscreen .el-dialog__body` 兜底，保证内容区铺满整屏 - 实测：6 个科目 → 3 列、排版宽 1155px（视口 1187px）、可视底 678px（视口高 765px） ② 「灵动岛设置没办法生效」的真正原因：用户机器上的副本一直没被更新 - 学生端实际运行的是安装目录 `D:\class\@classhelperdesktop-client` 里的 `resources/app.asar`， 而 `pnpm dist:win` 只更新 `release/`；只发新版 release 不动安装目录，用户看到的还是旧界面 - 已就地覆盖升级该目录，并用同一套冒烟实测**那个副本**：`packaged: true`、76/76 全绿 - README 补充「把修复交付到已安装的客户端」步骤（robocopy 覆盖 + verify:packaged 实测） ③ 新增/加固自动化验证 - `verify:desktop` 新增「作业看板全屏自适应（铺满屏幕、内容不溢出）」：进作业页 → 切看板 → 打开全屏 → 断言排版宽铺满视口、可视底不超出屏幕；再把卡片补到 6 张触发 resize， 要求列数自动变多（1 → 3）且仍不溢出 - 点击/命中这类异步链路由"固定 sleep 后读一次"改为**轮询等待**（曾偶发误判为"点不开"）， 失败时把渲染进程当前类名、窗口可见性、岛体矩形写进结论，便于区分真 bug 与竞态 - 新增 `pnpm verify:packaged`：对**打包后/已安装**的 EXE 跑同一套冒烟（含二次启动校验文件锁）， 避免"开发产物全绿但交付给学生的 EXE 是旧的"这类问题 - 实测：`verify:desktop` 76/76（离线复跑 68/68）；`verify:packaged` 对 `release/win-unpacked` 与 `D:\class\@classhelperdesktop-client` 均 76/76、`packaged: true`； `verify:e2e` 149/149（安装实例）；`typecheck` / `lint` / `format:check` 全绿
This commit is contained in:
LoveChengke committed
1 parent
11008928a1
commit
0ff2dc228b
7 files changed
+466
-67
No files matched your search
@@ -0,0 +1,136 @@
|
||||
/**
|
||||
* 打包版冒烟验证：对**已打包**的客户端 EXE 跑一遍与 `pnpm verify:desktop` 相同的自检。
|
||||
*
|
||||
* 为什么需要单独一条：开发产物（`dist/`）通过不代表打包产物通过 —— asar 打包后
|
||||
* 资源路径、Electron 版本、`app.isPackaged` 都可能不同。交付前应实测 `packaged: true`。
|
||||
*
|
||||
* 用法：
|
||||
* node scripts/verify-packaged.mjs
|
||||
* node scripts/verify-packaged.mjs --exe "D:\class\@classhelperdesktop-client\班级小助手.exe"
|
||||
* node scripts/verify-packaged.mjs --offline
|
||||
* node scripts/verify-packaged.mjs --code G101 --password 123456
|
||||
*
|
||||
* 联网用例需要后端在 http://127.0.0.1:4000（默认自动探测；探测不到时退化为离线用例）。
|
||||
* 退出码：0 = 两次启动都全绿且 `packaged: true`。
|
||||
*/
|
||||
import { spawn } from 'node:child_process';
|
||||
import fs from 'node:fs';
|
||||
import path from 'node:path';
|
||||
import { fileURLToPath } from 'node:url';
|
||||
import { resolveElectronEnv } from './lib/electron-env.mjs';
|
||||
|
||||
const repoRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..');
|
||||
const argv = process.argv.slice(2);
|
||||
const argOf = (name) => {
|
||||
const index = argv.indexOf(name);
|
||||
return index >= 0 ? argv[index + 1] : undefined;
|
||||
};
|
||||
|
||||
const exe = path.resolve(
|
||||
argOf('--exe') ?? path.join(repoRoot, 'packages/desktop-client/release/win-unpacked/班级小助手.exe'),
|
||||
);
|
||||
const classCode = argOf('--code') ?? process.env.ELECTRON_SMOKE_CLASS_CODE ?? 'G101';
|
||||
const classPassword = argOf('--password') ?? process.env.ELECTRON_SMOKE_CLASS_PASSWORD ?? '123456';
|
||||
const forceOffline = argv.includes('--offline');
|
||||
|
||||
if (!fs.existsSync(exe)) {
|
||||
console.error(`[packaged-smoke] 找不到打包后的 EXE：${exe}`);
|
||||
console.error('[packaged-smoke] 先执行 pnpm dist:win，或用 --exe 指定已安装的客户端路径');
|
||||
process.exit(2);
|
||||
}
|
||||
|
||||
let online = forceOffline ? '0' : null;
|
||||
if (online === null) {
|
||||
online = '0';
|
||||
try {
|
||||
const controller = new AbortController();
|
||||
const timer = setTimeout(() => controller.abort(), 2500);
|
||||
const response = await fetch('http://127.0.0.1:4000/api/health', { signal: controller.signal });
|
||||
clearTimeout(timer);
|
||||
online = response.ok ? '1' : '0';
|
||||
} catch {
|
||||
online = '0';
|
||||
}
|
||||
}
|
||||
|
||||
// 独立 userData：用户开着客户端也能跑验证（不抢单实例锁）
|
||||
const profileDir = path.join(repoRoot, '.cache', `packaged-smoke-profile-${process.pid}`);
|
||||
const resultFile = path.join(repoRoot, '.cache', `packaged-smoke-${process.pid}.json`);
|
||||
fs.rmSync(profileDir, { recursive: true, force: true, maxRetries: 2, retryDelay: 200 });
|
||||
|
||||
console.log(`[packaged-smoke] EXE：${exe}`);
|
||||
console.log(`[packaged-smoke] 联网用例：${online === '1' ? '启用' : '关闭'}`);
|
||||
console.log(`[packaged-smoke] 独立配置目录：${profileDir}\n`);
|
||||
|
||||
/** 启动一次打包版冒烟（stdio 继承：EXE 是 GUI 进程，输出直接透传到终端） */
|
||||
function launch(extraEnv) {
|
||||
return new Promise((resolve) => {
|
||||
const child = spawn(exe, [], {
|
||||
cwd: path.dirname(exe),
|
||||
stdio: 'inherit',
|
||||
env: resolveElectronEnv({
|
||||
ELECTRON_SMOKE_TEST: '1',
|
||||
ELECTRON_SMOKE_PROFILE: profileDir,
|
||||
ELECTRON_SMOKE_ONLINE: online,
|
||||
ELECTRON_SMOKE_CLASS_CODE: classCode,
|
||||
ELECTRON_SMOKE_CLASS_PASSWORD: classPassword,
|
||||
...extraEnv,
|
||||
}),
|
||||
});
|
||||
child.on('exit', (code) => resolve(code ?? 1));
|
||||
});
|
||||
}
|
||||
|
||||
const readResult = () => {
|
||||
try {
|
||||
return JSON.parse(fs.readFileSync(resultFile, 'utf8'));
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
};
|
||||
|
||||
fs.rmSync(resultFile, { force: true });
|
||||
const firstCode = await launch({ ELECTRON_SMOKE_RESULT: resultFile });
|
||||
const first = readResult();
|
||||
const firstPassed = first?.passed ?? -1;
|
||||
const firstTotal = first?.total ?? -1;
|
||||
|
||||
// 退出后再启动一次：证明单实例锁与文件句柄都已释放（与开发版冒烟同一套判据）
|
||||
let lockReleased = true;
|
||||
try {
|
||||
fs.rmSync(profileDir, { recursive: true, force: true, maxRetries: 2, retryDelay: 200 });
|
||||
} catch (error) {
|
||||
lockReleased = false;
|
||||
console.error(`[packaged-smoke] [FAIL] 退出后配置文件锁未释放：${error?.message ?? error}`);
|
||||
}
|
||||
console.log('\n[packaged-smoke] 二次启动校验（单实例锁 / 句柄是否已释放）...');
|
||||
fs.rmSync(resultFile, { force: true });
|
||||
const secondCode = await launch({ ELECTRON_SMOKE_ONLINE: '0', ELECTRON_SMOKE_RESULT: resultFile });
|
||||
const second = readResult();
|
||||
|
||||
const ok =
|
||||
firstCode === 0 &&
|
||||
first?.ok === true &&
|
||||
first?.packaged === true &&
|
||||
firstPassed === firstTotal &&
|
||||
lockReleased &&
|
||||
secondCode === 0 &&
|
||||
second?.ok === true &&
|
||||
second?.packaged === true;
|
||||
|
||||
console.log(
|
||||
`\n[packaged-smoke] 首次启动：${firstPassed}/${firstTotal} packaged=${first?.packaged === true} code=${firstCode}`,
|
||||
);
|
||||
console.log(
|
||||
`[packaged-smoke] 二次启动：${second?.passed ?? -1}/${second?.total ?? -1} ` +
|
||||
`packaged=${second?.packaged === true} code=${secondCode} 文件锁已释放=${lockReleased}`,
|
||||
);
|
||||
console.log(ok ? '[packaged-smoke] [PASS] 打包版全绿' : '[packaged-smoke] [FAIL] 打包版未全绿');
|
||||
|
||||
try {
|
||||
fs.rmSync(profileDir, { recursive: true, force: true, maxRetries: 2, retryDelay: 200 });
|
||||
} catch {
|
||||
// 清理失败不影响结论（第一次删除已证明锁已释放）
|
||||
}
|
||||
|
||||
process.exit(ok ? 0 : 1);
|
||||
Reference in new issue
Block a user