feat(web): 写操作与弹窗交互统一(审计 A2/A3 + 口径修正)
- 弹窗主按钮文案统一「新建=创建 / 编辑=保存」:更新记录(保存修改→保存、添加→创建)、 新建周期、人员、角色、用户弹窗全部对齐;角色/用户成功 toast 同步改「已创建」。 - 危险操作红色对齐:强制下线按钮加 danger、确认框加 danger:true(与会话页下线一致); 清空日志触发按钮加 danger(确认框此前已是 danger)。 - 5 个「点了就地写」的 fire-and-forget 处理器补本地 try/catch +「操作失败:…」toast 并中断后续 (项目行归档、人员行归档、抽屉 #dwKey / #dwArchive、定制抽屉 #cdKey)——失败不再静默地 继续刷列表/重开抽屉。 - openRoleDialog / openPasswordReset 提交后禁用主按钮防重复提交,失败恢复;重置密码前端 先校验至少 6 位,不再空跑一次 400。 - afterWrite 里 loadCategories/loadStaff 失败改为 toast 兜底,不再连带吞掉调用方的关弹窗流程。 - 列表卡头 count 口径修正:重点工作、项目明细改用过滤后条数 shown.length,与分页器总数一致 (此前搜索/过滤后「共 N 条」仍显示全量)。 - node --check 通过main
parent
5601950896
commit
cf0f3a121e
59
web/app.js
59
web/app.js
|
|
@ -385,7 +385,7 @@
|
|||
</div>
|
||||
<div class="notice err" id="mErr" style="display:none"></div>
|
||||
</div>
|
||||
<div class="modal-foot"><button class="btn" data-mclose>取消</button><button class="btn primary" id="mOk">${u ? "保存修改" : "添加"}</button></div>`
|
||||
<div class="modal-foot"><button class="btn" data-mclose>取消</button><button class="btn primary" id="mOk">${u ? "保存" : "创建"}</button></div>`
|
||||
);
|
||||
|
||||
// 换周期时把这一周的归属说清楚:9/28 写的记录存进「10月第1周」是口径,不是 bug
|
||||
|
|
@ -817,7 +817,7 @@
|
|||
<div class="form-row"><label>周期名称</label><input class="inp" id="npLabel" data-autofocus style="width:100%" placeholder="如:9月第1周" /></div>
|
||||
<div class="notice err" id="mErr" style="display:none"></div>
|
||||
</div>
|
||||
<div class="modal-foot"><button class="btn" data-mclose>取消</button><button class="btn primary" id="mOk">新建</button></div>`
|
||||
<div class="modal-foot"><button class="btn" data-mclose>取消</button><button class="btn primary" id="mOk">创建</button></div>`
|
||||
);
|
||||
modalResolve = resolve;
|
||||
const submit = async () => {
|
||||
|
|
@ -1436,7 +1436,7 @@
|
|||
|
||||
const body = listCard({
|
||||
title: "重点工作清单",
|
||||
count: rows.length,
|
||||
count: shown.length,
|
||||
chips: chips,
|
||||
fields: `<label class="switch"><input type="checkbox" id="fcArchived" ${state.focusArchived ? "checked" : ""} /> 含归档条目</label>`,
|
||||
tools: `${keywordInputHtml("fKeyword", "搜索工作内容…", 180)}
|
||||
|
|
@ -1708,7 +1708,7 @@
|
|||
|
||||
const body = listCard({
|
||||
title: "重点项目明细",
|
||||
count: rows.length,
|
||||
count: shown.length,
|
||||
chips: chips,
|
||||
fields: `<label class="switch"><input type="checkbox" id="chkArchived" ${state.showArchived ? "checked" : ""} /> 含归档项目</label>`,
|
||||
tools: `${keywordInputHtml("pKeyword", "搜索项目名称…", 180)}
|
||||
|
|
@ -1747,7 +1747,9 @@
|
|||
host.querySelectorAll("[data-parch]").forEach((b) =>
|
||||
b.addEventListener("click", async () => {
|
||||
const toArchive = b.dataset.archived !== "1";
|
||||
await patch("/projects/" + b.dataset.parch, { archived: toArchive });
|
||||
try {
|
||||
await patch("/projects/" + b.dataset.parch, { archived: toArchive });
|
||||
} catch (e) { return toast("操作失败:" + e.message); }
|
||||
toast(toArchive ? "已归档(勾选「含归档项目」可查看)" : "已恢复");
|
||||
await afterWrite();
|
||||
})
|
||||
|
|
@ -2598,7 +2600,9 @@
|
|||
openCustomDrawer(cid, "view");
|
||||
});
|
||||
on("#cdKey", async () => {
|
||||
await patch("/custom/projects/" + cid, { is_key: !p.is_key });
|
||||
try {
|
||||
await patch("/custom/projects/" + cid, { is_key: !p.is_key });
|
||||
} catch (e) { return toast("操作失败:" + e.message); }
|
||||
toast(p.is_key ? "已取消重点" : "已标记重点");
|
||||
await afterWrite();
|
||||
openCustomDrawer(cid, mode);
|
||||
|
|
@ -3330,13 +3334,17 @@
|
|||
openDrawer(pid, "view");
|
||||
});
|
||||
on("#dwKey", async () => {
|
||||
await patch("/projects/" + pid, { is_key: !p.is_key });
|
||||
try {
|
||||
await patch("/projects/" + pid, { is_key: !p.is_key });
|
||||
} catch (e) { return toast("操作失败:" + e.message); }
|
||||
toast(p.is_key ? "已取消重点" : "已标记重点");
|
||||
await afterWrite();
|
||||
openDrawer(pid, mode);
|
||||
});
|
||||
on("#dwArchive", async () => {
|
||||
await patch("/projects/" + pid, { archived: !p.archived });
|
||||
try {
|
||||
await patch("/projects/" + pid, { archived: !p.archived });
|
||||
} catch (e) { return toast("操作失败:" + e.message); }
|
||||
toast(p.archived ? "已恢复" : "已归档");
|
||||
closeDrawer();
|
||||
await afterWrite();
|
||||
|
|
@ -3376,7 +3384,7 @@
|
|||
</div>
|
||||
<div class="notice err" id="mErr" style="display:none"></div>
|
||||
</div>
|
||||
<div class="modal-foot"><button class="btn" data-mclose>取消</button><button class="btn primary" id="mOk">${isNew ? "新增" : "保存"}</button></div>`
|
||||
<div class="modal-foot"><button class="btn" data-mclose>取消</button><button class="btn primary" id="mOk">${isNew ? "创建" : "保存"}</button></div>`
|
||||
);
|
||||
$("#mOk").addEventListener("click", async () => {
|
||||
const name = $("#sfName").value.trim();
|
||||
|
|
@ -3538,7 +3546,9 @@
|
|||
host.querySelectorAll("[data-sarch]").forEach((b) =>
|
||||
b.addEventListener("click", async () => {
|
||||
const m = d.items.find((x) => x.id === Number(b.dataset.sarch));
|
||||
await patch("/staff/" + m.id, { archived: !m.archived });
|
||||
try {
|
||||
await patch("/staff/" + m.id, { archived: !m.archived });
|
||||
} catch (e) { return toast("操作失败:" + e.message); }
|
||||
toast(m.archived ? "已恢复" : `已归档「${m.name}」,不再出现在负责人下拉里`);
|
||||
await afterWrite();
|
||||
})
|
||||
|
|
@ -3681,7 +3691,7 @@
|
|||
${rw ? `<td class="col-ops nowrap"><span class="row-ops">
|
||||
<button class="icon-btn sm" data-uedit="${u.id}" title="编辑姓名/角色">${Ico.svg("pencil")}</button>
|
||||
<button class="icon-btn sm" data-upw="${u.id}" title="重置密码">${Ico.svg("sliders")}</button>
|
||||
<button class="icon-btn sm" data-urevoke="${u.id}" title="强制下线">${Ico.svg("log-out")}</button>
|
||||
<button class="icon-btn sm danger" data-urevoke="${u.id}" title="强制下线">${Ico.svg("log-out")}</button>
|
||||
${self ? "" : `
|
||||
<button class="icon-btn sm" data-uactive="${u.id}" data-on="${u.active ? "1" : "0"}" title="${u.active ? "停用" : "启用"}">${Ico.svg(u.active ? "ban" : "check-circle")}</button>
|
||||
<button class="icon-btn sm danger" data-udel="${u.id}" title="删除">${Ico.svg("trash")}</button>`}
|
||||
|
|
@ -3709,7 +3719,7 @@
|
|||
host.querySelectorAll("[data-urevoke]").forEach((b) =>
|
||||
b.addEventListener("click", async () => {
|
||||
const u = find(b.dataset.urevoke);
|
||||
const ok = await confirmDialog({ title: "强制下线", okText: "确认下线",
|
||||
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(() => post("/rbac/users/" + u.id + "/revoke", {}), `已下线「${u.name}」的全部登录`);
|
||||
})
|
||||
|
|
@ -3804,7 +3814,7 @@
|
|||
pager: pagerBar("rbacLog", data.total || 0),
|
||||
tools: `<input class="search" id="lgUser" type="search" placeholder="操作人" value="${esc(f.username)}" style="width:120px;height:30px" />` +
|
||||
sel("lgMenu", "", menus, f.menu) + sel("lgAction", "", actions, f.action) + sel("lgDays", "", days, f.days) +
|
||||
(rw ? `<button class="btn sm" id="lgClear">清空日志</button>` : ""),
|
||||
(rw ? `<button class="btn sm danger" id="lgClear">清空日志</button>` : ""),
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -3845,19 +3855,21 @@
|
|||
${isNew ? `<div class="notice info">新角色默认不带任何菜单权限</div>` : ""}
|
||||
<div class="notice err" id="mErr" style="display:none"></div>
|
||||
</div>
|
||||
<div class="modal-foot"><button class="btn" data-mclose>取消</button><button class="btn primary" id="mOk">${isNew ? "新建" : "保存"}</button></div>`
|
||||
<div class="modal-foot"><button class="btn" data-mclose>取消</button><button class="btn primary" id="mOk">${isNew ? "创建" : "保存"}</button></div>`
|
||||
);
|
||||
$("#mOk").addEventListener("click", async () => {
|
||||
const name = $("#rlName").value.trim();
|
||||
if (!name) return modalError("请填写角色名");
|
||||
const body = { name: name, description: $("#rlDesc").value.trim() };
|
||||
const btn = $("#mOk");
|
||||
btn.disabled = true;
|
||||
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 ? "已新建角色,在矩阵里勾选菜单即可授权" : "已保存");
|
||||
toast(isNew ? "已创建角色,在矩阵里勾选菜单即可授权" : "已保存");
|
||||
await renderRbac();
|
||||
} catch (e) { modalError(e.message); }
|
||||
} catch (e) { btn.disabled = false; modalError(e.message); }
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -3880,7 +3892,7 @@
|
|||
</div>
|
||||
<div class="notice err" id="mErr" style="display:none"></div>
|
||||
</div>
|
||||
<div class="modal-foot"><button class="btn" data-mclose>取消</button><button class="btn primary" id="mOk">${isNew ? "新建" : "保存"}</button></div>`
|
||||
<div class="modal-foot"><button class="btn" data-mclose>取消</button><button class="btn primary" id="mOk">${isNew ? "创建" : "保存"}</button></div>`
|
||||
);
|
||||
const roleIds = () => $$("[data-urole]").filter((c) => c.checked).map((c) => Number(c.dataset.urole));
|
||||
$("#mOk").addEventListener("click", async () => {
|
||||
|
|
@ -3901,7 +3913,7 @@
|
|||
await patch("/rbac/users/" + u.id, { name: name, role_ids: roleIds() });
|
||||
}
|
||||
closeModal();
|
||||
toast(isNew ? `已新建用户「${name}」` : "已保存");
|
||||
toast(isNew ? `已创建用户「${name}」` : "已保存");
|
||||
await renderRbac();
|
||||
} catch (e) { btn.disabled = false; modalError(e.message); }
|
||||
});
|
||||
|
|
@ -3919,12 +3931,16 @@
|
|||
<div class="modal-foot"><button class="btn" data-mclose>取消</button><button class="btn primary" id="mOk">重置</button></div>`
|
||||
);
|
||||
$("#mOk").addEventListener("click", async () => {
|
||||
const pass = $("#rsPass").value.trim();
|
||||
if (pass.length < 6) return modalError("新密码至少 6 位");
|
||||
const btn = $("#mOk");
|
||||
btn.disabled = true;
|
||||
try {
|
||||
await patch("/rbac/users/" + user.id, { password: $("#rsPass").value.trim() });
|
||||
await patch("/rbac/users/" + user.id, { password: pass });
|
||||
closeModal();
|
||||
toast(`已重置「${user.name}」的密码`);
|
||||
await renderRbac();
|
||||
} catch (e) { modalError(e.message); }
|
||||
} catch (e) { btn.disabled = false; modalError(e.message); }
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -3971,7 +3987,8 @@
|
|||
/** 写操作统一收尾:刷新侧栏计数 + 当前视图。
|
||||
录入页不重绘,否则会清空用户正在编辑的表单。 */
|
||||
async function afterWrite() {
|
||||
await Promise.all([loadCategories(), loadStaff()]);
|
||||
// 侧栏公共数据刷新失败不该连带中断调用方的成功流(关弹窗 / 重开抽屉),兜底提示即可
|
||||
try { await Promise.all([loadCategories(), loadStaff()]); } catch (e) { toast("刷新分类/人员失败:" + e.message); }
|
||||
if (state.view === "intake") return;
|
||||
await refresh();
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue