fix(web): 复审 P1 四连修——看板导出门错位/录入页权限死路/抽屉加载卡死/会话下线缺确认
① 看板「导出 Excel」按钮原来挂 canR("board"),但 /export/updates 权限归「自研产品」
(EXPORT_MENU),只有看板权限的账号点了必 403。门改 canR("projects") + title 说明。
② download() 重写为 fetch+blob:403/500/401 的 JSON 错误改 toast 报出(401 直接弹回登录),
不再用同标签页 <a> 跳转把整个 SPA 顶成 JSON 错误页;文件名解析 Content-Disposition 的 UTF-8'' 段。
③ 只有「更新录入」权限的账号录入页死路修复:无自研读权限时 intakeType 强制走定制 tab,
seg 的自研按钮渲染为 disabled+原因 title(intakeTypeSegHtml 助手,两处 seg 模板合并为一个);
定制抽屉「添加交付记录」按 canW(custom)||canW(intake)(POST /custom/updates 走 assist max 口径)、
「AI 录入」按 can(intake)(没菜单跳了也白跳)。
④ 在线会话「下线这个会话」补 confirmDialog({danger:true}),与用户页强制下线同款;
此前 commit message 宣称的一致其实没做(cf0f3a1 只改了用户页)。
⑤ openCustomDrawer / openDrawer 初始加载包 try/catch → 抽屉体内渲染「加载失败」,
不再永久卡在「加载中…+遮罩关不掉」;与 openFocusDrawer 1520-1545 同模板。
node --check 通过;pytest 93 passed 不受影响(纯前端)。
main
parent
ff17e13f10
commit
898974bcfe
82
web/app.js
82
web/app.js
|
|
@ -592,14 +592,29 @@
|
|||
}
|
||||
|
||||
/** 触发浏览器下载(导出 Excel) */
|
||||
function download(url) {
|
||||
const a = document.createElement("a");
|
||||
a.href = url;
|
||||
a.style.display = "none";
|
||||
document.body.appendChild(a);
|
||||
a.click();
|
||||
setTimeout(() => a.remove(), 1000);
|
||||
/**
|
||||
* 导出下载统一走 fetch+blob:403/500/会话过期的 JSON 错误用 toast 报出,
|
||||
* 不再用 <a> 同标签跳转把整个 SPA 顶成错误页(看板导出按钮曾因此丢界面)。
|
||||
*/
|
||||
async function download(url) {
|
||||
toast("正在生成 Excel,请稍候…");
|
||||
try {
|
||||
const res = await fetch(url, { credentials: "same-origin" });
|
||||
if (!res.ok) {
|
||||
let msg = "导出失败(HTTP " + res.status + ")";
|
||||
try { const d = (await res.json()).detail; if (d) msg = "导出失败:" + d; } catch (e) { /* 非 JSON 错误体 */ }
|
||||
if (res.status === 401) showAuthGate(msg);
|
||||
return toast(msg);
|
||||
}
|
||||
const cd = res.headers.get("Content-Disposition") || "";
|
||||
const m = /filename\*=UTF-8''([^;]+)/i.exec(cd);
|
||||
const a = document.createElement("a");
|
||||
a.href = URL.createObjectURL(await res.blob());
|
||||
a.download = m ? decodeURIComponent(m[1]) : "export.xlsx";
|
||||
document.body.appendChild(a);
|
||||
a.click();
|
||||
setTimeout(() => { URL.revokeObjectURL(a.href); a.remove(); }, 2000);
|
||||
} catch (e) { toast("导出失败:" + e.message); }
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -1251,7 +1266,7 @@
|
|||
${state.staff.map((s) => `<option value="${esc(s.name)}" ${s.name === state.weeklyOwner ? "selected" : ""}>${esc(s.name)}${s.archived ? "(已归档)" : ""}</option>`).join("")}
|
||||
</select>
|
||||
<span style="flex:1"></span>
|
||||
${canR("board") ? `<button class="btn sm" id="btnExportBoard">导出 Excel</button>` : ""}
|
||||
${canR("projects") ? `<button class="btn sm" id="btnExportBoard" title="导出本期全部执行记录(按后端权限归「自研产品」菜单)">导出 Excel</button>` : ""}
|
||||
</div>`;
|
||||
|
||||
host.innerHTML = kpi + toolbar + `
|
||||
|
|
@ -2448,7 +2463,13 @@
|
|||
$("#drawer").classList.add("open");
|
||||
$("#drawerBody").innerHTML = `<div class="empty">加载中…</div>`;
|
||||
drawerActions("");
|
||||
const d = await api("/custom/projects/" + cid);
|
||||
let d;
|
||||
try { // 取不到数据必须落回可关闭的抽屉,不能永远停在「加载中…」(与重点抽屉同款)
|
||||
d = await api("/custom/projects/" + cid);
|
||||
} catch (e) {
|
||||
$("#drawerBody").innerHTML = `<div class="notice err">加载失败:${esc(e.message)}</div>`;
|
||||
return;
|
||||
}
|
||||
const p = d.project;
|
||||
$("#drawerTitle").innerHTML = `${p.is_key ? starMark(true) : ""}${esc(p.name)}${p.archived ? ` <span class="arch-badge">已归档</span>` : ""}`;
|
||||
const progPct = (p.project_status === "进行中" || Number(p.progress || 0) > 0) ? Math.round(p.progress || 0) + "%" : null;
|
||||
|
|
@ -2543,8 +2564,8 @@
|
|||
<div class="sec">
|
||||
<div class="sec-title">交付记录(${d.updates.length})</div>
|
||||
<div class="sec-actions upd">
|
||||
<button class="btn sm primary" id="cdAddUpd">${Ico.svg("plus")}添加交付记录</button>
|
||||
<button class="btn sm ghost" id="cdIntake">${Ico.svg("sparkles")}AI 录入</button>
|
||||
${(canW("custom") || canW("intake")) ? `<button class="btn sm primary" id="cdAddUpd">${Ico.svg("plus")}添加交付记录</button>` : ""}
|
||||
${can("intake") ? `<button class="btn sm ghost" id="cdIntake">${Ico.svg("sparkles")}AI 录入</button>` : ""}
|
||||
</div>
|
||||
${d.updates.length ? d.updates.map((u) => updateItem(u, "custom")).join("") : `<div class="empty">暂无交付记录</div>`}
|
||||
</div>
|
||||
|
|
@ -2649,10 +2670,7 @@
|
|||
const projects = await api("/custom/projects");
|
||||
|
||||
host.innerHTML = `
|
||||
<div class="seg" id="intakeTypeSeg" style="margin-bottom:14px">
|
||||
<button class="seg-btn ${state.intakeType === "general" ? "active" : ""}" data-itype="general">自研产品</button>
|
||||
<button class="seg-btn ${state.intakeType === "custom" ? "active" : ""}" data-itype="custom">定制项目</button>
|
||||
</div>
|
||||
${intakeTypeSegHtml()}
|
||||
<div class="card">
|
||||
${cardHead({ title: "定制项目 · 交付记录录入", tools: canW("custom") ? `<button class="btn sm" id="btnNewCustomIntake">${Ico.svg("plus")}新增</button>` : "" })}
|
||||
<div class="card-body">
|
||||
|
|
@ -2831,6 +2849,18 @@
|
|||
/* ---------------------------------------------------------------- 更新录入 */
|
||||
let intakeProjectId = null;
|
||||
|
||||
/** 自研/定制 tab:无「自研产品」读权限的账号(如仅「更新录入」)不给可点的自研按钮,
|
||||
* 否则点一次 403 会把整页刷成加载失败,连定制录入都到不了 */
|
||||
function intakeTypeSegHtml() {
|
||||
const general = canR("projects")
|
||||
? `<button class="seg-btn ${state.intakeType === "general" ? "active" : ""}" data-itype="general">自研产品</button>`
|
||||
: `<button class="seg-btn" disabled title="没有「自研产品」读取权限,只能录入定制项目">自研产品</button>`;
|
||||
return `<div class="seg" id="intakeTypeSeg" style="margin-bottom:14px">
|
||||
${general}
|
||||
<button class="seg-btn ${state.intakeType === "custom" ? "active" : ""}" data-itype="custom">定制项目</button>
|
||||
</div>`;
|
||||
}
|
||||
|
||||
async function renderIntake() {
|
||||
saveUI(); // 自研/定制 tab、写入模式等页内选择也要跨刷新记忆(与其他视图同套路)
|
||||
const host = $("#view-intake");
|
||||
|
|
@ -2840,15 +2870,14 @@
|
|||
return;
|
||||
}
|
||||
if (!state.customMeta) state.customMeta = await api("/custom/meta");
|
||||
// 无自研读权限时强制走定制 tab(跨菜单放行只覆盖定制三接口)
|
||||
if (state.intakeType !== "custom" && !canR("projects")) state.intakeType = "custom";
|
||||
if (state.intakeType === "custom") return renderCustomIntake(host);
|
||||
|
||||
const projects = await api("/projects?archived=false");
|
||||
|
||||
host.innerHTML = `
|
||||
<div class="seg" id="intakeTypeSeg" style="margin-bottom:14px">
|
||||
<button class="seg-btn ${state.intakeType === "general" ? "active" : ""}" data-itype="general">自研产品</button>
|
||||
<button class="seg-btn ${state.intakeType === "custom" ? "active" : ""}" data-itype="custom">定制项目</button>
|
||||
</div>
|
||||
${intakeTypeSegHtml()}
|
||||
<div class="card">
|
||||
${cardHead({ title: "自研产品 · 执行记录录入" })}
|
||||
<div class="card-body">
|
||||
|
|
@ -3129,7 +3158,13 @@
|
|||
$("#drawer").classList.add("open");
|
||||
$("#drawerBody").innerHTML = `<div class="empty">加载中…</div>`;
|
||||
drawerActions("");
|
||||
let d = await api("/projects/" + pid);
|
||||
let d;
|
||||
try { // 同上:加载失败给可见错误态,不留永动「加载中…」
|
||||
d = await api("/projects/" + pid);
|
||||
} catch (e) {
|
||||
$("#drawerBody").innerHTML = `<div class="notice err">加载失败:${esc(e.message)}</div>`;
|
||||
return;
|
||||
}
|
||||
// 弹窗里改完记录,只重画下面的周期反馈,抽屉不关闭、滚动位置不丢
|
||||
const reloadFeed = async () => {
|
||||
d = await api("/projects/" + pid);
|
||||
|
|
@ -3761,7 +3796,12 @@
|
|||
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", async () => {
|
||||
// 与用户页「强制下线」同款确认(危险动作一律先确认)
|
||||
const ok = await confirmDialog({ title: "强制下线", danger: true, okText: "确认下线",
|
||||
body: `<p style="margin:0">只下线这一个登录会话,对应设备需要重新登录;该账号的其他登录不受影响。</p>` });
|
||||
if (ok) save(() => del("/rbac/sessions/" + encodeURIComponent(b.dataset.kick)), "已下线该会话");
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue