baseline: 薪酬逻辑收口到 shared/payroll.js 后的当前全量状态

这是第一个包含完整工作区的提交,也是后续「拆 SFC / 上 Vite」的回滚基线。

此前的提交均为 index.html 单文件历史快照,由 .bak 文件重建。

当前状态(提交前已实测):
- index.html 内联薪酬算法已删除,改调 WHTPayroll
- shared/payroll.js 为唯一薪酬实现,浏览器与 Node 共用
- 对外接口未变:aggregateMonth / isCutEdge / payDayKind 等保留同名薄包装

未入库内容见 .gitignore:依赖、Chrome 验证 profile、验证截图、
运行时 sqlite 数据与日志、时间戳备份、.trash。
This commit is contained in:
OpenClaw Agent
2026-09-05 14:35:00 +08:00
parent 7d48c4ac65
commit 2329955e32
94 changed files with 12770 additions and 237 deletions
+146
View File
@@ -0,0 +1,146 @@
// 存储适配器:Cloudflare D1
//
// 与 sqlite-node.js 行为一致。差异只有两点:
// 1. D1 全异步,用 .bind().all()/.first()/.run()
// 2. 原子写入用 env.DB.batch()(整批在一个事务里),而不是手写 BEGIN/COMMIT
// rev 同样靠 `(SELECT rev FROM users WHERE id=?)` 在 SQL 内部取,保证批次内一致。
export class D1Store {
constructor(db) { this.db = db; }
async countUsers() {
const r = await this.db.prepare('SELECT COUNT(*) AS n FROM users').first();
return r ? r.n : 0;
}
async getUserByUsername(username) {
return await this.db.prepare('SELECT * FROM users WHERE username = ?').bind(username).first() || null;
}
async getUserById(id) {
return await this.db.prepare('SELECT * FROM users WHERE id = ?').bind(id).first() || null;
}
async createUser({ username, pwHash, pwSalt, pwIter, createdAt }) {
await this.db.prepare(
'INSERT INTO users (username, pw_hash, pw_salt, pw_iter, rev, created_at) VALUES (?,?,?,?,0,?)'
).bind(username, pwHash, pwSalt, pwIter, createdAt).run();
return this.getUserByUsername(username);
}
async createSession({ tokenHash, userId, createdAt, expiresAt }) {
await this.db.prepare(
'INSERT INTO sessions (token_hash, user_id, created_at, expires_at) VALUES (?,?,?,?)'
).bind(tokenHash, userId, createdAt, expiresAt).run();
}
async getSessionWithUser(tokenHash) {
const s = await this.db.prepare('SELECT * FROM sessions WHERE token_hash = ?').bind(tokenHash).first();
if (!s) return null;
const u = await this.db.prepare('SELECT * FROM users WHERE id = ?').bind(s.user_id).first();
if (!u) return null;
return { session: s, user: u };
}
async deleteSession(tokenHash) {
await this.db.prepare('DELETE FROM sessions WHERE token_hash = ?').bind(tokenHash).run();
}
async purgeExpiredSessions(nowIso) {
const r = await this.db.prepare('DELETE FROM sessions WHERE expires_at < ?').bind(nowIso).run();
return r.meta ? r.meta.changes : 0;
}
async getRev(userId) {
const r = await this.db.prepare('SELECT rev FROM users WHERE id = ?').bind(userId).first();
return r ? r.rev : 0;
}
async applyPush(userId, { records = [], adjust = [], settings = null }) {
const now = new Date().toISOString();
const NEW_REV = '(SELECT rev FROM users WHERE id = ?)';
const stmts = [this.db.prepare('UPDATE users SET rev = rev + 1 WHERE id = ?').bind(userId)];
const recSql = this.db.prepare(`
INSERT INTO records (user_id, day, status, shift_type, hours, contraband_found,
contraband_missed, other_penalty, penalty_reason, deleted, rev, updated_at)
VALUES (?,?,?,?,?,?,?,?,?,?,${NEW_REV},?)
ON CONFLICT(user_id, day) DO UPDATE SET
status=excluded.status, shift_type=excluded.shift_type, hours=excluded.hours,
contraband_found=excluded.contraband_found, contraband_missed=excluded.contraband_missed,
other_penalty=excluded.other_penalty, penalty_reason=excluded.penalty_reason,
deleted=excluded.deleted, rev=excluded.rev, updated_at=excluded.updated_at
`);
for (const r of records) {
stmts.push(recSql.bind(
userId, r.day,
r.deleted ? null : r.status,
r.deleted ? null : (r.shift_type ?? null),
r.deleted ? 0 : (r.hours ?? 0),
r.deleted ? 0 : (r.contraband_found ?? 0),
r.deleted ? 0 : (r.contraband_missed ?? 0),
r.deleted ? null : (r.other_penalty ?? null),
r.deleted ? '' : (r.penalty_reason ?? ''),
r.deleted ? 1 : 0,
userId, now
));
}
const adjSql = this.db.prepare(`
INSERT INTO month_adjust (user_id, month, status, final_amount, note, finalized_at, deleted, rev, updated_at)
VALUES (?,?,?,?,?,?,?,${NEW_REV},?)
ON CONFLICT(user_id, month) DO UPDATE SET
status=excluded.status, final_amount=excluded.final_amount, note=excluded.note,
finalized_at=excluded.finalized_at, deleted=excluded.deleted,
rev=excluded.rev, updated_at=excluded.updated_at
`);
for (const a of adjust) {
stmts.push(adjSql.bind(
userId, a.month,
a.deleted ? 'draft' : a.status,
a.deleted ? null : (a.final_amount ?? null),
a.deleted ? '' : (a.note ?? ''),
a.deleted ? '' : (a.finalized_at ?? ''),
a.deleted ? 1 : 0,
userId, now
));
}
if (settings) {
const cur = await this.db.prepare('SELECT json FROM settings WHERE user_id = ?').bind(userId).first();
let merged = settings;
if (cur) { try { merged = { ...JSON.parse(cur.json), ...settings }; } catch { merged = settings; } }
stmts.push(this.db.prepare(`
INSERT INTO settings (user_id, json, rev, updated_at) VALUES (?,?,${NEW_REV},?)
ON CONFLICT(user_id) DO UPDATE SET json=excluded.json, rev=excluded.rev, updated_at=excluded.updated_at
`).bind(userId, JSON.stringify(merged), userId, now));
}
await this.db.batch(stmts);
return this.getRev(userId);
}
async changesSince(userId, since) {
const [recs, adjs, st] = await Promise.all([
this.db.prepare('SELECT * FROM records WHERE user_id = ? AND rev > ?').bind(userId, since).all(),
this.db.prepare('SELECT * FROM month_adjust WHERE user_id = ? AND rev > ?').bind(userId, since).all(),
this.db.prepare('SELECT * FROM settings WHERE user_id = ? AND rev > ?').bind(userId, since).first()
]);
const records = {}, adjust = {};
for (const r of (recs.results || [])) records[r.day] = r;
for (const a of (adjs.results || [])) adjust[a.month] = a;
return { rev: await this.getRev(userId), records, adjust, settings: st ? JSON.parse(st.json) : null };
}
async fullDump(userId) {
const [recs, adjs, st] = await Promise.all([
this.db.prepare('SELECT * FROM records WHERE user_id = ? AND deleted = 0').bind(userId).all(),
this.db.prepare('SELECT * FROM month_adjust WHERE user_id = ? AND deleted = 0').bind(userId).all(),
this.db.prepare('SELECT * FROM settings WHERE user_id = ?').bind(userId).first()
]);
const records = {}, adjust = {};
for (const r of (recs.results || [])) records[r.day] = r;
for (const a of (adjs.results || [])) adjust[a.month] = a;
return { rev: await this.getRev(userId), records, adjust, settings: st ? JSON.parse(st.json) : null };
}
}