Merge remote-tracking branch 'origin/dev' into sub_laptop_2

2026-10-05 20:55:56 +09:00
parent f6bcfa52ce a92f768952
commit a8045bbacc
6 changed files with 193 additions and 11 deletions
@@ -153,15 +153,43 @@ def clean_doc(kind: str, doc: Any) -> dict[str, Any]:
            단위=unit or pill.get("단위") or None,
            배=pill.get("배") or 1,  # ponytail: 저장 때 적음 · 마스터 결과단위가 바뀌면 다시 저장
            담은로직=[{"로직": line["로직"], "입력값": line["입력값"]}],
+            **origin(line["로직"]),
        )
    else:
        if not name:
            raise _bad("사전조합 이름이 빔")
        out.update(이름=name, 단위=unit or None, 담은로직=_combo_lines(doc, key))
+        out.update({k: str(doc.get(k) or "").strip() for k in ("구분", "상세구분")})
    out["본뜬"] = doc["본뜬"] if isinstance(doc.get("본뜬"), dict) else None
    return out


+def origin(code: str) -> dict[str, Any]:
+    """단가승격 칸 — 원 로직의 구분 · 상세구분 + 연결 {로직 키, 출처 글}(51-12 · 없으면 빈 글)."""
+    from M01_MasterData import M01_MasterData_Store as m01
+
+    try:
+        got = m01.loaded()[1].logic(code)
+    except m01.cm.mf.FormulaError:
+        got = {}
+    return {
+        "구분": got.get("구분") or "",
+        "상세구분": got.get("상세구분") or "",
+        "연결": {"로직": code, "출처": got.get("출처") or ""},
+    }
+
+
+def filled(kind: str, doc: Any) -> Any:
+    """옛 서고 문서(51-12 앞) 읽을 때 칸 채움 — 승격 = 원 로직 것 · 사전조합 = 빈 글(화면 몫)."""
+    if not isinstance(doc, dict) or kind not in PREFIX or "구분" in doc:
+        return doc
+    if kind == "precombo":
+        return {**doc, "구분": "", "상세구분": ""}
+    line = (doc.get("담은로직") or [{}])[0]
+    code = str(line.get("로직") or "") if isinstance(line, dict) else ""
+    return {**doc, **origin(code)}
+
+
 def _combo_lines(doc: dict, key: str) -> list[dict[str, Any]]:
    """참조 줄 `{참조, 수량, 메모}` · 로직 줄 `{로직, 입력값, 메모, 수량}`(51-11) — 검사는
    일위대가와 같은 길(`labor.clean` · 같은 로직 · 같은 참조 두 번 · 입력값) · 수량 기본 {손: 1}."""
@@ -217,12 +245,14 @@ def create(kind: str, doc: dict[str, Any]) -> dict[str, Any]:


 def summary(folder: Path, kind: str, key: str, expand: Expand | None = None) -> dict[str, Any]:
-    """층 목록 한 줄에 붙일 것 — `{제목, 단위}` · `expand` 면 1 단위 기준 계(`기준금액` · 51-4)."""
+    """층 목록 한 줄에 붙일 것 — `{제목, 단위, 구분, 상세구분, 연결}`(51-12) · `expand` 면
+    1 단위 기준 계(`기준금액` · 51-4)."""
    try:
-        doc = json.loads((Path(folder) / kind / f"{key}.json").read_bytes())
+        doc = filled(kind, json.loads((Path(folder) / kind / f"{key}.json").read_bytes()))
    except (OSError, ValueError):
        return {}
-    out = {"제목": doc.get("이름"), "단위": doc.get("단위")}
+    keep = ("구분", "상세구분", "연결")
+    out = {"제목": doc.get("이름"), "단위": doc.get("단위"), **{k: doc.get(k) for k in keep}}
    if expand is not None:
        layer, owner = where(folder)
        base = expand({"층": layer, "주인": owner, "키": key}).get("기준") or {}
