权限管理:行内写操作补齐成功提示,统一全站写反馈;清理开发库僵尸会话
parent
b49501464b
commit
4c29b016cc
|
|
@ -39,6 +39,8 @@
|
|||
- 浏览器端逐个点 8 个主菜单与全部子页签:console 无报错,`pageOverflow=0`。
|
||||
- 清掉开发库里 **51 条脚本产生的会话**(Python-urllib / curl / testclient / UA 为空),只留 1 条真实浏览器会话,「在线会话」列表恢复可信。
|
||||
- 新增 `.gitignore`(`.venv/`、`__pycache__/`、`*.pyc`、`.pytest_cache/`、`data/*.bak*`、`.DS_Store`),并把误跟踪的 `app/**/__pycache__/*.pyc` 从索引里移除。
|
||||
- **权限管理的行内写操作补上成功提示**(原来改矩阵 / 删角色 / 启停用户 / 下线会话 / 清空日志都是「静默成功」,和全站「写操作必提示」的惯例不一致 = 不明确):`renderRbac` 的 `save(fn, okMsg)` 统一在成功后提示,失败仍然重渲染把界面退回服务端真值;重置密码后补刷新列表(在线数会变)。UI 实测:新建角色 → 勾一格权限 → 删除角色,提示依次为「已新建角色…」「已更新「临时体检角色」的权限」「已删除角色「临时体检角色」」,角色数回到 3,console 无报错。
|
||||
- 全站扫描过一遍写操作的成功反馈:其余模块(更新录入 / 项目与定制项目新建修改 / 重点工作 / 周期 / 花名册 / 设置 / 年度目标)都已有 toast,无遗漏。
|
||||
|
||||
## 环境小抄(macOS)
|
||||
|
||||
|
|
|
|||
BIN
data/board.db
BIN
data/board.db
Binary file not shown.
29
web/app.js
29
web/app.js
|
|
@ -3510,9 +3510,11 @@
|
|||
api("/rbac/meta"), api("/rbac/roles"), api("/rbac/users"),
|
||||
]);
|
||||
const rw = canW("rbac");
|
||||
const save = async (fn) => {
|
||||
try { await fn(); } catch (e) { toast("保存失败:" + e.message); }
|
||||
await renderRbac();
|
||||
const save = async (fn, okMsg) => {
|
||||
let done = true;
|
||||
try { await fn(); } catch (e) { toast("保存失败:" + e.message); done = false; }
|
||||
if (done && okMsg) toast(okMsg);
|
||||
await renderRbac(); // 失败也要重渲染,把界面退回服务端的真值
|
||||
};
|
||||
let sessions = [], logs = { total: 0, items: [] };
|
||||
if (tab === "sessions") sessions = await api("/rbac/sessions");
|
||||
|
|
@ -3574,12 +3576,12 @@
|
|||
host.querySelectorAll("[data-rmenu]").forEach((sel) =>
|
||||
sel.addEventListener("change", () => {
|
||||
const rid = Number(sel.dataset.rmenu);
|
||||
const role = roles.find((x) => x.id === rid);
|
||||
const mine = (state.me.role_ids || []).indexOf(rid) >= 0;
|
||||
const next = {};
|
||||
sel.closest("tr").querySelectorAll("[data-rmenu]").forEach((x) => { if (x.value) next[x.dataset.menu] = x.value; });
|
||||
save(() => patch("/rbac/roles/" + rid, { menus: next })).then(() => {
|
||||
if (mine) toast("已更新你所在角色的权限,刷新页面后生效");
|
||||
});
|
||||
save(() => patch("/rbac/roles/" + rid, { menus: next }),
|
||||
mine ? "已更新你所在角色的权限,刷新页面后生效" : `已更新「${role ? role.name : "角色"}」的权限`);
|
||||
})
|
||||
);
|
||||
const bnr = $("#btnNewRole");
|
||||
|
|
@ -3592,7 +3594,7 @@
|
|||
const r = roles.find((x) => x.id === Number(b.dataset.rdel));
|
||||
const ok = await confirmDialog({ title: "删除角色", danger: true, okText: "确认删除",
|
||||
body: `<p style="margin:0">确认删除角色 <b>${esc(r.name)}</b>?该角色下不能还有用户。</p>` });
|
||||
if (ok) save(() => del("/rbac/roles/" + r.id));
|
||||
if (ok) save(() => del("/rbac/roles/" + r.id), `已删除角色「${r.name}」`);
|
||||
})
|
||||
);
|
||||
}
|
||||
|
|
@ -3647,13 +3649,15 @@
|
|||
const u = find(b.dataset.urevoke);
|
||||
const ok = await confirmDialog({ title: "强制下线", okText: "确认下线",
|
||||
body: `<p style="margin:0">下线 <b>${esc(u.name)}</b>(${esc(u.username)})的所有登录?该账号需要重新登录。</p>` });
|
||||
if (ok) save(() => post("/rbac/users/" + u.id + "/revoke", {}));
|
||||
if (ok) save(() => post("/rbac/users/" + u.id + "/revoke", {}), `已下线「${u.name}」的全部登录`);
|
||||
})
|
||||
);
|
||||
host.querySelectorAll("[data-uactive]").forEach((b) =>
|
||||
b.addEventListener("click", () => {
|
||||
const on = b.dataset.on === "1";
|
||||
save(() => patch("/rbac/users/" + Number(b.dataset.uactive), { active: !on }));
|
||||
const u = find(b.dataset.uactive);
|
||||
save(() => patch("/rbac/users/" + Number(b.dataset.uactive), { active: !on }),
|
||||
`${on ? "已停用" : "已启用"}「${u ? u.name : "该用户"}」`);
|
||||
})
|
||||
);
|
||||
host.querySelectorAll("[data-udel]").forEach((b) =>
|
||||
|
|
@ -3661,7 +3665,7 @@
|
|||
const u = find(b.dataset.udel);
|
||||
const ok = await confirmDialog({ title: "删除用户", danger: true, okText: "确认删除",
|
||||
body: `<p style="margin:0">确认删除用户 <b>${esc(u.name)}</b>(${esc(u.username)})?该账号会立即下线。</p>` });
|
||||
if (ok) save(() => del("/rbac/users/" + u.id));
|
||||
if (ok) save(() => del("/rbac/users/" + u.id), `已删除用户「${u.name}」`);
|
||||
})
|
||||
);
|
||||
}
|
||||
|
|
@ -3692,7 +3696,7 @@
|
|||
function bindRbacSessions(host, rw, save) {
|
||||
if (!rw) return;
|
||||
host.querySelectorAll("[data-kick]").forEach((b) =>
|
||||
b.addEventListener("click", () => save(() => del("/rbac/sessions/" + encodeURIComponent(b.dataset.kick))))
|
||||
b.addEventListener("click", () => save(() => del("/rbac/sessions/" + encodeURIComponent(b.dataset.kick)), "已下线该会话"))
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -3761,7 +3765,7 @@
|
|||
if (cl) cl.addEventListener("click", async () => {
|
||||
const ok = await confirmDialog({ title: "清空操作日志", danger: true, okText: "确认清空",
|
||||
body: `<p style="margin:0">将删除全部操作日志,<b>删除后无法恢复</b>。</p>` });
|
||||
if (ok) save(() => del("/rbac/logs"));
|
||||
if (ok) save(() => del("/rbac/logs"), "已清空操作日志");
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -3853,6 +3857,7 @@
|
|||
await patch("/rbac/users/" + user.id, { password: $("#rsPass").value.trim() });
|
||||
closeModal();
|
||||
toast(`已重置「${user.name}」的密码`);
|
||||
await renderRbac();
|
||||
} catch (e) { modalError(e.message); }
|
||||
});
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue