eomsangdon/Aislo
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
eomsangdon
2026-11-01 21:55:18 +09:00
parent d301ceb086 e9106ae4d6
commit 6fbb1c3f65
13 changed files with 225 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/tester/test_720_m02_folder_layer.py
+22 -2
View File
@@ -62,9 +62,9 @@ def test_화면_층_단추_최상위_폴더_이름_바꾸기():
assert "setPre(next), void main.open(precomboList(pre))" in page
assert "void main.open(sangeunList(sk))" in page.split("const skBar")[1].split("reselect:")[0]
# 720-2 — 층 줄 「+」 = 서고 칸 맨 위 메뉴 · 메뉴 줄 = 같은 addFolder([])
assert page.count(" add,\n") == 2
assert page.count(" add,\n") == 3 # 구조물 조합 · 일위대가 · 단가산출
assert "onClick: (event) => openTreeMenu(event, menuAt([]))" in lib
assert "add.hidden = !at.canWrite;" in lib and "opt.bar(add)" in lib
assert "add.hidden = !at.canWrite;" in lib and "opt.bar(addTools)" in lib
assert lib.count('L("M02_TreeAddTopFolder"), () => void addFolder([])') == 1 # 폴더 줄
assert '{ label: L("M02_TreeAddTopFolder"), run: () => void addFolder([])' in lib # 문서 줄
tree = _text("M02_MasterTemplete_TreePanel.ts")
@@ -74,3 +74,23 @@ def test_화면_층_단추_최상위_폴더_이름_바꾸기():
assert "이름: name }" in lib and "saveTemplate(at.layer, kind, row.이름, null" in lib
main = _text("M02_MasterTemplete_UI_Main.ts")
assert "title.textContent = at.label = named ? `${at.name} ${named}` : at.name;" in main
def test_구조물_조합_층_제자리_바꿈():
"""720-4 — 해시 이동 없음 · replaceState · 나무 · 층 줄 · 띠를 감싼 칸에 갈아 끼움 · 권한 = 함수 ·
도면 양식 · 실무문서 = 시스템 관리자면 늘 · 불러오기 장부 = 열 때 층 · 권한."""
page = _text("M02_MasterTemplete_UI_Page.ts")
assert "navigateTo" not in page
switch = page.split("const switchStructure = async")[1].split("const go =")[0]
assert "history.replaceState(" in switch and "build();" in switch
assert "await main.openTable(layer, null, true);" in switch
assert "if (mine !== turn) return;" in switch # 늦게 온 옛 고름 버림
build = page.split("const build = (): void => {")[1].split("const settleLayer")[0]
assert "topHost.replaceChildren(" in build and "treeHost.replaceChildren(" in build
assert "tree: [treeHost]," in page and "top: topHost," in page
assert "() => isAdmin," in page and 'isSystem: user?.role === "SYSTEM_ADMIN",' in page
assert "main.root.isConnected ? void afterItem()" in page # 나무를 갈아도 듣기 그대로
side = _text("M02_MasterTemplete_UI_Side.ts")
assert "const drawing = opt.isSystem" in side and "const practice = opt.isSystem" in side
hopyo = _text("M02_MasterTemplete_Hopyo_Side.ts")
assert "buildHopyoLedger({ scope: pageScope(), canWrite: opt.canWrite() })" in hopyo
resources/tester/test_m02_combo_screen.py
+1 -1
View File
@@ -106,7 +106,7 @@ def test_나무는_좌측_패널_찾기_칸_없음():
assert 'info.이름 === STRUCTURE_TABLE ? L("M02_KindTable")' in side # 좌측 줄 이름
page = _text(M02 / "M02_MasterTemplete_UI_Page.ts")
assert "createTreePanel({" in page and "tree.select(column)" in page
assert 'layerBar("구조물조합", tree.add, () => void main.openTable(layer)),' in page
assert "layerBar(tree.add, () => void main.openTable(layer))," in page
main = _text(M02 / "M02_MasterTemplete_UI_Main.ts")
assert 'at.kind === "table" && at.name === STRUCTURE_TABLE && at.layer !== "project"' in main
assert 'isCombo(next) ? L("M02_KindTable")' in main # 상세 제목
resources/tester/test_m02_combo_table.py
+3 -1
View File
@@ -87,7 +87,9 @@ def test_머리_고침은_쓸_수_있는_층만_나무로():
assert "readOnly || !extras.onHeadRename" in main
page = _text(M02 / "M02_MasterTemplete_UI_Page.ts")
assert "tree.editFromTable(headRenameEdit(col, level, name), col.id)" in page
assert page.index("...(canEdit(layer, isAdmin)\n ? {\n onHeadRename") > 0
assert (
"onHeadRename: (col: StructureColumn" in page
) # 720-4 — 가림은 편집 칸 readOnly · 나무 canEdit
tree = _text(M02 / "M02_MasterTemplete_TreePanel.ts")
assert "if (opt.canEdit && (await ready())) await edit(body, colId);" in tree
resources/tester/test_m02_hopyo_screen.py
+4 -2
View File
@@ -342,7 +342,7 @@ def test_좌측_판_자리와_권한():
order = ("precomboSec,", "summary,", "createDivider(),", "section(hopyo.title, hopyo.body),")
assert [host.index(k) for k in order] == sorted(host.index(k) for k in order)
assert host.index("section(hopyo.title, hopyo.body),") < host.index("drawing ?")
assert "canWrite: canEdit(layer, opt.isAdmin)," in side # 구조물 조합 층 쓰기 권한
assert "canWrite: opt.canWrite," in side # 구조물 조합 층 쓰기 권한(720-4 함수)
assert "hopyo.paint();" in side.split("function paint(): void {")[1]
hopyo_side = _text("M02_MasterTemplete_Hopyo_Side.ts")
# 718-1 — 제목 = 화면 글 키 · [불러오기] = 구조물 조합 층 단추 꼴 → 본 칸 마법사 · 옛 파일 목록 없음
@@ -351,7 +351,9 @@ def test_좌측_판_자리와_권한():
assert 'label: "불러오기"' in start and 'start.classList.add("m02-layers__btn");' in start
assert "buildHopyoWizard()" in hopyo_side and "listHopyo" not in hopyo_side
assert "uploadHopyo" not in hopyo_side and "openHopyoSheet" not in hopyo_side
assert "buildHopyoLedger({ scope, canWrite: opt.canWrite })" in hopyo_side # [별칭 장부]
assert (
"buildHopyoLedger({ scope: pageScope(), canWrite: opt.canWrite() })" in hopyo_side
) # [별칭 장부]
wizard = _text("M02_MasterTemplete_Hopyo_Wizard.ts")
assert 'accept: ".xls,.xlsx"' in wizard and "input.hidden = true;" in wizard
assert "accessFor(layer, null, user).canWrite" in wizard # 결과 층 = 쓸 수 있는 층만
resources/tester/test_m02_layer_screen.py
+13 -12
View File
@@ -181,7 +181,10 @@ def test_층_단추_셋_남의_회사_사람_나무():
page = _text(M02 / "M02_MasterTemplete_UI_Page.ts")
assert "createLayerBar({" in page and "setActiveLayer(layer, owner)" in page
assert "const company = viewCompany(entry, user);" in page
assert "await main.confirmLeave()" in page.split("const go =")[1].split("navigateTo(")[0]
# 720-4 — 다른 층 = 저장 안 한 고침 물음 뒤 제자리 바꿈(해시 이동 · 페이지 다시 세움 없음)
go = page.split("const go =")[1].split("};")[0]
assert "await main.confirmLeave()" in go and "await switchStructure(next, nextOwner);" in go
assert "navigateTo" not in page
assert 'dispose: () => setActiveLayer("system")' in page
assert "side.reveal(entry.open)" in page
roots = _text(M02 / "M02_MasterTemplete_TreePanel_Roots.ts")
@@ -192,9 +195,9 @@ def test_층_단추_셋_남의_회사_사람_나무():
assert "manages(company, user);" in roots.split("export const seesOthers")[1] # 맡은 회사(39-6)
assert "const readOnly = !people && !accessFor(" in roots # 사람 나무 = 고침
assert 'L("M02_PeopleEmpty")' in roots
assert 'const people = entry.root === "personal" && seesOthers(company, user);' in page
assert 'const many = want === "personal" && seesOthers(company, user);' in page
assert '(await fetchOwners("personal", company).catch(() => []))[0]?.owner' in page
assert 'peopleTree("구조물조합", tree.root)' in page
assert "peopleTree(tree.root)" in page
assert 'peopleTree("일위대가"' not in page # 일위대가 사람 나무 벌은 39-2 에서 지움
panel = _text(M02 / "M02_MasterTemplete_TreePanel.ts")
assert (
@@ -223,8 +226,8 @@ def test_층_길_접두어와_고정_풀림():
in labor
)
side = _text(M02 / "M02_MasterTemplete_UI_Side.ts")
assert "const layer = opt.layer;" in side
assert 'layer === "system"' in side # 도면 양식은 시스템 층에만
assert 'const layer: Layer = "system";' in side # 도면 양식은 시스템 층에만
assert "const drawing = opt.isSystem" in side # 720-4 — 시스템 관리자면 늘
main = _text(M02 / "M02_MasterTemplete_UI_Main.ts")
assert 'sel.layer !== "system"' not in main
assert 'return layer === "project" || isAdmin;' in main
@@ -236,7 +239,7 @@ def test_읽기만_회사용_개인용으로_복사_막대():
assert (
"readOnlyBar?.setColumn(column)" in page
) # 열 고름 → 막대 · 구조물 라이브러리가 함께 받음
assert "accessFor(layer, owner, user).needCompany" in page # 회사 없음 = 마스터로
assert "if (accessFor(lay, who, user).needCompany)" in page # 회사 없음 = 마스터로
assert "buildNeedCompany()" in _text(M02 / "M02_MasterTemplete_TreePanel_Roots.ts")
assert 'title: L("M02_Title")' in page # 한 화면 한 제목
layer = _text(LAYER)
@@ -290,7 +293,7 @@ def test_켜진_층_단추는_목록으로_복사_끌기():
roots = _text(M02 / "M02_MasterTemplete_TreePanel_Roots.ts")
assert "if (!current) opt.go(root, owner);\n else opt.reselect?.();" in roots
page = _text(M02 / "M02_MasterTemplete_UI_Page.ts")
assert 'layerBar("구조물조합", tree.add, () => void main.openTable(layer))' in page
assert "layerBar(tree.add, () => void main.openTable(layer))" in page
# 39-6 — 쓸 수 있는 층 전부(볼 회사 주인까지 · 지금 층 뺌) · 대상 폴더 고르는 창
assert 'const toOwner = one === "company" ? companyOwner(company, user) : null;' in page
assert "(to === layer && toOwner === here)) return [];" in page
@@ -316,12 +319,10 @@ def test_구조물_조합_제목_줄_새_항목():
r"\s*\.\.\.\(extras\.newItem \? \[extras\.newItem\] : \[\]\),?\s*\]",
main,
)
assert "if (extras.newItem) extras.newItem.hidden = !combo;" in main
# 720-4 — 쓸 수 있는 층만 = 편집 칸이 고른 것 권한으로 가림(층이 제자리에서 바뀜)
assert "extras.newItem.hidden = !combo || !sel || !writable(sel);" in main
page = _text(M02 / "M02_MasterTemplete_UI_Page.ts")
assert (
"...(canEdit(layer, isAdmin) ? { newItem: newItemButton(() => void openNew()) } : {})"
in page
)
assert "newItem: newItemButton(() => void openNew())," in page
panel = _text(M02 / "M02_MasterTemplete_TreePanel.ts")
assert 'return at?.kind === "folder" ? at.path : [];' in panel # 고른 폴더(39-5 folder())
assert "const newItem = (): void => void addItem(folder());" in panel
resources/tester/test_m02_practice.py
+2 -2
View File
@@ -51,9 +51,9 @@ def test_통째_지우기_시스템_관리자만_판_쓰는_곳(world, master_co
def test_화면_시스템_관리자_마스터만_물음_두_번_읽기만():
side = (M02 / "M02_MasterTemplete_UI_Side.ts").read_text("utf-8")
assert 'layer === "system" && opt.isAdmin' in side
assert "const practice = opt.isSystem" in side # 720-4 — 시스템 관리자면 늘
order = side.split('className: "m02-side__lists ui-sidebar-panel",')[1].split("});")[0]
assert order.index("extras.도면") < order.index("practice") # 도면 양식 아래
assert order.index("drawing ?") < order.index("practice ?") # 도면 양식 아래
view = (M02 / "M02_MasterTemplete_Practice.ts").read_text("utf-8")
assert view.count("showConfirmDialog(") == 2
assert "dropPractice(" in view and "createInputField" not in view # 고칠 칸 없음
resources/tester/test_m02_precombo_scope.py
+7 -5
View File
@@ -72,15 +72,17 @@ def test_사전조합_층_단추는_페이지를_다시_안_세움():
assert "history.replaceState(" in pre and "side.refreshPrecombo()" in pre
assert "navigateTo" not in pre and "setActiveLayer" not in pre # 페이지 층 · 해시 이동 없음
assert "entry.pre = pre.root;" in pre # 구조물 조합 층 이동(go) 때도 주소에 남음
bar = page.split("const preBar = (add: HTMLElement): HTMLElement =>")[1].split("const side = buildSide(")[0]
bar = page.split("const preBar = (add: HTMLElement): HTMLElement =>")[1].split(
"const side = buildSide("
)[0]
# 720-1 — 다른 층 = 저장 안 한 고침 물음 → 그 층 나무 + 목록표
go = bar.split("go: (next) =>")[1].split("reselect:")[0]
assert ".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 ".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
# 구조물 조합 층 단추 한 벌(720-4 제자리 바꿈)
assert page.count("layerBar(") == 1
assert "layerBar(tree.add, () => void main.openTable(layer))," in page
assert "precombo: {\n scope: () => pre,\n bar: preBar," in page # 706-1 more 덧붙음
@@ -92,7 +94,7 @@ def test_고름에_owner_권한_서고_길에_명시_owner():
assert "listTemplates(at.layer, null, at.owner)" in lib_side
main = _text("M02_MasterTemplete_UI_Main.ts")
assert (
"const writable = (at: Selection): boolean => at.canWrite ?? canEdit(at.layer, isAdmin);"
"const writable = (at: Selection): boolean => at.canWrite ?? canEdit(at.layer, isAdmin());"
in main
)
assert "readTemplate(next.layer, next.kind, next.name, next.projectId, next.owner)" in main
resources/tester/test_m02_structure_panel.py
+1 -1
View File
@@ -180,7 +180,7 @@ def test_면적_오른쪽_일위대가_패널은_공용_틀_손잡이():
def test_첫_화면과_닫은_뒤는_구조물집계표():
page = _text(M02 / "M02_MasterTemplete_UI_Page.ts")
assert re.search(r'kind: "table",\s*name: STRUCTURE_TABLE', page)
assert "main.open(sel ?? home)" in page and "void main.open(home);" in page
assert "main.open(sel ?? home())" in page and "void main.open(home());" in page
def test_좌측_고름_표시는_열린_것_한_줄뿐():