Merge branch 'feat/performance' into feat/project — 매출 업데이트 진행 창

This commit is contained in:
2026-09-30 13:57:11 +09:00
13 changed files with 519 additions and 22 deletions
+31
View File
@@ -229,3 +229,34 @@ td.is-link:hover { background: #eef2ff; text-decoration: underline; }
.perf-ev-table thead th { background: var(--perf-soft, #fafafa); box-shadow: 0 1px 0 var(--perf-line, #e5e5e5); }
/* 취소 행 — 행 전체를 기울임 + 취소선 + 회색 */
.perf-ev-table tr.is-cancel td { font-style: italic; text-decoration: line-through; color: #9a9a9a; }
/* ── 매출 업데이트 진행 창 — 쇼핑몰별·전체 진행 막대(runSyncWithProgress) ── */
.perf-prog-card { width: min(640px, 100%); }
.perf-prog-row {
display: grid; grid-template-columns: 150px 1fr 44px; align-items: center; column-gap: 10px; row-gap: 3px;
padding: 9px 0; border-bottom: 1px solid var(--perf-line);
}
.perf-prog-name { font-size: 13px; font-weight: 600; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
.perf-prog-bar { height: 10px; border-radius: 999px; background: #eef0f3; overflow: hidden; }
.perf-prog-bar > span {
display: block; height: 100%; border-radius: inherit; background: var(--perf-sat);
transition: width .5s ease;
}
.perf-prog-pct { font-size: 12px; text-align: right; font-variant-numeric: tabular-nums; color: var(--color-midtone-gray); }
.perf-prog-text { grid-column: 2 / -1; font-size: 12px; color: var(--color-midtone-gray); overflow-wrap: anywhere; }
.perf-prog-row.is-done .perf-prog-bar > span { background: var(--perf-up); }
.perf-prog-row.is-error .perf-prog-bar > span { background: var(--perf-down); }
.perf-prog-row.is-error .perf-prog-text { color: var(--perf-down); }
.perf-prog-row.is-skip .perf-prog-bar > span { background: #b8bec7; }
/* 진행 중인 막대에 흐르는 빗금 — 멈춘 게 아니라는 표시 */
.perf-prog-row:not(.is-done):not(.is-error):not(.is-skip) .perf-prog-bar > span {
background-image: linear-gradient(45deg, rgba(255,255,255,.22) 25%, transparent 25%, transparent 50%,
rgba(255,255,255,.22) 50%, rgba(255,255,255,.22) 75%, transparent 75%, transparent);
background-size: 16px 16px; animation: perf-prog-flow 1s linear infinite;
}
@keyframes perf-prog-flow { from { background-position: 0 0; } to { background-position: 16px 0; } }
.perf-prog-row.is-total { border-bottom: none; border-top: 2px solid var(--perf-line); margin-top: 4px; padding-top: 12px; }
.perf-prog-row.is-total .perf-prog-name { font-weight: 700; }
.perf-prog-row.is-total .perf-prog-bar { height: 14px; }
.perf-prog-row.is-total .perf-prog-pct { font-weight: 700; color: inherit; }
@media (max-width: 560px) { .perf-prog-row { grid-template-columns: 1fr 44px; } .perf-prog-name { grid-column: 1 / -1; } .perf-prog-text { grid-column: 1 / -1; } }
+108 -5
View File
@@ -76,6 +76,103 @@
return { card: card, body: body, foot: foot, close: close };
}
// ── 매출 업데이트 진행 창 — 서버가 백그라운드로 수집(POST /api/sync background)하는 동안
// GET /api/sync/jobs/{id} 를 0.8초마다 불러 쇼핑몰별·전체 진행 막대를 그린다.
// 창을 닫아도 수집은 서버에서 계속된다. 끝나면 resolve(마지막 상태), 호출 자체가 실패하면 reject.
const SHOP_STATE = { waiting: "대기", running: "수집 중", saving: "저장 중", done: "완료", error: "실패", skipped: "건너뜀" };
function fmtSec(sec) {
sec = Math.max(0, Math.round(sec || 0));
return Math.floor(sec / 60) + ":" + String(sec % 60).padStart(2, "0");
}
function progressRow(name, fraction, text, cls) {
const pct = Math.round((fraction || 0) * 100);
return '<div class="perf-prog-row' + (cls ? " " + cls : "") + '">' +
'<div class="perf-prog-name">' + esc(name) + "</div>" +
'<div class="perf-prog-bar" role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="' + pct + '">' +
'<span style="width:' + pct + '%"></span></div>' +
'<div class="perf-prog-pct">' + pct + "%</div>" +
'<div class="perf-prog-text">' + text + "</div></div>";
}
function shopText(s) {
let t = SHOP_STATE[s.state] || s.state;
if (s.state === "running" && s.total) t += " " + fmt(s.done) + "/" + fmt(s.total) + s.unit;
if (s.items && s.state !== "done") t += " · 받은 자료 " + fmt(s.items) + "건";
if (s.state === "done") t += " · " + fmt(s.upserted) + "건 반영";
if (s.state === "error") t += " · " + (s.label ? s.label + " — " : "") + (s.message || "");
if (s.state === "skipped") t += " · " + (s.message || "");
let html = esc(t);
if (s.elapsed && s.state !== "waiting") html += ' <span class="perf-muted">(' + fmtSec(s.elapsed) + ")</span>";
return html;
}
function renderSyncJob(box, job, joined) {
const active = job.shops.filter(function (s) { return s.active; });
const passive = job.shops.filter(function (s) { return !s.active; });
const o = job.overall;
let html = joined ? '<p class="perf-notice">이미 진행 중인 업데이트를 보여 줍니다.</p>' : "";
html += '<p class="perf-muted" style="margin:0 0 10px">기간 ' + esc(job.from || "") + " ~ " + esc(job.to || "") +
" · 경과 " + fmtSec(job.elapsed) + (job.finished ? "" : " · 창을 닫아도 서버에서 계속 진행됩니다") + "</p>";
html += active.map(function (s) {
const cls = s.state === "error" ? "is-error" : s.state === "done" ? "is-done" : s.state === "skipped" ? "is-skip" : "";
return progressRow(s.name, s.fraction, shopText(s), cls);
}).join("");
html += progressRow("전체", o.fraction,
esc(fmt(o.finished) + "/" + fmt(o.shops) + " 쇼핑몰 완료" +
(o.items ? " · 받은 자료 " + fmt(o.items) + "건" : "") + (job.finished ? " · " + fmt(o.upserted) + "건 반영" : "")),
"is-total" + (job.finished ? " is-done" : ""));
if (passive.length) {
html += '<p class="perf-muted" style="margin:10px 0 0">건너뜀: ' + esc(passive.map(function (s) {
return s.name + (s.label ? "(" + s.label + ")" : "");
}).join(", ")) + "</p>";
}
if (job.error) html += '<p class="perf-notice is-warn">' + esc(job.error) + "</p>";
box.innerHTML = html;
}
function runSyncWithProgress(payload, title) {
return new Promise(function (resolve, reject) {
let timer = null, closed = false, last = null;
const m = openModal(title || "매출 업데이트", { narrow: true, onClose: function () { closed = true; clearTimeout(timer); if (last) resolve(last); } });
m.card.classList.add("perf-prog-card");
m.body.innerHTML = '<p class="perf-muted">업데이트를 시작하는 중…</p>';
const closeBtn = el("button", { type: "button", class: "erp-btn erp-btn-outline" }, "닫기");
closeBtn.addEventListener("click", m.close);
m.foot.appendChild(closeBtn);
api("POST", "/performance/api/sync", Object.assign({ background: true }, payload)).then(function (res) {
last = res.job;
const joined = res.joined;
renderSyncJob(m.body, res.job, joined);
async function poll() {
if (closed) return;
try {
const r = await api("GET", "/performance/api/sync/jobs/" + encodeURIComponent(res.job.id));
last = r.job;
renderSyncJob(m.body, r.job, joined);
if (r.job.finished) {
closeBtn.textContent = "확인";
closeBtn.className = "erp-btn erp-btn-primary";
return;
}
} catch (err) {
m.body.insertAdjacentHTML("beforeend", '<p class="perf-notice is-warn">' + esc(err.message) + "</p>");
return;
}
timer = setTimeout(poll, 800);
}
timer = setTimeout(poll, 500);
}).catch(function (err) {
m.body.innerHTML = '<p class="perf-notice is-warn">' + esc(err.message) + "</p>";
closed = true;
reject(err);
});
});
}
// 끝난 작업 → 기존 결과 줄(반영/실패/건너뜀)에 쓰던 모양
function jobResults(job) {
return (job && job.shops || []).map(function (s) {
return { code: s.code, name: s.name, ok: s.state === "done", skipped: s.state === "skipped",
upserted: s.upserted, status: s.status, label: s.label, message: s.message, finished: s.state !== "waiting" && s.state !== "running" && s.state !== "saving" };
});
}
// ════════════════════════════════════════════════════
// 대시보드
// ════════════════════════════════════════════════════
@@ -129,13 +226,16 @@
// 지금 보고 있는 기간(오늘까지)을 가져온다 — "이번달"이면 1일부터 오늘까지.
const from = data.period_start, to = data.period_end < data.today ? data.period_end : data.today;
if (from > data.today) throw new Error("앞으로의 기간은 가져올 수 없습니다.");
const res = await api("POST", "/performance/api/sync", { from: from, to: to });
// 진행 창(쇼핑몰별·전체 막대) — 창을 닫아도 서버에서 계속된다.
const job = await runSyncWithProgress({ from: from, to: to }, "매출 업데이트 " + from + " ~ " + to);
const res = { results: jobResults(job).filter(function (r) { return r.finished; }), last_update_at: job && job.last_update_at };
const running = job && !job.finished;
// 실패(빨강)는 인증 실패·API 오류처럼 손봐야 하는 것만. 인증정보를 아직 안 넣은 쇼핑몰(미설정)과
// 수집을 아직 만들지 않은 쇼핑몰(연동 준비 중)은 회색 한 줄로 이름만.
const ok = [], bad = [], pending = [], unset = [], busy = [];
let changed = 0;
(res.results || []).forEach(function (r) {
const name = (data.names || {})[r.code] || r.code;
const name = (data.names || {})[r.code] || r.name || r.code;
if (r.skipped) busy.push(name);
else if (r.ok) { ok.push(name + " " + fmt(r.upserted) + "건"); changed += r.upserted; }
else if (r.status === "not_implemented") pending.push(name);
@@ -148,6 +248,7 @@
if (busy.length) parts.push("<b>이미 진행 중</b> " + esc(busy.join(", ")));
if (pending.length) parts.push('<span class="perf-muted">연동 준비 중: ' + esc(pending.join(", ")) + "</span>");
if (unset.length) parts.push('<span class="perf-muted">인증정보 미설정: ' + esc(unset.join(", ")) + "</span>");
if (running) parts.unshift("<b>업데이트가 아직 진행 중입니다</b> — 끝나면 다시 [매출 업데이트]를 눌러 결과를 보세요");
resultBox.innerHTML = parts.join(" · ") || "업데이트할 쇼핑몰이 없습니다.";
resultBox.className = "perf-notice" + (bad.length ? " is-warn" : " is-ok");
resultBox.hidden = false;
@@ -155,7 +256,7 @@
const lu = document.querySelector("#perf-last-update b");
if (lu) lu.textContent = res.last_update_at.slice(0, 16).replace("T", " ");
}
if (changed > 0) setTimeout(function () { location.reload(); }, 1200);
if (changed > 0 && !running) setTimeout(function () { location.reload(); }, 800);
} catch (err) {
resultBox.textContent = "업데이트 실패: " + err.message;
resultBox.className = "perf-notice is-warn";
@@ -891,10 +992,12 @@
backfill.textContent = "가져오는 중…";
box.hidden = true;
try {
const res = await api("POST", "/performance/api/sync", { from: from, to: to });
const job = await runSyncWithProgress({ from: from, to: to }, "과거 매출 가져오기 " + from + " ~ " + to);
const res = { results: jobResults(job).filter(function (r) { return r.finished; }) };
const ok = [], bad = [], rest = [];
if (job && !job.finished) rest.push("(아직 진행 중 — 창을 닫았습니다. 끝나면 대시보드에 반영됩니다)");
(res.results || []).forEach(function (r) {
const name = names[r.code] || r.code;
const name = names[r.code] || r.name || r.code;
if (r.ok) ok.push(name + " " + fmt(r.upserted) + "건");
else if (r.skipped) rest.push(name + "(이미 진행 중)");
else if (r.status === "not_implemented" || r.status === "not_configured") rest.push(name);