@@ -233,6 +233,9 @@ export interface LibraryRow {
  이름: string;
  제목?: string | null;
  단위?: string | null;
+  /** 단가승격 = 원 로직 것 · 사전조합 = 사용자가 고름(51-12) */
+  구분?: string | null;
+  상세구분?: string | null;
 }
 /** 서고 목록 — 그 층(주인) 단가승격 `promote` · 사전조합 `precombo` 문서 */
 export const fetchLibrary = async (
@@ -82,9 +82,12 @@ export function openLogicPicker(done: (logic: LogicSummary) => void, lib?: Libra
        (!detail.select.value || x.상세구분 === detail.select.value) &&
        (!q || `${x.키} ${x.이름}`.toLowerCase().includes(q)),
    );
-    const libFound = sub.select.value
-      ? []
-      : libRows.filter((x) => !q || `${x.row.이름} ${x.row.제목 ?? ""}`.toLowerCase().includes(q));
+    const libFound = libRows.filter(
+      (x) =>
+        (!sub.select.value || x.row.구분 === sub.select.value) &&
+        (!detail.select.value || x.row.상세구분 === detail.select.value) &&
+        (!q || `${x.row.이름} ${x.row.제목 ?? ""}`.toLowerCase().includes(q)),
+    );
    const total = all.length + libRows.length;
    const shown = found.length + libFound.length;
    finder.hint.textContent = loading
@@ -110,7 +113,9 @@ export function openLogicPicker(done: (logic: LogicSummary) => void, lib?: Libra
          key: x.row.이름,
          tag: tc(x.kind),
          name: x.row.제목 || x.row.이름,
-          sub: x.row.이름,
+          sub: [x.row.이름, `${x.row.구분 ?? ""} ${x.row.상세구분 ?? ""}`.trim()]
+            .filter(Boolean)
+            .join(" · "),
          unit: x.row.단위 ?? "",
          onPick: () => {
            close();
@@ -142,6 +147,7 @@ export function openLogicPicker(done: (logic: LogicSummary) => void, lib?: Libra
      showToast(error instanceof Error ? error.message : tc("Load_Failed"), "error");
    }
    loading = false;
+    drawSubs();
    find();
  };
  const drawLayers = (): void =>
@@ -158,10 +164,28 @@ export function openLogicPicker(done: (logic: LogicSummary) => void, lib?: Libra
        }),
      ),
    );
