-
花名册外的负责人历史数据里对不上花名册的人名
+
花名册外的负责人
${sum.outside.length ? sum.outside.map((o) => `
@@ -3126,15 +3485,6 @@
`;
- const toolbar = `
-
-
- ${keywordInputHtml("stKeyword", "搜索姓名…", 200)}
-
-
- 在册 ${sum.total} 人
-
`;
-
const table = `
| 姓名 | 归属小组 | 人员归属 | 说明 |
@@ -3144,7 +3494,9 @@
${d.items.map((m) => `
|
|
`).join("")}
`;
const body = listCard({
title: "人员花名册",
- sub: "小组 / 归属 / 说明可直接在表内改",
- summary: `当前 ${d.items.length} 人 · 带项目 ${sum.with_project} 人 · 花名册外 ${sum.outside.length} 人`,
+ count: d.items.length,
fields: `
-
`,
+
+ ${keywordInputHtml("stKeyword", "搜索姓名…", 160)}`,
+ tools: `${canR("staff") ? `
` : ""}
+ ${canW("staff") ? `
` : ""}`,
rows: d.items,
table: table,
empty: state.keyword
@@ -3182,13 +3537,15 @@
: (state.staffGroup ? "「" + esc(state.staffGroup) + "」还没有人员" : "还没有人员"),
});
- host.innerHTML = toolbar + kpi + body;
+ host.innerHTML = kpi + body;
bindKeyword("stKeyword");
$("#stArchived").addEventListener("change", (e) => { state.staffArchived = e.target.value; renderStaff(); });
$("#stGroup").addEventListener("change", (e) => { state.staffGroup = e.target.value; renderStaff(); });
- $("#btnNewStaff").addEventListener("click", () => openStaffDialog(null));
- $("#btnExportStaff").addEventListener("click", () => download("/api/export/staff?archived=" + state.staffArchived));
+ const bn = $("#btnNewStaff");
+ if (bn) bn.addEventListener("click", () => openStaffDialog(null));
+ const bex = $("#btnExportStaff");
+ if (bex) bex.addEventListener("click", () => download("/api/export/staff?archived=" + state.staffArchived));
host.querySelectorAll("[data-sedit]").forEach((b) =>
b.addEventListener("click", () => {
const m = d.items.find((x) => x.id === Number(b.dataset.sedit));
@@ -3211,9 +3568,11 @@
host.querySelectorAll("[data-outside]").forEach((b) =>
b.addEventListener("click", () => openStaffDialog({ name: b.dataset.outside }))
);
+ const roStaff = !canW("staff");
host.querySelectorAll("tr[data-sid]").forEach((tr) => {
const id = Number(tr.dataset.sid);
- tr.querySelectorAll("[data-sf]").forEach((inp) =>
+ tr.querySelectorAll("[data-sf]").forEach((inp) => {
+ if (roStaff) { inp.disabled = true; return; }
inp.addEventListener("change", async () => {
const f = inp.dataset.sf;
try {
@@ -3221,33 +3580,238 @@
toast("已保存");
await afterWrite();
} catch (e) { toast("保存失败：" + e.message); }
- })
- );
+ });
+ });
+ });
+ }
+
+ /* ------------------------------------------------------ 权限管理（RBAC） */
+ /** 角色 = 一张「菜单 × 能改/只读」矩阵；用户挂一个角色。下拉改完即存，后端立刻生效。 */
+ async function renderRbac() {
+ const host = $("#view-rbac");
+ host.innerHTML = `
加载中…
`;
+ const [meta, roles, users] = await Promise.all([
+ api("/rbac/meta"), api("/rbac/roles"), api("/rbac/users"),
+ ]);
+ const rw = canW("rbac");
+ const menus = meta.menus;
+ const save = async (fn) => {
+ try { await fn(); } catch (e) { toast("保存失败：" + e.message); }
+ await renderRbac();
+ };
+
+ const levelCell = (role, m) => {
+ const cur = (role.menus || {})[m.key] || "";
+ return `
| `;
+ };
+ const roleTable = `
+
+ | 角色 / 说明 |
+ ${menus.map((m) => ``).join("")}
+ 用户 |
+ ${rw ? `操作 | ` : ""}
+
+ ${roles.map((r) => `
+ | ${esc(r.name)}${r.is_builtin ? ` 内置` : ""}${r.description ? `${esc(r.description)}` : ""} |
+ ${menus.map((m) => levelCell(r, m)).join("")}
+ ${r.user_count} |
+ ${rw ? `
+
+ ${r.is_builtin ? "" : ``}
+ | ` : ""}
+
`).join("")}
+
`;
+
+ const roleOpts = (sel) => roles.map((r) =>
+ `
`).join("");
+ const userTable = `
+
+ | 姓名 | 登录账号 | 角色 | 可用菜单 | 最近登录 |
+ ${rw ? `操作 | ` : ""}
+
+ ${users.map((u) => {
+ const self = u.id === state.me.id;
+ return `
+ ${esc(u.name)}${self ? ` 我自己` : ""}${u.active ? "" : ` 已停用`} |
+ ${esc(u.username)} |
+ |
+ ${u.menus ? Object.keys(u.menus).length : 0} |
+ ${esc(u.last_login_at ? u.last_login_at.replace("T", " ").slice(0, 16) : "从未登录")} |
+ ${rw ? `
+
+ ${self ? "" : `
+
+ `}
+ | ` : ""}
+ `;
+ }).join("")}
+
`;
+
+ host.innerHTML =
+ listCard({
+ title: "角色权限", count: roles.length, rows: roles, table: roleTable, empty: "还没有角色",
+ tools: rw ? `
` : "",
+ }) +
+ `
` +
+ listCard({
+ title: "用户", count: users.length, rows: users, table: userTable, empty: "还没有用户",
+ tools: rw ? `
` : "",
+ });
+
+ // ---- 权限矩阵：一个角色的整行一起提交 ----
+ host.querySelectorAll("[data-rmenu]").forEach((sel) =>
+ sel.addEventListener("change", () => {
+ const rid = Number(sel.dataset.rmenu);
+ const mine = state.me.role_id === rid;
+ 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("已更新你所在角色的权限，刷新页面后生效");
+ });
+ })
+ );
+ const bnr = $("#btnNewRole");
+ if (bnr) bnr.addEventListener("click", () => openRoleDialog(null));
+ host.querySelectorAll("[data-redit]").forEach((b) =>
+ b.addEventListener("click", () => openRoleDialog(roles.find((x) => x.id === Number(b.dataset.redit))))
+ );
+ host.querySelectorAll("[data-rdel]").forEach((b) =>
+ b.addEventListener("click", async () => {
+ const r = roles.find((x) => x.id === Number(b.dataset.rdel));
+ const ok = await confirmDialog({ title: "删除角色", danger: true, okText: "确认删除",
+ body: `
确认删除角色 ${esc(r.name)}？该角色下不能还有用户。
` });
+ if (ok) save(() => del("/rbac/roles/" + r.id));
+ })
+ );
+
+ // ---- 用户 ----
+ const bnu = $("#btnNewUser");
+ if (bnu) bnu.addEventListener("click", () => openUserDialog(null, roles));
+ host.querySelectorAll("[data-urole]").forEach((sel) =>
+ sel.addEventListener("change", () =>
+ save(() => patch("/rbac/users/" + Number(sel.dataset.urole), { role_id: Number(sel.value) }))
+ )
+ );
+ host.querySelectorAll("[data-upw]").forEach((b) =>
+ b.addEventListener("click", () =>
+ openPasswordReset(users.find((x) => x.id === Number(b.dataset.upw)))
+ )
+ );
+ 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 }));
+ })
+ );
+ host.querySelectorAll("[data-udel]").forEach((b) =>
+ b.addEventListener("click", async () => {
+ const u = users.find((x) => x.id === Number(b.dataset.udel));
+ const ok = await confirmDialog({ title: "删除用户", danger: true, okText: "确认删除",
+ body: `
确认删除用户 ${esc(u.name)}（${esc(u.username)}）？该账号会立即下线。
` });
+ if (ok) save(() => del("/rbac/users/" + u.id));
+ })
+ );
+ }
+
+ /** 角色只影响「能看哪些菜单」，名称说明在这里改，菜单授权在矩阵里勾 */
+ function openRoleDialog(role) {
+ const isNew = !role;
+ openModal(
+ `
${isNew ? "新建角色" : "修改角色"}
+
+
+
+ ${isNew ? `
新建后默认不带任何菜单权限，保存后在矩阵里逐项勾选。
` : ""}
+
+
+ `
+ );
+ $("#mOk").addEventListener("click", async () => {
+ const name = $("#rlName").value.trim();
+ if (!name) return modalError("请填写角色名");
+ const body = { name: name, description: $("#rlDesc").value.trim() };
+ try {
+ if (isNew) await post("/rbac/roles", { name: body.name, description: body.description, menus: {} });
+ else await patch("/rbac/roles/" + role.id, body);
+ closeModal();
+ toast(isNew ? "已新建角色，在矩阵里勾选菜单即可授权" : "已保存");
+ await renderRbac();
+ } catch (e) { modalError(e.message); }
+ });
+ }
+
+ function openUserDialog(user, roles) {
+ const isNew = !user;
+ const u = user || {};
+ openModal(
+ `
${isNew ? "新建用户" : "编辑用户"}
+
+
+
换角色会强制该账号重新登录，权限立即按新角色生效。
+
+
+ `
+ );
+ $("#mOk").addEventListener("click", async () => {
+ const name = $("#usName").value.trim();
+ if (!name) return modalError("请填写姓名");
+ const btn = $("#mOk");
+ btn.disabled = true;
+ try {
+ if (isNew) {
+ const username = $("#usUser").value.trim();
+ const password = $("#usPass").value.trim();
+ if (!username) return void (btn.disabled = false, modalError("请填写登录账号"));
+ await post("/rbac/users", { name: name, username: username, password: password, role_id: Number($("#usRole").value), active: true });
+ } else {
+ await patch("/rbac/users/" + u.id, { name: name });
+ }
+ closeModal();
+ toast(isNew ? `已新建用户「${name}」` : "已保存");
+ await renderRbac();
+ } catch (e) { btn.disabled = false; modalError(e.message); }
+ });
+ }
+
+ function openPasswordReset(user) {
+ openModal(
+ `
重置密码
+
+
给 ${esc(user.name)}（${esc(user.username)}）设置新密码。
+
+
重置后该用户的其他登录全部失效，需要用新密码重新登录。
+
+
+ `
+ );
+ $("#mOk").addEventListener("click", async () => {
+ try {
+ await patch("/rbac/users/" + user.id, { password: $("#rsPass").value.trim() });
+ closeModal();
+ toast(`已重置「${user.name}」的密码`);
+ } catch (e) { modalError(e.message); }
});
}
/* ---------------------------------------------------------------- shell */
async function loadCategories() {
+ // 侧栏的分类筛选器已下线，这里只给「自研产品」子 header 上的分类下拉供数据
+ if (!canR("projects")) { state.categories = []; return; }
state.categories = await api("/categories");
- const box = $("#sideCategories");
- box.innerHTML =
- `
` +
- state.categories.map((c) => `
-
`).join("");
- box.querySelectorAll("[data-cat]").forEach((b) =>
- b.addEventListener("click", () => {
- state.categoryId = b.dataset.cat === "" ? null : Number(b.dataset.cat);
- loadCategories();
- if (state.view === "board") renderBoard(); else if (state.view === "projects") renderProjects();
- })
- );
}
function setView(view) {
+ if (!can(view)) view = firstAllowedView();
+ if (!view) { hostNoPermission(); return; }
state.view = view;
saveUI();
$$("#nav .nav-item").forEach((b) => b.classList.toggle("active", b.dataset.view === view));
@@ -3266,10 +3830,10 @@
else if (v === "staff") await renderStaff();
else if (v === "intake") await renderIntake();
else if (v === "settings") await renderSettings();
+ else if (v === "rbac") await renderRbac();
} catch (e) {
$("#view-" + v).innerHTML = `
加载失败：${esc(e.message)}
`;
}
- $("#sideFoot").innerHTML = `当前周期：${esc(scopeLabel())}
共 ${state.periods.weeks.length} 个周期 / ${state.periods.months.length} 个月`;
}
/** 写操作统一收尾：刷新侧栏计数 + 当前视图。
@@ -3303,7 +3867,6 @@
renderPeriodSelect();
refresh();
});
- $("#sideKeyOnly").addEventListener("change", (e) => { state.keyOnly = e.target.checked; refresh(); });
$("#btnIntake").addEventListener("click", () => setView("intake"));
$("#drawerClose").addEventListener("click", closeDrawer);
bindDrawerPeople();
@@ -3326,9 +3889,9 @@
/* ------------------------------------------- 界面状态（刷新后保持） */
const UI_KEY = "unis.ui.v1";
- const UI_FIELDS = ["view", "gran", "weekId", "monthIdx", "categoryId", "keyOnly", "keyword",
+ const UI_FIELDS = ["view", "gran", "weekId", "monthIdx", "categoryId", "keyword",
"projOwner", "projIdleOnly", "showArchived", "focusFilter", "focusArchived",
- "customTab", "customArchived", "customRegion", "customOrigin", "customAcceptPlan", "customSort", "staffArchived", "staffGroup"];
+ "customTab", "customArchived", "customRegion", "customOrigin", "customSort", "staffArchived", "staffGroup"];
function saveUI() {
const o = {};
@@ -3341,21 +3904,39 @@
try { o = JSON.parse(sessionStorage.getItem(UI_KEY) || "null"); } catch (e) { o = null; }
if (!o) return;
UI_FIELDS.forEach((k) => { if (k in o) state[k] = o[k]; });
- if (["board", "projects", "custom", "focus", "staff", "intake", "settings"].indexOf(state.view) < 0) state.view = "board";
+ if (["board", "projects", "custom", "focus", "staff", "intake", "settings", "rbac"].indexOf(state.view) < 0) state.view = "board";
if (state.gran !== "month") state.gran = "week";
if (state.focusFilter === "later") state.focusFilter = "week";
}
+ function hostNoPermission() {
+ document.querySelector(".views").innerHTML =
+ `
当前角色没有分配任何功能菜单，请联系管理员在「权限管理」里授权。
`;
+ }
+
async function main() {
restoreUI();
+ bindAuthForm();
+ try {
+ state.me = await api("/auth/me");
+ } catch (e) {
+ if (e.status === 401) return showAuthGate(); // 首次访问：切到登录页但不显示报错
+ throw e;
+ }
+ if (!state.me.menus || !Object.keys(state.me.menus).length) {
+ bindShell();
+ renderUserChip();
+ return hostNoPermission();
+ }
state.meta = await api("/meta");
- await loadStaff();
await loadPeriods();
+ await loadStaff();
await loadCategories();
bindShell();
+ renderUserChip();
+ applyNavPermissions();
// 恢复出来的视图状态要回写到顶栏/侧栏控件上
$$("#granSeg .seg-btn").forEach((x) => x.classList.toggle("active", x.dataset.gran === state.gran));
- $("#sideKeyOnly").checked = !!state.keyOnly;
$("#globalSearch").value = state.keyword || "";
setView(state.view);
}
diff --git a/web/icons.js b/web/icons.js
index c6c5e5f..6d595c3 100644
--- a/web/icons.js
+++ b/web/icons.js
@@ -23,6 +23,8 @@
"chevron-left": '
',
"chevron-right": '
',
"chevron-down": '
',
+ "chevron-up": '
',
+ "log-out": '
',
"arrow-right": '
',
search: '
',
download: '
',
diff --git a/web/index.html b/web/index.html
index ed80203..22157a4 100644
--- a/web/index.html
+++ b/web/index.html
@@ -19,28 +19,17 @@
-
-
-
-
-
-
-
+
@@ -69,6 +58,7 @@
+