Merge remote-tracking branch 'origin/sub_laptop_6' into sub_laptop_1

M02_MasterTemplete/M02_MasterTemplete_UI_Page.ts

@@ -244,8 +244,11 @@ export async function renderM02MasterTemplate(root: HTMLElement): Promise<Mounte
       user,
       active: { root: pre.root, owner: pre.owner },
       company,
-      go: (next) => setPre(next),
-      // 켜진 단추 다시 누름 = 그 층 목록표(생성 · 복사 · 삭제)
+      // 다른 층 = 저장 안 한 고침 물음 → 그 층 나무 + 목록표(720-1) · 켜진 단추 다시 누름 = 목록표
+      go: (next) =>
+        void main
+          .confirmLeave()
+          .then((ok) => ok && (setPre(next), void main.open(precomboList(pre)))),
       reselect: () =>
         void main.confirmLeave().then((ok) => ok && void main.open(precomboList(pre))),
     });
@@ -256,7 +259,14 @@ export async function renderM02MasterTemplate(root: HTMLElement): Promise<Mounte
       user,
       active: { root: sk.root, owner: sk.owner },
       company,
-      go: (next) => ((sk = preScope(next)), void side.refreshSangeun()),
+      go: (next) =>
+        void main
+          .confirmLeave()
+          .then(
+            (ok) =>
+              ok &&
+              ((sk = preScope(next)), void side.refreshSangeun(), void main.open(sangeunList(sk))),
+          ),
       reselect: () => void main.confirmLeave().then((ok) => ok && void main.open(sangeunList(sk))),
     });
   const side = buildSide({

resources/tester/test_m02_precombo_scope.py

@@ -73,7 +73,11 @@ def test_사전조합_층_단추는_페이지를_다시_안_세움():
     assert "navigateTo" not in pre and "setActiveLayer" not in pre  # 페이지 층 · 해시 이동 없음
     assert "entry.pre = pre.root;" in pre  # 구조물 조합 층 이동(go) 때도 주소에 남음
     bar = page.split("const preBar = (): HTMLElement =>")[1].split("const side = buildSide(")[0]
-    assert "go: (next) => setPre(next)," in bar and "main.open(precomboList(pre))" in bar
+    # 720-1 — 다른 층 = 저장 안 한 고침 물음 → 그 층 나무 + 목록표
+    go = bar.split("go: (next) =>")[1].split("reselect:")[0]
+    assert "main.confirmLeave()" in go and "setPre(next), void main.open(precomboList(pre))" in go
+    sk = page.split("const skBar = (")[1].split("const side = buildSide(")[0]
+    assert "main.confirmLeave()" in sk and "void main.open(sangeunList(sk))" in sk.split("reselect:")[0]
     # 구조물 조합 층 단추는 그대로 해시 이동 한 벌
     assert page.count('layerBar("') == 1
     assert 'layerBar("구조물조합", tree.add, () => void main.openTable(layer)),' in page