-  sub.select.addEventListener("change", () => {
-    const d = subs.find((s) => s.name === sub.select.value)?.details ?? [];
-    detail.setOptions(opts(d), "");
+  /** 구분 → 상세구분 — 로직 구분에 서고 줄(승격 · 조합) 것을 더함 · 같은 값은 한 칸 */
+  const subMap = (): Map<string, Set<string>> => {
+    const m = new Map(subs.map((s) => [s.name, new Set(s.details)]));
+    for (const { row } of libRows) {
+      if (!row.구분) continue;
+      if (!m.has(row.구분)) m.set(row.구분, new Set());
+      if (row.상세구분) m.get(row.구분)!.add(row.상세구분);
+    }
+    return m;
+  };
+  const drawDetails = (keep: string): void => {
+    const d = [...(subMap().get(sub.select.value) ?? [])];
+    detail.setOptions(opts(d), d.includes(keep) ? keep : "");
    detail.select.disabled = d.length === 0;
+  };
+  const drawSubs = (): void => {
+    const keep = detail.select.value;
+    sub.setOptions(opts([...subMap().keys()]), sub.select.value);
+    drawDetails(keep);
+  };
+  sub.select.addEventListener("change", () => {
+    drawDetails("");
    find();
  });
  detail.select.addEventListener("change", find);
@@ -202,8 +226,8 @@ export function openLogicPicker(done: (logic: LogicSummary) => void, lib?: Libra
    .then(([s, l]) => {
      subs.push(...s);
      all = l;
+      drawSubs();
      find();
-      sub.setOptions(opts(s.map((x) => x.name)), "");
    })
    .catch((error) =>
      showToast(error instanceof Error ? error.message : tc("Load_Failed"), "error"),
@@ -309,6 +309,7 @@ async def read_layer_template(
        raise HTTPException(status_code=404, detail="양식을 찾을 수 없습니다.")
    found["층"] = layer
    found["출처"] = layers.read_manifest(folder).get(f"{kind}/{name}")
+    found["문서"] = refs.filled(kind, found["문서"])  # 옛 서고 문서 구분 · 상세구분(51-12)
    return found


@@ -407,3 +407,30 @@ def test_사전조합이_자기_자신을_담으면_422_수량_기본_1(world):
                },
            )
    assert e.value.status == 422 and "자기 자신" in e.value.detail
+
+
+def test_서고_구분_상세구분_연결_승격은_원_로직_사전조합은_고른_값_옛_문서는_읽을_때(world):
+    import M01_MasterData.M01_MasterData_Store as m01
+
+    row = m01.loaded()[1].logic(TEN)
+    sp = _promote(world["system"], 구분="틀림", 상세구분="틀림", 연결={"로직": "x"})
+    doc = _read(world["system"], "promote", sp)
+    assert row["구분"] and row["상세구분"]
+    assert (doc["구분"], doc["상세구분"]) == (row["구분"], row["상세구분"])  # 화면 값 안 받음
+    assert doc["연결"] == {"로직": TEN, "출처": row.get("출처") or ""}
+    sc = _combo(world["system"], [{"참조": {**SYS, "키": sp}}])
+    assert (_read(world["system"], "precombo", sc)["구분"], "") == ("", "")
+    with store.at(world["system"]):
+        have = store.read("precombo", sc)
+        store.write("precombo", sc, have["판"], {**have["문서"], "구분": " 가 ", "상세구분": "나"})
+    got = _read(world["system"], "precombo", sc)
+    assert (got["구분"], got["상세구분"]) == ("가", "나")
+    # 옛 문서(칸 없음) — 승격은 원 로직 것 · 사전조합은 빈 글
+    old = {k: v for k, v in doc.items() if k not in ("구분", "상세구분", "연결")}
+    (world["system"] / "promote" / f"{sp}.json").write_text(json.dumps(old), encoding="utf-8")
+    assert refs.filled("promote", old)["연결"] == doc["연결"]
+    assert refs.filled("precombo", {"담은로직": []})["구분"] == ""
+    rows = [{"종류": "promote", "이름": sp}, {"종류": "precombo", "이름": sc}]
+    refs.summaries(world["system"], rows)
+    assert (rows[0]["구분"], rows[0]["상세구분"]) == (row["구분"], row["상세구분"])
+    assert (rows[1]["구분"], rows[1]["상세구분"], rows[1]["연결"]) == ("가", "나", None)
@@ -0,0 +1,97 @@
+/* 51-12 — 로직 고르기 창 구분 · 상세구분 거름에 단가승격 · 사전조합 줄도 들어감
+ * 시작 화면: M02 마스터 템플릿 · 마스터 층(#/m02-master-template?open=구조물조합&root=master) · 시스템 관리자 · item1 있음
+ * 부르는 법: orca eval --expression "$(tr '
+' ' ' < 이 파일)" (async 식 · JSON 글을 돌려줌)
+ * 하는 일: item1 → 일위대가 [수정] → [로직 추가] → 서고 줄마다 구분 · 상세구분으로 걸러 봄 → 창 닫음(저장 안 함)
+ * 기대 수치:
+ *   - libRows ≥ 2(SP-000001 · SC-000001 포함)
+ *   - lib[키].sub = 한 구분(빈 값 아님) · lib[키].detail = 한 상세구분 · lib[키].subText 에 둘이 다 보임
+ *   - lib[키].withLogic = true(같은 구분 칸에 단가산출 줄도 함께 — 같은 값은 한 칸)
+ *   - subDup = 0(구분 칸 겹침 없음)
+ */
+(async () => {
+  const w = (ms) => new Promise((r) => setTimeout(r, ms));
+  const until = async (fn, ms = 8000) => {
+    for (let t = 0; t < ms; t += 150) {
+      const v = fn();
+      if (v) return v;
+      await w(150);
+    }
+    return null;
+  };
+  const out = {};
+  const node = await until(() => document.querySelector('[data-node="i|item1"]'));
+  if (!node) return JSON.stringify({ error: "item1 없음" });
+  node.click();
+  const card = await until(() =>
+    [...document.querySelectorAll(".m02-struct__card")].find((c) =>
+      c.querySelector("table.m02-labrow tbody tr[data-labor-logic]"),
+    ),
+  );
+  if (!card) return JSON.stringify({ error: "일위대가 카드 없음" });
+  [...card.querySelectorAll(".m02-struct__card-tools button")]
+    .find((b) => b.innerText.trim() === "수정")
+    ?.click();
+  const table = () =>
+    [...document.querySelectorAll("table.m02-labrow")].find(
+      (t) => !t.closest(".m02-struct__card") && t.querySelector("tr[data-labor-logic]"),
+    );
+  await until(() => table() && !/…/.test(table().querySelector("tbody").innerText), 12000);
+  const host = table().closest("[data-labor]");
+  [...host.querySelectorAll(".m01-logic__section-head button")]
+    .find((b) => b.innerText.trim() === "로직 추가")
+    .click();
+  const dlg = await until(() => document.querySelector(".m01-logic__pick"));
+  const rows = () => [...dlg.querySelectorAll(".ui-find__row")];
+  const isLib = (r) => r.querySelector(".ui-find__tag")?.innerText.trim() !== "단가산출";
+  await until(() => rows().some(isLib) && rows().some((r) => !isLib(r)), 20000);
+  await w(500);
+  const [subSel, detailSel] = dlg.querySelectorAll(".ui-find__filters select");
+  const set = async (sel, v) => {
+    sel.value = v;
+    sel.dispatchEvent(new Event("change", { bubbles: true }));
+    await w(120);
+  };
+  const libKeys = rows()
+    .filter(isLib)
+    .map((r) => r.dataset.pick);
+  out.libRows = libKeys.length;
+  const subVals = [...subSel.options].map((o) => o.value).filter(Boolean);
+  out.subDup = subVals.length - new Set(subVals).size;
+  const lib = {};
+  for (const k of libKeys)
+    lib[k] = {
+      subText: rows()
+        .find((r) => r.dataset.pick === k)
+        ?.querySelector(".ui-find__sub")?.innerText,
+      sub: [],
+      detail: [],
+      withLogic: false,
+    };
+  for (const s of subVals) {
+    await set(subSel, s);
+    const shown = rows();
+    const hasLogic = shown.some((r) => !isLib(r));
+    for (const r of shown.filter(isLib)) {
+      if (!lib[r.dataset.pick]) continue;
+      lib[r.dataset.pick].sub.push(s);
+      lib[r.dataset.pick].withLogic ||= hasLogic;
+    }
+    for (const d of [...detailSel.options].map((o) => o.value).filter(Boolean)) {
+      await set(detailSel, d);
+      for (const r of rows().filter(isLib)) lib[r.dataset.pick]?.detail.push(d);
+    }
+    await set(detailSel, "");
+  }
+  await set(subSel, "");
+  out.lib = lib;
+  [...dlg.querySelectorAll("button")].find((b) => b.innerText.trim() === "닫기")?.click();
+  out.closed = !document.querySelector(".m01-logic__pick");
+  document.querySelector('[data-node="i|item1"]')?.click();
+  await w(800);
+  const ask = [...document.querySelectorAll(".ui-modal button, dialog button")].find((x) =>
+    /확인|버림|떠나기/.test(x.innerText),
+  );
+  ask?.click();
+  return JSON.stringify(out);
+})();