From a3004c18249ee369395d463b1c8fbedb9b9262dd Mon Sep 17 00:00:00 2001 From: umsangdon Date: Thu, 19 Nov 2026 00:04:30 +0900 Subject: [PATCH] =?UTF-8?q?fix(859-8):=20=EA=B8=B0=EA=B3=84=20=EC=B0=BD=20?= =?UTF-8?q?=EB=82=A1=EC=9D=80=20=EC=95=8C=EB=A6=BC=20=E3=80=8C=EC=9B=90?= =?UTF-8?q?=EB=B3=B8=EC=97=90=20=EC=83=88=20=EA=B0=92=20=EC=9E=88=EC=9D=8C?= =?UTF-8?q?=20=E2=80=94=20=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=20=EC=82=AC?= =?UTF-8?q?=EB=B3=B8=EC=9D=80=20[=EB=8B=A8=EA=B0=80=20=EA=B0=B1=EC=8B=A0]?= =?UTF-8?q?=20=EC=9C=BC=EB=A1=9C=20=EB=B0=98=EC=98=81=E3=80=8D=20=EA=B1=B7?= =?UTF-8?q?=EC=9D=8C=20=E2=80=94=20=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=20?= =?UTF-8?q?[=EB=8B=A8=EA=B0=80=20=EA=B0=B1=EC=8B=A0]=20=EC=97=86=EC=96=B4?= =?UTF-8?q?=EC=A7=90=20=C2=B7=20=EC=84=9C=EB=B2=84=20=EA=B8=B0=EA=B3=84=20?= =?UTF-8?q?=EC=B0=BD=20=EB=8B=B5=20=EC=83=88=EA=B0=92=20=EC=B9=B8=20=C2=B7?= =?UTF-8?q?=20=EA=B8=80=20=ED=82=A4=20Win=5FNewer=20=EC=A7=80=EC=9B=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 5.5 --- A00_Common/line_stack_machine.ts | 6 +----- M02_MasterTemplete/M02_MyMachine_Draft.py | 5 ++--- M02_MasterTemplete/M02_MyMachine_Text.ts | 1 - resources/tester/test_827_1_machine_window.py | 4 +--- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/A00_Common/line_stack_machine.ts b/A00_Common/line_stack_machine.ts index f4cf6c2ef..a33d7350f 100644 --- a/A00_Common/line_stack_machine.ts +++ b/A00_Common/line_stack_machine.ts @@ -37,7 +37,6 @@ interface CopyRowData { export interface CopyAnswer { 사본: CopyRowData | null; 지금: CopyRowData | null; - 새값: boolean; } export interface MachineCtx { @@ -233,10 +232,7 @@ export function openMachineWindow(o: MachineWindowOptions): void { // 지금 줄 = 이 단가산출 사본 값(있으면) const copy = c.kind === "now" && ctx.copyRow ? await ctx.copyRow(c.no).catch(() => null) : null; const row = copy?.사본 ?? null; - if (row) { - lines.push(createText(mt("Win_Copy"), "muted")); - if (copy?.새값) lines.push(createText(mt("Win_Newer"), "warning")); - } + if (row) lines.push(createText(mt("Win_Copy"), "muted")); if (k === "mine") { const m = c.mine ?? mines.find((r) => r.원문번호 === c.no); if (m) lines.push(createText(`${mt("Server_Hourly")} ${hourlyText(m.시간당)}`)); diff --git a/M02_MasterTemplete/M02_MyMachine_Draft.py b/M02_MasterTemplete/M02_MyMachine_Draft.py index 319c07d87..e63bfc106 100644 --- a/M02_MasterTemplete/M02_MyMachine_Draft.py +++ b/M02_MasterTemplete/M02_MyMachine_Draft.py @@ -197,7 +197,7 @@ def saving(body: dict, inner: Callable[[dict], Any]) -> Any: def copy_row(doc: dict, copy: dict | None, no: str) -> dict[str, Any]: - """기계 창 열 때 — {사본: 이 SK 사본에 박힌 줄 | None, 지금: 지금 줄 | None, 새값}(원문번호 · 키로 찾음).""" + """기계 창 열 때 — {사본: 이 SK 사본에 박힌 줄 | None, 지금: 지금 줄 | None}(원문번호 · 키로 찾음).""" from M02_MasterTemplete import M02_Sangeun_Copy as skc no = no.strip().strip("'") @@ -209,5 +209,4 @@ def copy_row(doc: dict, copy: dict | None, no: str) -> dict[str, Any]: whole = skc.whole_() live = (whole.numbers.get("EQ") or {}).get(no) or (whole.index.get("EQ") or {}).get(no) now = prices.to_json(live) if live is not None else None - new = have is not None and now is not None and skc._fp(have) != skc._fp(now) - return {"사본": have, "지금": now, "새값": new} + return {"사본": have, "지금": now} diff --git a/M02_MasterTemplete/M02_MyMachine_Text.ts b/M02_MasterTemplete/M02_MyMachine_Text.ts index 7d04557f2..32d8986fc 100644 --- a/M02_MasterTemplete/M02_MyMachine_Text.ts +++ b/M02_MasterTemplete/M02_MyMachine_Text.ts @@ -60,7 +60,6 @@ const TEXT = { Win_M01: "M01 기계", Win_Copy: "이 단가산출에 복사된 값", Win_Live: "원본 지금 값", - Win_Newer: "원본에 새 값 있음 — 프로젝트 사본은 [단가 갱신] 으로 반영", Win_Swap: "이 기계로 바꾸기", Win_Hint: "왼쪽에서 기계를 고르면 값이 보임", Win_View: "조회", diff --git a/resources/tester/test_827_1_machine_window.py b/resources/tester/test_827_1_machine_window.py index f18a69559..55e60a6fe 100644 --- a/resources/tester/test_827_1_machine_window.py +++ b/resources/tester/test_827_1_machine_window.py @@ -182,9 +182,7 @@ def test_edit_mine_other_sk_new_value(world): now = _at(me, path.read, first) assert now["셈"]["계"] == was seen = _at(me, path.machine, first, f"'{no}'") - assert ( - seen["사본"]["값"]["가격"] == 1000 and seen["지금"]["값"]["가격"] == 5000 and seen["새값"] - ) + assert seen["사본"]["값"]["가격"] == 1000 and seen["지금"]["값"]["가격"] == 5000 def test_company_and_other_refused(world):