feat(project): 연간 목표 엑셀식 칸 병합(끌어 고르기·우클릭 병합/해제) + 월별 주간 회의록

엑셀식 칸 병합 (예전 Shift+클릭·병합 버튼·오른쪽/왼쪽 칸 병합 메뉴 대체)
- 글 칸을 마우스로 끌어(또는 Shift+클릭) 사각형 선택 → 우클릭 "셀 병합 (N줄 × M칸)" / "병합 해제"
- 같은 업무 영역 안 세로(row_span) + 같은 반기 월 칸 가로, 연간·상·하반기 칸은 세로로만
- 걸친 병합은 엑셀처럼 범위를 넓혀 흡수, 글은 왼쪽 위부터 이어 왼쪽 위 칸에, 해제하면 왼쪽 위 칸에 남음
- POST /api/goals/areas/{id}/merge {row_from,row_to,col_from,col_to} (db.merge_goal_rect), router._goal_area_layout(colspan·rowspan)
- 가려진 칸 저장 거절(세로 포함), 병합 안쪽 줄 끼우기 +1 / 가려진 줄 지우기 -1, 세로 병합에 걸린 줄 이동 거절

주간 회의록 (/project/goals/{연도}/meetings/{월}, 목표 표 월 머리 클릭)
- 주(월~일) 탭, 주마다 회의록: 이번주 할 일·목표 금액 | 지난주 할 일·목표·결과·달성률·평가
- 앞선 회의록 줄 이어받기(carry_from), 처음이면 목표 표 업무 영역 + 기본 양식 줄(유통 줄 쇼핑몰 연결 추측)
- 머리: 월 목표·지난주까지 누적·주당 필요 매출(페이싱)·전주 목표/결과/달성률·금주 목표/현재 실적
- 쇼핑몰 연결 줄의 결과·누적·주간 매출은 실적 모듈 performance_store 읽기 전용(없으면 직접 입력)
- 금액 입력 120만·1.5억·3천만·1억2천만, 참석자·결정 사항 메모, 줄 메뉴(추가·순서·쇼핑몰 연결·삭제), 인쇄

