diff --git a/docs/screenshots/admin-users-batch-ui.png b/docs/screenshots/admin-users-batch-ui.png new file mode 100644 index 0000000..6d68eb5 Binary files /dev/null and b/docs/screenshots/admin-users-batch-ui.png differ diff --git a/source/www/admin.html b/source/www/admin.html index 9d5054d..5ea6605 100644 --- a/source/www/admin.html +++ b/source/www/admin.html @@ -97,6 +97,29 @@ tbody tr:hover{background:#fafbfd} .empty{text-align:center;color:var(--muted);padding:34px 0 !important;font-size:13px} + /* ---------- 筛选 / 批量操作条 ---------- */ + /* 两条工具条和表格同属一个面板:用更浅的底色 + 内缩把它们跟表格区分开, + 但不用边框——面板里再套边框会显得很碎 */ + .toolbar{display:flex;gap:10px;flex-wrap:wrap;align-items:center; + background:#f8fafc;border:1px solid var(--border);border-radius:var(--radius); + padding:10px 12px;margin-bottom:10px} + .toolbar .grow{flex:1;min-width:180px} + .toolbar input[type=text],.toolbar select{width:auto;min-width:120px;padding:6px 9px;font-size:12.5px} + .toolbar .grow input[type=text]{width:100%} + .toolbar .sep{width:1px;height:22px;background:var(--border);margin:0 2px} + .toolbar .checkbox{padding-bottom:0;font-size:12.5px} + .toolbar .hint{color:var(--muted);font-size:12.5px} + + /* 行内编辑:单元格里的小输入框,Enter 保存 / Esc 取消 */ + .inline-edit{display:flex;gap:6px;align-items:center} + .inline-edit input{padding:4px 8px;font-size:12.5px;min-width:110px;width:auto;flex:1} + .edit-trigger{cursor:pointer;border-bottom:1px dashed var(--border-strong);padding-bottom:1px} + .edit-trigger:hover{border-bottom-color:var(--accent);color:var(--accent)} + td.col-chk,th.col-chk{width:34px;padding-right:0} + td.col-chk input,th.col-chk input{width:15px;height:15px;accent-color:var(--accent);cursor:pointer} + tr.row-locked{background:#fff8f8} + tr.row-locked:hover{background:#fff2f2} + .badge{display:inline-block;padding:2px 8px;border-radius:20px;font-size:12px;line-height:18px;white-space:nowrap} .b-ok{background:var(--ok-bg);color:var(--ok-fg)} .b-warn{background:var(--warn-bg);color:var(--warn-fg)} @@ -213,12 +236,46 @@
-

账号列表

-
API Key 完整值在创建时展示一次;此处可复制或重置。角色的「部门 / 用户组 / 邮箱」列由账号数据直出—— - 在线编辑这三项的可视化维护是待执行项,当前可用接口 /api/admin/users/profile 与 - /api/admin/users/role 直接改(见 docs/roadmap.md)。
+

账号列表

+
部门 / 用户组 / 邮箱会直接进 OIDC claims 与 IAP 注入头 X-Auth-*,是下游系统授权的依据: + 点表格里的部门与用户组可就地编辑;勾选多个账号后用下面的批量条一次改完。 + API Key 完整值在创建时展示一次;此处可复制或重置。
+ +
+
+ + + + + +
+ +
+ 已选 0 个账号 + + + + + + + + + +
+ + + + @@ -355,7 +412,12 @@ export OAUTH_ISSUER=https://sso.example.com (function () { "use strict"; - var state = { me: null, users: [], departments: [], groups: [], oauthClients: [], endpoints: {} }; + var state = { + me: null, users: [], departments: [], groups: [], oauthClients: [], endpoints: {}, + filter: { keyword: "", role: "", department: "", group: "", locked: false }, + // 用 Set 存勾选:账号名是主键,天然唯一;渲染时按当前筛选结果取交集 + selected: new Set() + }; function arr(v) { return Array.isArray(v) ? v : []; } @@ -477,11 +539,68 @@ export OAUTH_ISSUER=https://sso.example.com $("statDepts").textContent = state.departments.length; $("statGroups").textContent = state.groups.length; + renderFilters(); renderUsers(); renderEndpoints(); renderOAuthClients(); } + // ---------------- 筛选 ---------------- + // 部门 / 用户组的下拉取值来自账号数据的"已有取值"(后端 /api/admin/users 回显), + // 不单独维护字典表——同一个人手输成「研发部 / 研发中心」两种写法的问题靠这里收敛。 + function renderFilters() { + fillOptions("fDept", state.departments, "全部部门"); + fillOptions("fGroup", state.groups, "全部用户组"); + $("deptOptions").innerHTML = state.departments.map(function (d) { + return ""; + }).join(""); + $("groupOptions").innerHTML = state.groups.map(function (g) { + return ""; + }).join(""); + } + + function fillOptions(id, values, allLabel) { + var sel = $(id); + var cur = sel.value; + sel.innerHTML = "" + + values.map(function (v) { + return ""; + }).join(""); + // 刷新后保留用户已选的筛选项(数据重载不该把筛选条件清空) + if (values.indexOf(cur) !== -1) sel.value = cur; + } + + function filteredUsers() { + var f = state.filter; + var kw = f.keyword.trim().toLowerCase(); + return state.users.filter(function (u) { + if (f.role === "admin" && !u.is_admin) return false; + if (f.role === "user" && u.is_admin) return false; + if (f.department && u.department !== f.department) return false; + if (f.group && arr(u.groups).indexOf(f.group) === -1) return false; + if (f.locked && !u.locked) return false; + if (!kw) return true; + return [u.username, u.display_name, u.name, u.email].some(function (v) { + return v && String(v).toLowerCase().indexOf(kw) !== -1; + }); + }); + } + + // 勾选只跟随「当前筛选结果」:全选不是全库全选,否则一次误点会选中看不见的账号 + function selectedNames() { + return filteredUsers() + .map(function (u) { return u.username; }) + .filter(function (n) { return state.selected.has(n); }); + } + + function updateSelCount() { + var n = selectedNames().length; + $("selCount").textContent = "已选 " + n + " 个账号"; + var rows = filteredUsers().length; + $("selAll").checked = rows > 0 && n === rows; + $("selAll").indeterminate = n > 0 && n < rows; + } + function groupsCell(u) { var gs = arr(u.groups); if (!gs.length) return "-"; @@ -492,21 +611,38 @@ export OAUTH_ISSUER=https://sso.example.com function renderUsers() { var body = $("usersBody"); - if (!state.users.length) { - body.innerHTML = ''; + var rows = filteredUsers(); + var hint = rows.length === state.users.length + ? "(共 " + state.users.length + " 个)" + : "(筛选出 " + rows.length + " / " + state.users.length + " 个)"; + $("userCountHint").textContent = hint; + + if (!rows.length) { + body.innerHTML = '"; + updateSelCount(); return; } - body.innerHTML = state.users.map(function (u) { + body.innerHTML = rows.map(function (u) { var displayName = u.display_name || ""; - return "" + + var checked = state.selected.has(u.username) ? " checked" : ""; + return "" + + "" + "" + - "" + - "" + - "" + + "
@" + esc(u.username) + " · " + esc(u.created_at_text) + "
" + + (u.locked ? "
已锁定
" : "") + "" + + // 角色改成下拉就地换:改完立刻提交,不需要额外的「保存」按钮 + "" + + "" + + "" + "" + "" + ""; }).join(""); + updateSelCount(); + } + + // 把单元格就地换成输入框:Enter 保存 / Esc 取消 / 失焦保存。 + // 用 cell 定位而非重建整行,避免打断用户对其他列的操作。 + function inlineEdit(cell, initial, onSave) { + if (cell.querySelector("input")) return; + var original = cell.innerHTML; + cell.innerHTML = "
" + + "" + + "" + + "
"; + var box = cell.querySelector(".inline-edit"); + var input = box.querySelector("input"); + input.focus(); + input.select(); + + var done = false; + function finish(commit) { + if (done) return; + done = true; + var v = input.value; + cell.innerHTML = original; + if (commit) onSave(v); + } + input.addEventListener("keydown", function (e) { + if (e.key === "Enter") { e.preventDefault(); finish(true); } + else if (e.key === "Escape") { e.preventDefault(); finish(false); } + }); + box.addEventListener("click", function (e) { + var role = e.target.getAttribute && e.target.getAttribute("data-role"); + if (role === "save") finish(true); + else if (role === "cancel") finish(false); + }); + // 关键:按住按钮时先阻止默认行为,否则 input 先失焦 → blur 提交 → 按钮被 innerHTML + // 复原时移除,click 永远落不到「取消」上,结果「取消」变成了「保存」 + box.addEventListener("mousedown", function (e) { + if (e.target.getAttribute && e.target.getAttribute("data-role")) e.preventDefault(); + }); + // 点页面别处也算提交:管理台里这是最常见的操作路径 + input.addEventListener("blur", function () { setTimeout(function () { finish(true); }, 150); }); } // 端点表:给接入方抄地址用。标准一组给新应用;MaxKey 一组给「照着 MaxKey @@ -647,8 +825,25 @@ export OAUTH_ISSUER=https://sso.example.com } // ---------------- 事件:账号表格 ---------------- + function reload(after) { + return loadAll().then(function () { if (after) after(); }); + } + + // 行内改部门 / 用户组:都是"整个字段替换",所以共用 profile 接口, + // 未涉及的字段传原值,避免只改部门却把邮箱清空 + function saveProfile(user, patch) { + var u = state.users.filter(function (x) { return x.username === user; })[0]; + if (!u) return Promise.reject(new Error("账号不存在")); + return api("POST", "/api/admin/users/profile", { + username: user, + email: patch.email !== undefined ? patch.email : (u.email || ""), + department: patch.department !== undefined ? patch.department : (u.department || ""), + groups: patch.groups !== undefined ? patch.groups : arr(u.groups).join(",") + }); + } + $("usersBody").addEventListener("click", function (e) { - var btn = e.target.closest("button[data-act]"); + var btn = e.target.closest("button[data-act],span[data-act]"); if (!btn) return; var act = btn.getAttribute("data-act"); @@ -659,6 +854,30 @@ export OAUTH_ISSUER=https://sso.example.com return; } + // 部门 / 用户组:点一下就地变输入框 + if (act === "edit-dept" || act === "edit-groups") { + var cell = btn.closest("td"); + var isDept = act === "edit-dept"; + var initial = isDept + ? (state.users.filter(function (x) { return x.username === user; })[0] || {}).department || "" + : btn.getAttribute("data-groups") || ""; + var save = function (v) { + var trimmed = v.trim(); + if (isDept) { + if (trimmed === ((state.users.filter(function (x) { return x.username === user; })[0] || {}).department || "")) return; + saveProfile(user, { department: trimmed }) + .then(function (r) { toast(r.msg); return reload(); }) + .catch(function (err) { toast(err.message, true); }); + } else { + saveProfile(user, { groups: trimmed }) + .then(function (r) { toast(r.msg); return reload(); }) + .catch(function (err) { toast(err.message, true); }); + } + }; + inlineEdit(cell, initial, save); + return; + } + var req = null; if (act === "reset-key") { if (!confirm("重置后旧 Key 立即失效,确认继续?")) return; @@ -672,6 +891,8 @@ export OAUTH_ISSUER=https://sso.example.com var dn = prompt("账号 " + user + " 的展示名(中文姓名,留空 = 清空):", curDisplay); if (dn === null) return; req = api("POST", "/api/admin/users/display", { username: user, display_name: dn.trim() }); + } else if (act === "unlock") { + req = api("POST", "/api/admin/users/unlock", { username: user }); } else if (act === "del-user") { if (!confirm("删除账号 " + user + "?删除后该账号无法登录,已签发的令牌在过期前仍然有效。")) return; req = api("POST", "/api/admin/users/delete", { username: user }); @@ -685,6 +906,112 @@ export OAUTH_ISSUER=https://sso.example.com }).catch(function (err) { toast(err.message, true); btn.disabled = false; }); }); + // ---------------- 事件:勾选 / 角色 / 批量 ---------------- + // 单个勾选:change 事件委托在 tbody 上(input 不冒泡 click 到 button 选择器) + $("usersBody").addEventListener("change", function (e) { + var el = e.target; + if (el.matches("input[data-act='sel']")) { + var name = el.getAttribute("data-user"); + if (el.checked) state.selected.add(name); else state.selected.delete(name); + updateSelCount(); + return; + } + // 角色下拉改成管理员/普通:立刻提交,失败则回滚到原值并刷新 + if (el.matches("select.role-sel")) { + var user = el.getAttribute("data-user"); + var role = el.value; + var before = state.users.filter(function (x) { return x.username === user; })[0]; + var wantAdmin = role === "admin"; + if (before && before.is_admin === wantAdmin) return; + if (!confirm("确认把 " + user + " 设为" + (wantAdmin ? "管理员" : "普通账号") + "?")) { + renderUsers(); + return; + } + el.disabled = true; + api("POST", "/api/admin/users/role", { username: user, role: role }) + .then(function (r) { toast(r.msg); return reload(); }) + .catch(function (err) { toast(err.message, true); renderUsers(); }); + } + }); + + $("selAll").addEventListener("change", function () { + var names = filteredUsers().map(function (u) { return u.username; }); + if ($("selAll").checked) names.forEach(function (n) { state.selected.add(n); }); + else names.forEach(function (n) { state.selected.delete(n); }); + renderUsers(); + }); + + // 批量操作:只提交勾选里仍在当前筛选结果内的账号 + function runBatch(payload, confirmMsg) { + var names = selectedNames(); + if (!names.length) { toast("请先勾选账号", true); return; } + if (confirmMsg && !confirm(confirmMsg.replace("{n}", names.length))) return; + payload.usernames = names.join(","); + api("POST", "/api/admin/users/batch", payload) + .then(function (r) { + var skipped = arr(r.data && r.data.skipped); + toast(r.msg + (skipped.length ? "(跳过 " + skipped.length + " 个:" + skipped.join(";") + ")" : "")); + return reload(); + }) + .catch(function (err) { toast(err.message, true); }); + } + + $("bAddGroup").addEventListener("click", function () { + var g = $("bGroup").value.trim(); + if (!g) { toast("请填写要加入的用户组名", true); return; } + runBatch({ add_groups: g }, "确认给选中的 {n} 个账号加入用户组「" + g + "」?"); + }); + + $("bRemoveGroup").addEventListener("click", function () { + var g = $("bGroup").value.trim(); + if (!g) { toast("请填写要移出的用户组名", true); return; } + runBatch({ remove_groups: g }, "确认把选中的 {n} 个账号从用户组「" + g + "」移出?"); + }); + + $("bSetDept").addEventListener("click", function () { + var d = $("bDept").value.trim(); + // 部门留空 = 清空(后端 check_department 允许空串),但要显式确认一次 + if (!d && !confirm("部门留空 = 清空所选账号的部门,确认继续?")) return; + runBatch({ department: d }, d + ? "确认把选中的 {n} 个账号的部门设为「" + d + "」?" + : "确认清空选中的 {n} 个账号的部门?"); + }); + + $("bRole").addEventListener("change", function () { + var role = $("bRole").value; + if (!role) return; + runBatch({ role: role }, "确认把选中的 {n} 个账号设为" + (role === "admin" ? "管理员" : "普通账号") + "?"); + $("bRole").value = ""; + }); + + $("bUnlock").addEventListener("click", function () { + runBatch({ unlock: "1" }, "确认解锁选中的 {n} 个账号?"); + }); + + // ---------------- 事件:筛选 ---------------- + function bindFilter(id, key, transform) { + $(id).addEventListener("input", function () { + state.filter[key] = transform ? transform($(id)) : $(id).value; + renderUsers(); + }); + } + bindFilter("fKeyword", "keyword"); + bindFilter("fRole", "role"); + bindFilter("fDept", "department"); + bindFilter("fGroup", "group"); + bindFilter("fLocked", "locked", function (el) { return el.checked; }); + + $("fReset").addEventListener("click", function () { + state.filter = { keyword: "", role: "", department: "", group: "", locked: false }; + $("fKeyword").value = ""; + $("fRole").value = ""; + $("fDept").value = ""; + $("fGroup").value = ""; + $("fLocked").checked = false; + renderUsers(); + toast("筛选条件已重置"); + }); + // ---------------- 事件:OAuth 接入方 ---------------- $("oauthEndpointsBody").addEventListener("click", function (e) { var btn = e.target.closest("button[data-act='copy-text']");
账号角色部门用户组邮箱API Key操作
还没有账号
' + + (state.users.length ? "没有符合条件的账号" : "还没有账号") + "
" + esc(u.name || u.username) + "" + - "
@" + esc(u.username) + " · " + esc(u.created_at_text) + "
" + (u.is_admin - ? "管理员" - : "普通") + "" + (u.department ? esc(u.department) : "-") + "" + groupsCell(u) + "" + + (u.department ? esc(u.department) : "点此设置") + "" + groupsCell(u) + + "
" + (u.email ? esc(u.email) : "-") + "
" + esc(u.api_key_masked) + "" + "" + @@ -515,10 +651,52 @@ export OAUTH_ISSUER=https://sso.example.com "
" + "" + "" + + (u.locked ? "" : "") + "" + "