From 320db86802585b0cfc717a2f643a99ed9c70d535 Mon Sep 17 00:00:00 2001 From: umsangdon Date: Mon, 2 Nov 2026 13:53:24 +0900 Subject: [PATCH] =?UTF-8?q?fix(733-3):=20=EC=A4=91=EB=B3=B5=20=EC=B0=BE?= =?UTF-8?q?=EA=B8=B0=20=EC=B0=BD=20=E2=80=94=20=EA=BC=AC=EB=A6=AC=ED=91=9C?= =?UTF-8?q?=20=EB=B0=B0=EC=A7=80=20=EB=8A=98=EC=96=B4=EB=82=A8=20=C2=B7=20?= =?UTF-8?q?=ED=95=A9=EC=B9=98=EA=B8=B0=20=EB=8B=A8=EC=B6=94=20=ED=81=AC?= =?UTF-8?q?=EA=B8=B0=20=C2=B7=20=EA=B7=B8=EC=83=88=20=EB=B0=94=EB=80=9C=20?= =?UTF-8?q?=ED=86=A0=EC=8A=A4=ED=8A=B8=20=EA=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 묶음 머리 이름 칸 CSS 가 배지(span)까지 늘리던 것 — 이름 칸 class 로 좁힘 - [합치기] = 기본 단추 크기 · 판 다름 409 = 「그새 바뀜 — 다시 찾음」만(HTTP 409 꼬리 뺌) 뒤 다시 찾음 Co-Authored-By: Claude Opus 5.5 --- .../M02_MasterTemplete_Library_Same.css | 2 +- .../M02_MasterTemplete_Library_Same.ts | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/M02_MasterTemplete/M02_MasterTemplete_Library_Same.css b/M02_MasterTemplete/M02_MasterTemplete_Library_Same.css index 1250994b8..fe7414dbf 100644 --- a/M02_MasterTemplete/M02_MasterTemplete_Library_Same.css +++ b/M02_MasterTemplete/M02_MasterTemplete_Library_Same.css @@ -17,7 +17,7 @@ align-items: center; gap: 8px; } -.m02-same__head > span { +.m02-same__name { flex: 1; min-width: 0; overflow: hidden; diff --git a/M02_MasterTemplete/M02_MasterTemplete_Library_Same.ts b/M02_MasterTemplete/M02_MasterTemplete_Library_Same.ts index 29e286a67..ca6551690 100644 --- a/M02_MasterTemplete/M02_MasterTemplete_Library_Same.ts +++ b/M02_MasterTemplete/M02_MasterTemplete_Library_Same.ts @@ -154,11 +154,11 @@ export function openLibrarySame(opt: SameOptions): void { opt.changed(); draw(); } catch (error) { - showToast( - error instanceof StaleError ? `${tx("Stale")} — ${why(error)}` : why(error), - "error", - ); - if (error instanceof StaleError) void load(); + // 판 다름(409 · 서버 몸 = {stale, 판}) = 까닭 글 없음 → 「그새 바뀜」만 + const text = why(error); + const stale = error instanceof StaleError; + showToast(stale && text.startsWith("HTTP") ? tx("Stale") : text, "error"); + if (stale) void load(); } }; @@ -240,7 +240,6 @@ export function openLibrarySame(opt: SameOptions): void { }; const mergeButton = createButton({ label: tx("Merge"), - size: "sm", onClick: () => void merge(group, keep), }); const tag = group.꼬리표 === "수량만 다름" ? tx("QtyOnly") : tx("Same"); @@ -248,7 +247,10 @@ export function openLibrarySame(opt: SameOptions): void { className: "m02-same__head", children: [ createBadge(tag, group.꼬리표 === "수량만 다름" ? "warning" : "info"), - el("span", { text: `${group.문서[0].이름} · ${group.문서.length}` }), + el("span", { + className: "m02-same__name", + text: `${group.문서[0].이름} · ${group.문서.length}`, + }), mergeButton, ], });