From f1c16e82822af52d98113ba6e38c4a3144c6a9f8 Mon Sep 17 00:00:00 2001 From: king Date: Tue, 1 Sep 2026 17:36:16 +0900 Subject: [PATCH] =?UTF-8?q?fix(cupang):=20=E2=91=A2=20=EB=A7=8C=20?= =?UTF-8?q?=EB=82=B4=EB=B6=80=20=EC=8A=A4=ED=81=AC=EB=A1=A4,=20=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EC=A0=84=EC=B2=B4=20=EC=8A=A4=ED=81=AC?= =?UTF-8?q?=EB=A1=A4=EC=9D=80=20=EC=97=86=EC=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 앞선 커밋의 .cpg-page-grow(페이지가 늘어나는 방식)를 되돌리고, ③ 카드는 overflow:hidden + 목록만 스크롤로 복구. JS 높이 계산 대상에 ③ 목록을 다시 포함(창높이-요소top, 260 이하면 60vh). Co-Authored-By: Claude Opus 5 --- .../cupang/templates/cupang/box_calc.html | 12 +++---- .../cupang/templates/cupang/box_rules.html | 2 +- .../cupang/templates/cupang/centers.html | 2 +- .../cupang/templates/cupang/index.html | 2 +- .../cupang/templates/cupang/products.html | 2 +- app/modules/cupang/templates/cupang/view.html | 2 +- app/static/cupang.css | 32 +++++++------------ 7 files changed, 22 insertions(+), 32 deletions(-) diff --git a/app/modules/cupang/templates/cupang/box_calc.html b/app/modules/cupang/templates/cupang/box_calc.html index 636226f..d4c9c9c 100644 --- a/app/modules/cupang/templates/cupang/box_calc.html +++ b/app/modules/cupang/templates/cupang/box_calc.html @@ -1,9 +1,9 @@ {% extends "erp_base.html" %} -{% block head_extra %}{% endblock %} +{% block head_extra %}{% endblock %} {% block content %} -
+
◀◀ 달력 @@ -1066,13 +1066,13 @@ syncConfirm(); } - // ── ①② 스크롤 영역 높이 ────────────────────────── - // ③ 센터 분배는 내용만큼 아래로 늘어나야 하므로 건드리지 않는다 - // (넘치면 페이지가 스크롤된다). + // ── ①②③ 스크롤 영역 높이 ──────────────────────── + // 세 영역 모두 화면 안에서만 스크롤한다(문서 전체는 스크롤하지 않음). function fitScrollAreas() { var panes = [ document.querySelector(".cpg-calc-card .erp-table-wrap"), - document.querySelector(".cpg-calc-sum .cpg-sum-scroll") + document.querySelector(".cpg-calc-sum .cpg-sum-scroll"), + distList ]; panes.forEach(function (el) { if (!el) return; diff --git a/app/modules/cupang/templates/cupang/box_rules.html b/app/modules/cupang/templates/cupang/box_rules.html index 438e494..1e9d938 100644 --- a/app/modules/cupang/templates/cupang/box_rules.html +++ b/app/modules/cupang/templates/cupang/box_rules.html @@ -1,6 +1,6 @@ {% extends "erp_base.html" %} -{% block head_extra %}{% endblock %} +{% block head_extra %}{% endblock %} {% block content %}
diff --git a/app/modules/cupang/templates/cupang/centers.html b/app/modules/cupang/templates/cupang/centers.html index 761fb1d..7d7a0c2 100644 --- a/app/modules/cupang/templates/cupang/centers.html +++ b/app/modules/cupang/templates/cupang/centers.html @@ -1,6 +1,6 @@ {% extends "erp_base.html" %} -{% block head_extra %}{% endblock %} +{% block head_extra %}{% endblock %} {% block content %}
diff --git a/app/modules/cupang/templates/cupang/index.html b/app/modules/cupang/templates/cupang/index.html index fa91b5f..0b380cc 100644 --- a/app/modules/cupang/templates/cupang/index.html +++ b/app/modules/cupang/templates/cupang/index.html @@ -1,6 +1,6 @@ {% extends "erp_base.html" %} -{% block head_extra %}{% endblock %} +{% block head_extra %}{% endblock %} {% block content %}
diff --git a/app/modules/cupang/templates/cupang/products.html b/app/modules/cupang/templates/cupang/products.html index ca63e5b..5380aaa 100644 --- a/app/modules/cupang/templates/cupang/products.html +++ b/app/modules/cupang/templates/cupang/products.html @@ -1,6 +1,6 @@ {% extends "erp_base.html" %} -{% block head_extra %}{% endblock %} +{% block head_extra %}{% endblock %} {% block content %}
diff --git a/app/modules/cupang/templates/cupang/view.html b/app/modules/cupang/templates/cupang/view.html index 44e841d..b5abe63 100644 --- a/app/modules/cupang/templates/cupang/view.html +++ b/app/modules/cupang/templates/cupang/view.html @@ -1,6 +1,6 @@ {% extends "erp_base.html" %} -{% block head_extra %}{% endblock %} +{% block head_extra %}{% endblock %} {% block content %} {# 출고 묶음 보기 — 상자 계산 화면과 같은 3열 구성. 읽기 전용(수정 없음). #} diff --git a/app/static/cupang.css b/app/static/cupang.css index 2f19602..b018a61 100644 --- a/app/static/cupang.css +++ b/app/static/cupang.css @@ -1494,10 +1494,10 @@ body.cpg-dragging { cursor: grabbing; user-select: none; } .cpg-dist-card::-webkit-scrollbar-thumb:hover { background: var(--color-midtone-gray); } /* ── 스크롤 최종 보정 — id 선택자 + !important 로 확정 ── */ -/* ③ 센터 목록은 내용만큼 늘어난다(자르지 않음). 넘치면 페이지가 스크롤. */ +/* ③ 센터 목록은 카드 안에서만 스크롤 */ #cpg-dist-list { - max-height: none !important; - overflow: visible !important; + min-height: 0 !important; + overflow-y: auto !important; } .cpg-calc-card .erp-table-wrap { max-height: 52vh !important; @@ -1507,24 +1507,14 @@ body.cpg-dragging { cursor: grabbing; user-select: none; } max-height: 52vh !important; overflow-y: auto !important; } -.cpg-calc3 > .cpg-dist-card { max-height: none !important; overflow: visible !important; } +.cpg-calc3 > .erp-card { max-height: 86vh !important; } -/* ③ 센터 분배 — 내용에 따라 높이가 늘어나도록 (클리핑/스크롤 제거) */ -.cpg-dist-card, -.cpg-calc3 > .cpg-dist-card { max-height: none !important; overflow: visible !important; } -.cpg-dist-card .cpg-dist-list, -#cpg-dist-list { - max-height: none !important; - overflow: visible !important; - min-height: 0; +/* ③ 센터 분배 — 카드는 잘라내고 목록만 스크롤 */ +.cpg-dist-card { overflow: hidden !important; } +.cpg-dist-card .cpg-dist-list { + flex: 1 1 auto; + min-height: 0 !important; + overflow-y: auto !important; + overflow-x: hidden; } -/* ── 상자 계산 화면: 내용만큼 늘어나고, 넘치면 페이지(.erp-page)가 스크롤 ── - .cpg 는 기본적으로 flex:1 1 auto + min-height:0 이라 남은 높이에 맞춰 - 눌리기만 하고(=페이지가 안 늘어남) 넘친 내용이 잘려 보였다. */ -.erp-page > .cpg-page-grow { - flex: 0 0 auto; - min-height: auto; -} -.cpg-page-grow .cpg-calc3 { flex: 0 0 auto; min-height: 0; } -.cpg-page-grow .cpg-dist-card { align-self: start; }