fix(project): fit meeting rows and inline badges

This commit is contained in:
2026-10-03 14:26:36 +09:00
parent cd0a509215
commit 193da56edf
5 changed files with 111 additions and 20 deletions
+2
View File
@@ -29,6 +29,8 @@ node tests/js/goals_meeting_ui.test.js # jsdom 필요(npm install jsdom
목표 열 자동 맞춤은 실제 Chromium에서도 검증한다. 로컬 테스트 HTML·프로젝트 CSS/폰트를 사용하며 운영 서버·DB에 연결하지 않는다.
부분 서식과 셀 여백, 명시적 줄바꿈, 75% 배율, 600px를 넘는 긴 문단, 저장된 너비 복원을 확인한다.
행 높이는 3줄/2줄 셀의 상단 정렬·같은 위아래 여백, 한 줄로 줄였을 때 높이 축소, 큰 글씨, 보기 전용 화면까지 확인한다.
회의록도 3줄/2줄 셀·한 줄 행·빈 실적 영역·75% 배율·보기 전용 화면을 확인하고,
항목명 오른쪽의 `자동입력`·`실적 미사용` 표시가 같은 줄에 들어가는지 검증한다.
실제 마우스로 셀 테두리를 끌어 내용·부분 서식을 이동하고, 지연 응답 동안 원본을 유지하는지 확인한다.
우클릭 현재/전체 열 자동 맞춤은 접힌 월 열의 측정·너비 저장도 검증한다. jsdom에서는 저장 실패·409 충돌·덮어쓰기 취소·Esc 취소를 추가로 확인한다.
+65
View File
@@ -18,6 +18,14 @@ const server = http.createServer(function (req, res) {
.replace("</body>", "</div></body>");
res.setHeader("Content-Type", "text/html; charset=utf-8"); res.end(html); return;
}
if (url.pathname === "/project/goals/2026/meetings/9") {
const fixture = url.searchParams.has("readonly") ? "meeting_layout_ro.html" : "meeting_layout_admin.html";
const html = fs.readFileSync(path.join(__dirname, ".out", fixture), "utf8")
.replace('<link rel="stylesheet"', '<link rel="stylesheet" href="/static/erp.css"><link rel="stylesheet" href="/static/erp-shell.css"><link rel="stylesheet"')
.replace("<body>", '<body style="font-family:var(--pj-font)"><div class="erp-app">')
.replace("</body>", "</div></body>");
res.setHeader("Content-Type", "text/html; charset=utf-8"); res.end(html); return;
}
if (url.pathname.startsWith("/project/api/")) {
res.setHeader("Content-Type", "application/json"); res.end("{}"); return;
}
@@ -201,6 +209,63 @@ const server = http.createServer(function (req, res) {
console.log("PASS content row height, symmetric padding, top alignment" + (readonly ? " (read-only)" : ", shrink and large font"));
await heightPage.close();
}
for (const readonly of [false, true]) {
const meetingPage = await browser.newPage({ viewport: { width: 1600, height: 1000 } });
await meetingPage.goto("http://127.0.0.1:" + server.address().port + "/project/goals/2026/meetings/9" + (readonly ? "?readonly=1" : ""));
await meetingPage.evaluate(() => document.fonts.ready);
async function meetingMetrics() {
return meetingPage.evaluate(function () {
const row = document.querySelector('tr[data-item="2"]');
const long = row.querySelector(".pj-meet-c-text:not(.is-prev) > *"), short = row.querySelector(".pj-meet-c-text.is-prev > *");
const cell = long.closest("td"), style = getComputedStyle(long), cs = getComputedStyle(cell);
const zoom = document.documentElement.classList.contains("pj-ui-scale") ? 0.75 : 1;
const labels = Array.from(document.querySelectorAll(".pj-meet-market")).map(function (badge) {
const name = badge.previousElementSibling, br = badge.getBoundingClientRect(), nr = name.getBoundingClientRect();
return { text: badge.textContent, rightOfName: br.left >= nr.right,
sameLine: br.top < nr.bottom && nr.top < br.bottom,
fits: br.right <= badge.closest("th").getBoundingClientRect().right };
});
return { row: row.getBoundingClientRect().height / zoom, long: long.getBoundingClientRect().height / zoom,
short: short.getBoundingClientRect().height / zoom, line: parseFloat(style.lineHeight),
top: parseFloat(style.paddingTop), bottom: parseFloat(style.paddingBottom),
border: parseFloat(cs.borderTopWidth) + parseFloat(cs.borderBottomWidth),
topDifference: (short.getBoundingClientRect().top - long.getBoundingClientRect().top) / zoom,
oneLine: document.querySelector('tr[data-item="4"]').getBoundingClientRect().height / zoom,
emptySlot: document.querySelector('tr[data-item="4"] .pj-meet-week-slot').getBoundingClientRect().height,
cellsAtTop: Array.from(row.querySelectorAll("td, th.pj-meet-c-label")).every(c => getComputedStyle(c).verticalAlign === "top"),
labels, clipped: long.scrollHeight > long.clientHeight };
});
}
function checkMeeting(m, lines) {
assert.equal(m.top, m.bottom, JSON.stringify(m));
assert(Math.abs(m.long - (m.line * lines + m.top + m.bottom)) <= 1, JSON.stringify(m));
assert(Math.abs(m.row - m.long - m.border) <= 1, JSON.stringify(m));
assert(Math.abs(m.topDifference) <= 1 && m.cellsAtTop && !m.clipped, JSON.stringify(m));
assert(m.oneLine <= m.line + m.top + m.bottom + m.border + 1 && m.emptySlot === 0, JSON.stringify(m));
assert.deepEqual(m.labels.map(b => b.text), ["자동입력", "실적 미사용"]);
assert(m.labels.every(b => b.rightOfName && b.sameLine && b.fits), JSON.stringify(m.labels));
}
const initial = await meetingMetrics();
checkMeeting(initial, 3);
assert(Math.abs(initial.short - initial.line * 2 - initial.top - initial.bottom) <= 1, JSON.stringify(initial));
if (!readonly) {
await meetingPage.locator('tr[data-item="2"] textarea').fill("한 줄");
await meetingPage.locator('tr[data-item="2"] .is-prev .pj-meet-ro').evaluate(e => { e.textContent = "한 줄"; });
const smaller = await meetingMetrics();
checkMeeting(smaller, 1);
assert(smaller.row < initial.row);
await meetingPage.locator('tr[data-item="2"] textarea').fill("첫 번째 줄\n두 번째 줄\n세 번째 줄");
}
await meetingPage.evaluate(function () {
document.documentElement.classList.add("pj-ui-scale");
window.dispatchEvent(new Event("resize"));
});
checkMeeting(await meetingMetrics(), 3);
await meetingPage.locator("#pj-meet-table").screenshot({ path: path.join(__dirname, ".out", readonly ? "meeting-layout-ro.png" : "meeting-layout-admin.png") });
await meetingPage.close();
console.log("PASS meeting row height, equal padding, top alignment, inline automatic/unused labels, shrink and 75% zoom" + (readonly ? " (read-only)" : ""));
}
const interactive = await browser.newPage({ viewport: { width: 1600, height: 1000 } });
let releaseMove, startedMove;
const moveGate = new Promise(function (resolve) { releaseMove = resolve; });
+18
View File
@@ -104,6 +104,22 @@ def meeting_ctx(admin: bool, err: bool, can_sync: bool = True) -> dict:
}
def meeting_layout_ctx(admin: bool) -> dict:
ctx = meeting_ctx(admin, False, can_sync=False)
meeting = ctx["meeting"]
product = meeting["sections"][0]["rows"][0]
product["content"] = "첫 번째 줄\n두 번째 줄\n세 번째 줄"
product["prev"]["content"] = "첫 번째 줄\n두 번째 줄"
inactive = copy.deepcopy(meeting["sections"][1]["rows"][0])
inactive.update(id=4, label="네이버", section="마케팅", content="한 줄", marketplace_code="naver",
market_name="네이버 스마트스토어", market_off=True, week_auto=None)
inactive["prev"].update(id=904, content="한 줄", auto_result=None, market_off=True,
marketplace_code="naver", market_name="네이버 스마트스토어")
meeting["items"].append(inactive)
meeting["sections"].append({"name": "마케팅", "color": "", "rows": [inactive]})
return ctx
def main() -> None:
env = jinja2.Environment(loader=jinja2.ChoiceLoader([
jinja2.DictLoader({"erp_base.html": BASE_STUB}),
@@ -117,6 +133,8 @@ def main() -> None:
"meeting_admin.html": ("project/goal_meeting.html", meeting_ctx(True, False)),
"meeting_err.html": ("project/goal_meeting.html", meeting_ctx(True, True)),
"meeting_ro.html": ("project/goal_meeting.html", meeting_ctx(False, False, can_sync=False)),
"meeting_layout_admin.html": ("project/goal_meeting.html", meeting_layout_ctx(True)),
"meeting_layout_ro.html": ("project/goal_meeting.html", meeting_layout_ctx(False)),
}
for name, (tpl, ctx) in pages.items():
html = env.get_template(tpl).render(**ctx)