diff --git a/A00_Common/line_stack_machine_ctl.ts b/A00_Common/line_stack_machine_ctl.ts index 7a9dcee55..12774f358 100644 --- a/A00_Common/line_stack_machine_ctl.ts +++ b/A00_Common/line_stack_machine_ctl.ts @@ -27,14 +27,14 @@ import { putCover, rowEntry, type CrewRow, - type MachineCover, + type CoverEntry, type MiscRow, } from "../common_util/common_util_formula_doc_cover"; import { subInputs, type StackDoc } from "../common_util/common_util_line_stack"; import type { Picked } from "../common_util/common_util_line_stack_pick"; import { machineUnit } from "../common_util/common_util_line_stack_unit"; import { workAt, workOfMachine } from "../common_util/common_util_line_stack_work"; -import { sites, type WorkCover, type WorkSpec } from "../common_util/common_util_formula_doc_work"; +import { sites, type WorkSpec } from "../common_util/common_util_formula_doc_work"; import { machineCellName } from "../common_util/common_util_machine_symbol_name"; import { openFindPicker } from "../M02_MasterTemplete/M02_MasterTemplete_Find_Pick"; import { buildWorkGroup } from "./line_stack_machine_work"; @@ -130,9 +130,9 @@ export function buildMachineCtl( const got = ctlOf(h, link); if (!got) return null; const { machine, sub, vals, base } = got; - const entry: MachineCover = got.entry ?? {}; + const entry: CoverEntry = got.entry ?? {}; const ro = h.readOnly; - const put = (next: MachineCover): void => h.change((d) => putCover(d, machine, next, base)); + const put = (next: CoverEntry): void => h.change((d) => putCover(d, machine, next, base)); const parts = partsOf(sub); const lines = sub.금액 ?? []; @@ -281,18 +281,17 @@ export function buildMachineCtl( }); // ㉣ 시간당 작업량(846-2) const info = (at === undefined ? null : workAt(h.answer, at)) ?? workOfMachine(h.answer, machine); - const workNow = (entry as MachineCover & { 작업량?: WorkCover }).작업량; const work = info ? buildWorkGroup({ doc: h.doc, info, kind: info.꼴 === "시간당" ? (sites(h.doc, h.doc.금액?.[at ?? -1]?.수량)[0]?.꼴 ?? "일당") : info.꼴, // prettier-ignore - entry: workNow, + entry: entry.작업량, specs: h.work?.(machine) ?? [], subDoc: h.subDoc, vals: (h.answer.값 ?? {}) as Record, ro, - put: (w) => put({ ...entry, 작업량: w } as MachineCover), + put: (w) => put({ ...entry, 작업량: w }), }) : []; const box = el("div", { diff --git a/A00_Common/line_stack_machine_sheet.css b/A00_Common/line_stack_machine_sheet.css index f064a0556..577a2c68f 100644 --- a/A00_Common/line_stack_machine_sheet.css +++ b/A00_Common/line_stack_machine_sheet.css @@ -9,5 +9,4 @@ flex-direction: column; gap: var(--spacing-8); margin-block-start: var(--spacing-16); - overflow-x: auto; }