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

M02_MasterTemplete/M02_MasterTemplete_Labor_Api.ts

@@ -233,6 +233,9 @@ export interface LibraryRow {
   이름: string;
   제목?: string | null;
   단위?: string | null;
+  /** 단가승격 = 원 로직 것 · 사전조합 = 사용자가 고름(51-12) */
+  구분?: string | null;
+  상세구분?: string | null;
 }
 /** 서고 목록 — 그 층(주인) 단가승격 `promote` · 사전조합 `precombo` 문서 */
 export const fetchLibrary = async (

M02_MasterTemplete/M02_MasterTemplete_Labor_Pick.ts

@@ -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,7 @@ 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(),
           unit: x.row.단위 ?? "",
           onPick: () => {
             close();
@@ -142,6 +145,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 +162,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 +224,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"),

resources/tester/ui_checks/51-12_고르기_구분.js

@@ -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);
+})();