From 1129db9e2152b90615b2d5d1a1e77af6a0b33382 Mon Sep 17 00:00:00 2001 From: king Date: Tue, 29 Sep 2026 23:55:53 +0900 Subject: [PATCH] =?UTF-8?q?fix(performance):=20=EC=A3=BC=EB=AC=B8=20?= =?UTF-8?q?=EB=82=B4=EC=97=AD=20=EC=B0=BD=20=EA=B3=A0=EC=A0=95=20=EC=97=B4?= =?UTF-8?q?=20=EC=A0=9C=EB=AA=A9=20=EB=B0=B0=EA=B2=BD=20=ED=88=AC=EB=AA=85?= =?UTF-8?q?=20=EB=AC=B8=EC=A0=9C=20+=20=EC=B7=A8=EC=86=8C=20=ED=96=89=20?= =?UTF-8?q?=EC=A0=84=EC=B2=B4=20=EC=84=9C=EC=8B=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 창(.perf-modal)은 document.body 에 붙어 .perf 밖이라 --perf-soft 등 색 변수가 없어 고정된 열 제목 배경이 투명 → 내용이 겹쳐 보였다. 색 변수를 .perf-modal 에도 정의하고 열 제목 배경·아래 줄을 명시 - 취소 행은 행 전체를 기울임 + 취소선 + 회색 Co-Authored-By: Claude Opus 5.5 --- app/modules/performance/templates/performance/index.html | 4 ++-- .../performance/templates/performance/settings.html | 4 ++-- app/static/performance.css | 9 +++++++-- app/static/performance.js | 5 ++--- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/app/modules/performance/templates/performance/index.html b/app/modules/performance/templates/performance/index.html index a7e0148..acad170 100644 --- a/app/modules/performance/templates/performance/index.html +++ b/app/modules/performance/templates/performance/index.html @@ -1,6 +1,6 @@ {% extends "erp_base.html" %} -{% block head_extra %}{% endblock %} +{% block head_extra %}{% endblock %} {%- macro won(v) -%} {%- if v is none -%} @@ -239,4 +239,4 @@ } | tojson }} {% endblock %} -{% block scripts %}{% endblock %} +{% block scripts %}{% endblock %} diff --git a/app/modules/performance/templates/performance/settings.html b/app/modules/performance/templates/performance/settings.html index 99e7a08..06da1de 100644 --- a/app/modules/performance/templates/performance/settings.html +++ b/app/modules/performance/templates/performance/settings.html @@ -1,6 +1,6 @@ {% extends "erp_base.html" %} -{% block head_extra %}{% endblock %} +{% block head_extra %}{% endblock %} {%- macro when(v) -%}{{ (v or '')[:16] | replace('T', ' ') or '—' }}{%- endmacro -%} @@ -155,4 +155,4 @@ {% endblock %} -{% block scripts %}{% endblock %} +{% block scripts %}{% endblock %} diff --git a/app/static/performance.css b/app/static/performance.css index d6ed4bc..1231438 100644 --- a/app/static/performance.css +++ b/app/static/performance.css @@ -2,13 +2,16 @@ 실적(쇼핑몰 통합 매출) — 정보 밀도 높은 관리자 대시보드. 기존 ERP 토큰(erp.css :root) 위에서만 쓴다. 색은 증감·상태·주말에만. ════════════════════════════════════════════════════ */ -.perf { +/* 색 변수 — 창(.perf-modal)은 document.body 에 붙어 .perf 밖이라 같이 정의한다 */ +.perf, .perf-modal { --perf-line: var(--color-subtle-ash); --perf-soft: #fafafa; --perf-up: #0f8a3a; --perf-down: var(--color-callout-red); --perf-sat: #1d4ed8; --perf-sun: var(--color-callout-red); +} +.perf { display: flex; flex-direction: column; gap: 12px; font-variant-numeric: tabular-nums; } @@ -223,4 +226,6 @@ td.is-link:hover { background: #eef2ff; text-decoration: underline; } text-align: center; font-weight: 700; font-size: 18px; color: var(--color-deep-black, #111); position: sticky; top: -12px; z-index: 2; } -.perf-ev-table td.perf-ev-kind-cancel { font-style: italic; text-decoration: line-through; color: #9a9a9a; } +.perf-ev-table thead th { background: var(--perf-soft, #fafafa); box-shadow: 0 1px 0 var(--perf-line, #e5e5e5); } +/* 취소 행 — 행 전체를 기울임 + 취소선 + 회색 */ +.perf-ev-table tr.is-cancel td { font-style: italic; text-decoration: line-through; color: #9a9a9a; } diff --git a/app/static/performance.js b/app/static/performance.js index 2a74e43..7bc5037 100644 --- a/app/static/performance.js +++ b/app/static/performance.js @@ -187,9 +187,8 @@ const body = rows.map(function (r) { sum += r.amount; if (r.amount >= 0) sales += r.amount; else minus += r.amount; - return '' + - "" + esc(r.sales_date) + "" + - esc(KIND[r.event_type] || r.event_type) + + return '' + + "" + esc(r.sales_date) + "" + esc(KIND[r.event_type] || r.event_type) + (r.is_sample ? ' 테스트' : "") + "" + "" + esc(r.external_order_id) + "" + "" + esc(r.product_name) + (r.option_name ? " " + esc(r.option_name) + "" : "") + "" +