마이그레이션 015(project_db): goal_cell_merges.row_span + CHECK 교체, goal_meetings, goal_meeting_items
캐시 버전 20261001c, 테스트(DB 회귀 test_goal_rect_merges·test_goal_meetings)·문서 갱신

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
2026-10-01 11:46:25 +09:00
parent 614747ffca
commit c9bce7c976
16 changed files with 1966 additions and 198 deletions
+139 -4
View File
@@ -2147,17 +2147,152 @@ textarea.pj-goal-text::placeholder { color: rgba(0, 0, 0, .3); }
.pj-goal-row-text[data-goal-edit]:empty { min-height: 1.5em; }
.pj-goal-row-text[data-goal-edit]:empty:hover::before { content: "줄 이름"; color: rgba(0, 0, 0, .3); font-weight: 500; }
/* 월 칸 병합 — Shift+클릭 선택 표시와 떠 있는 병합 버튼(body 에 붙음) */
/* 칸 병합 — 끌어서(또는 Shift+클릭) 고른 범위 표시. 우클릭 메뉴로 셀 병합·병합 해제 */
.pj-goal-table td.pj-goal-texttd.is-merge-sel {
box-shadow: inset 0 0 0 2px var(--pj-accent);
background-image: linear-gradient(rgba(123, 104, 238, .12), rgba(123, 104, 238, .12));
}
.pj-goal-mergebar { position: fixed; z-index: 1000; }
.pj-goal-mergebar .pj-btn { display: inline-flex; align-items: center; gap: 4px; box-shadow: 0 6px 18px rgba(16, 24, 40, .2); }
.pj-goal-mergebar .material-symbols-outlined { font-size: 18px; }
.pj-goal-foot { display: flex; align-items: center; gap: 12px; margin: 12px 0 4px; }
/* 칸 병합 — 끌어서 고르는 동안 글 선택 막기 */
html.pj-goal-selecting, html.pj-goal-selecting * { user-select: none !important; cursor: cell !important; }
/* 월 머리 → 그 달 주간 회의록 */
.pj-goal-mlink { color: inherit; text-decoration: none; border-radius: 5px; padding: 2px 4px; }
.pj-goal-mlink:hover { color: var(--pj-accent-dark); background: var(--pj-accent-tint); }
.pj-btn-sm { padding: 4px 10px; font-size: 12.5px; text-decoration: none; display: inline-flex; align-items: center; }
/* ════════════════════════════════════════════════════════════
주간 회의록(goal_meeting.html) — 주차 탭 · 머리 숫자 카드 · 구역별 줄(이번주 | 지난주 리뷰) · 메모
════════════════════════════════════════════════════════════ */
.pj-meet-pane { flex: 1 1 auto; min-height: 0; overflow: auto; }
.pj-meet-title { display: flex; align-items: center; gap: 8px; }
.pj-meet-title h2 { margin: 0 6px 0 0; }
.pj-meet-back { display: inline-flex; color: var(--pj-ink-soft); border-radius: 6px; padding: 2px; }
.pj-meet-back:hover { background: #f1f2f4; color: var(--pj-ink); }
.pj-goal-head-acts .pj-btn .material-symbols-outlined { font-size: 17px; vertical-align: -3px; }
.pj-meet-weeks { display: flex; flex-wrap: wrap; gap: 6px; margin: 0 0 14px; padding-top: 9px; } /* "이번 주" 꼬리표 자리 */
.pj-meet-week {
position: relative; display: flex; flex-direction: column; gap: 1px; min-width: 104px; padding: 7px 12px;
border: 1px solid var(--pj-border); border-radius: 10px; background: #fff; color: var(--pj-ink); text-decoration: none;
}
.pj-meet-week b { font-size: 13px; }
.pj-meet-week span { font-size: 11.5px; color: var(--pj-ink-soft); }
.pj-meet-week em { position: absolute; top: -8px; right: 8px; font-style: normal; font-size: 10.5px; font-weight: 700;
padding: 0 6px; border-radius: 999px; background: var(--pj-accent); color: #fff; }
.pj-meet-week:hover { border-color: #cfd3d8; background: #fafafb; }
.pj-meet-week.is-on { border-color: var(--pj-accent); box-shadow: inset 0 0 0 1px var(--pj-accent); background: var(--pj-accent-tint); }
.pj-meet-dot { position: absolute; top: 9px; right: 9px; width: 7px; height: 7px; border-radius: 50%; background: #34a853; }
.pj-meet-kpis { display: grid; grid-template-columns: repeat(4, minmax(0, 1fr)); gap: 8px; margin-bottom: 8px; }
.pj-meet-kpis.is-week { grid-template-columns: repeat(5, minmax(0, 1fr)); margin-bottom: 12px; }
.pj-meet-kpi {
display: flex; flex-direction: column; gap: 2px; padding: 10px 12px; border: 1px solid var(--pj-border);
border-radius: 10px; background: #fff; min-width: 0;
}
.pj-meet-kpi.is-accent { border-color: #cfc6fb; background: #faf9ff; }
.pj-meet-kpi.is-input { border-color: #f6c69a; background: #fffaf4; }
.pj-meet-kpi-label { font-size: 12px; color: var(--pj-ink-soft); font-weight: 600; }
.pj-meet-kpi-label small { font-weight: 500; }
.pj-meet-kpi-val { font-size: 19px; font-weight: 800; font-variant-numeric: tabular-nums; display: flex; align-items: baseline; gap: 3px; }
.pj-meet-kpi-val small { font-size: 12px; font-weight: 600; color: var(--pj-ink-soft); }
.pj-meet-kpi-val.is-good { color: #1f8a4c; }
.pj-meet-kpi-val.is-low { color: #c2410c; }
.pj-meet-kpi-sub { font-size: 11.5px; color: var(--pj-ink-soft); }
.pj-meet-kpi .pj-meet-amount {
font-size: 18px; font-weight: 800; height: 30px; width: 100%; max-width: 190px; text-align: left;
border: 1px solid #f3d2b0; border-radius: 7px; background: #fff; padding: 0 8px;
}
@media (max-width: 1100px) { .pj-meet-kpis, .pj-meet-kpis.is-week { grid-template-columns: repeat(2, minmax(0, 1fr)); } }
.pj-meet-attend { display: flex; align-items: center; gap: 8px; margin: 0 0 10px; font-size: 12.5px; font-weight: 600; color: var(--pj-ink-soft); }
.pj-meet-attend input { flex: 0 1 420px; height: 30px; padding: 0 8px; border: 1px solid var(--pj-border); border-radius: 7px; font: inherit; color: var(--pj-ink); font-weight: 500; }
.pj-meet-table {
width: 100%; border-collapse: separate; border-spacing: 0; table-layout: fixed; font-size: 12.5px;
background: #fff; border: 1px solid #dfe2e6; border-radius: 10px; color: var(--pj-ink);
}
.pj-meet-table th, .pj-meet-table td {
box-sizing: border-box; border-right: 1px solid #e6e8eb; border-bottom: 1px solid #e6e8eb; padding: 0; vertical-align: top;
}
.pj-meet-table tr > :last-child { border-right: none; }
.pj-meet-table thead th {
position: sticky; top: 0; z-index: 3; background: #f7f8f9; height: 32px; padding: 0 8px; font-weight: 700;
text-align: center; vertical-align: middle; white-space: nowrap;
}
.pj-meet-table thead tr.pj-meet-group th { top: 0; height: 26px; font-size: 12px; }
.pj-meet-table thead tr:nth-child(2) th { top: 26px; }
.pj-meet-table thead th.is-this { background: #fff7ed; color: #9a4b0b; }
.pj-meet-table thead th.is-prev { background: #f1f3f6; color: #4b5563; }
.pj-meet-w-sec { width: 80px; }
.pj-meet-w-label { width: 160px; }
.pj-meet-w-amt { width: 122px; }
.pj-meet-w-rate { width: 76px; }
.pj-meet-w-eval { width: 88px; }
.pj-meet-sec > tr > th, .pj-meet-sec > tr > td:not(.is-prev) { background: var(--goal-bg, #fff); border-color: rgba(0, 0, 0, .07); }
.pj-meet-sec > tr > td.is-prev { background: #fafbfc; }
.pj-meet-sec > tr:first-child > * { border-top: 1px solid rgba(0, 0, 0, .12); }
.pj-meet-sec th { padding: 7px 8px; vertical-align: middle; text-align: center; }
th.pj-meet-c-sec { position: relative; font-size: 13px; font-weight: 800; }
.pj-meet-sec-add {
display: block; margin: 4px auto 0; width: 22px; height: 22px; border: 1px dashed rgba(0, 0, 0, .25); border-radius: 6px;
background: rgba(255, 255, 255, .6); color: var(--pj-ink-soft); cursor: pointer; line-height: 18px; opacity: 0; transition: opacity .12s;
}
th.pj-meet-c-sec:hover .pj-meet-sec-add, .pj-meet-sec-add:focus { opacity: 1; }
th.pj-meet-c-label { position: relative; font-weight: 600; color: #3b4048; text-align: left; }
.pj-meet-label { word-break: keep-all; overflow-wrap: anywhere; }
.pj-meet-label[data-meet-edit] { cursor: text; border-radius: 5px; padding: 1px 3px; margin: -1px -3px; }
.pj-meet-label[data-meet-edit]:hover { background: rgba(255, 255, 255, .65); box-shadow: 0 0 0 1px rgba(0, 0, 0, .14); }
.pj-meet-label.is-editing { background: #fff; box-shadow: 0 0 0 2px var(--pj-accent); outline: none; }
.pj-meet-label[data-meet-edit]:empty { display: inline-block; min-width: 3em; min-height: 1.4em; }
.pj-meet-market {
display: inline-block; margin-left: 4px; padding: 0 6px; border-radius: 999px; font-size: 10.5px; font-weight: 700;
background: #e8f1ff; color: #1d4ed8; vertical-align: 1px;
}
.pj-meet-more { position: absolute; top: 3px; right: 2px; width: 24px; height: 24px; opacity: 0; transition: opacity .12s; }
.pj-meet-more .material-symbols-outlined { font-size: 18px; }
th.pj-meet-c-label:hover .pj-meet-more, .pj-meet-more:focus { opacity: 1; }
textarea.pj-meet-text, .pj-meet-notes textarea {
display: block; width: 100%; box-sizing: border-box; min-height: 38px; padding: 6px; border: none; background: transparent;
font: inherit; line-height: 1.5; color: inherit; resize: none; overflow: hidden;
}
textarea.pj-meet-text:focus, .pj-meet-notes textarea:focus { outline: 2px solid var(--pj-accent); outline-offset: -2px; background: rgba(255, 255, 255, .8); }
.pj-meet-ro { min-height: 38px; padding: 6px; line-height: 1.5; white-space: pre-wrap; overflow-wrap: anywhere; }
.pj-meet-table td.pj-meet-c-amt { text-align: right; vertical-align: middle; padding: 0 6px; font-variant-numeric: tabular-nums; }
input.pj-meet-amount {
display: block; width: 100%; box-sizing: border-box; height: 34px; padding: 0 4px; border: none; background: transparent;
font: inherit; text-align: right; font-variant-numeric: tabular-nums;
}
input.pj-meet-amount:focus { outline: 2px solid var(--pj-accent); outline-offset: -2px; background: #fff; }
input.pj-meet-amount::placeholder { color: rgba(0, 0, 0, .28); }
.pj-meet-auto { color: #1d4ed8; font-weight: 600; }
.pj-meet-auto::before { content: "자동 "; font-size: 10.5px; font-weight: 700; color: #6b8fd6; }
.pj-meet-c-rate { text-align: right; vertical-align: middle !important; padding: 0 6px !important; font-weight: 700; }
.pj-meet-c-rate .is-good { color: #1f8a4c; }
.pj-meet-c-rate .is-low { color: #c2410c; }
.pj-meet-c-eval { vertical-align: middle !important; text-align: center; }
select.pj-meet-eval { width: calc(100% - 8px); height: 28px; margin: 0 4px; border: 1px solid var(--pj-border); border-radius: 6px; background: #fff; font: inherit; }
select.pj-meet-eval[data-v="done"], .pj-meet-eval-ro[data-v="done"] { color: #1f8a4c; font-weight: 700; }
select.pj-meet-eval[data-v="partial"], .pj-meet-eval-ro[data-v="partial"] { color: #b45309; font-weight: 700; }
select.pj-meet-eval[data-v="miss"], .pj-meet-eval-ro[data-v="miss"] { color: #c22b10; font-weight: 700; }
.pj-meet-table td.is-none { vertical-align: middle; padding: 0 8px; font-size: 12px; }
.pj-meet-table td.is-saved, .pj-meet-table th.is-saved, .pj-meet-notes textarea.is-saved, #pj-meet-attendees.is-saved {
animation: pj-goal-saved 1s ease-out;
}
.pj-meet-notes { margin: 16px 0 8px; }
.pj-meet-notes h3 { margin: 0 0 6px; font-size: 14px; }
.pj-meet-notes textarea, .pj-meet-notes .pj-meet-ro { border: 1px solid #dfe2e6; border-radius: 10px; background: #fff; min-height: 90px; padding: 10px; }
/* 인쇄 — 회의록 표만 */
@media print {
.erp-sidebar, .erp-topbar, .pj-side, .pj-goal-head-acts, .pj-meet-weeks, .pj-goal-foot, .pj-meet-more, .pj-meet-sec-add,
.pj-meet-back, .pj-meet-title .pj-btn { display: none !important; }
.pj-meet-pane { overflow: visible; }
.pj-meet-table thead th { position: static; }
input.pj-meet-amount, select.pj-meet-eval { border: none; appearance: none; }
}
/* 영역 색 고르기 팝업(body 에 붙음) */
.pj-goal-colorpop {
position: fixed; z-index: 1000; display: grid; grid-template-columns: repeat(8, 26px); gap: 6px;