From 60265f0cf6f46b8b20b2a309eb20672328906f3e Mon Sep 17 00:00:00 2001 From: king Date: Mon, 28 Sep 2026 21:15:26 +0900 Subject: [PATCH] =?UTF-8?q?feat(project):=20=EB=8C=93=EA=B8=80=20=EC=9E=85?= =?UTF-8?q?=EB=A0=A5=EC=B9=B8=20@=ED=83=9C=EA=B7=B8=20=EB=B2=84=ED=8A=BC,?= =?UTF-8?q?=20=EB=8B=B5=EA=B8=80=20=EB=93=A4=EC=97=AC=EC=93=B0=EA=B8=B0=20?= =?UTF-8?q?+=20=E2=86=B3=20=ED=99=94=EC=82=B4=ED=91=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 5.5 --- .../project/templates/project/help.html | 4 +-- .../project/templates/project/inbox.html | 4 +-- .../project/templates/project/mytasks.html | 4 +-- .../project/templates/project/project.html | 4 +-- .../project/templates/project/trash.html | 4 +-- app/static/project.css | 7 +++- app/static/project.js | 32 +++++++++++++++++++ 7 files changed, 48 insertions(+), 11 deletions(-) diff --git a/app/modules/project/templates/project/help.html b/app/modules/project/templates/project/help.html index fc480ad..7a0548d 100644 --- a/app/modules/project/templates/project/help.html +++ b/app/modules/project/templates/project/help.html @@ -1,7 +1,7 @@ {% extends "erp_base.html" %} {% block head_extra %} - + {% endblock %} @@ -294,7 +294,7 @@

작업은 하나라서 어느 보드에서 고쳐도 모두 같이 바뀝니다.

댓글

-

작업 창 맨 아래에 항상 고정된 댓글 칸에 쓰고 Enter(스크롤해도 그 자리에 있습니다). 내가 쓴 댓글은 ✎로 고치고 ×로 지웁니다. 댓글 속 웹 주소는 링크가 됩니다.

+

작업 창 맨 아래에 항상 고정된 댓글 칸에 쓰고 Enter(스크롤해도 그 자리에 있습니다). 칸 오른쪽 ☺는 이모티콘, @는 멤버 태그입니다. 답글은 원 댓글 아래 들여 쓰여 ↳ 표시와 함께 보입니다. 내가 쓴 댓글은 ✎로 고치고 ×로 지웁니다. 댓글 속 웹 주소는 링크가 됩니다.

diff --git a/app/modules/project/templates/project/inbox.html b/app/modules/project/templates/project/inbox.html index f81e569..d319ae2 100644 --- a/app/modules/project/templates/project/inbox.html +++ b/app/modules/project/templates/project/inbox.html @@ -1,7 +1,7 @@ {% extends "erp_base.html" %} {% block head_extra %} - + {% endblock %} @@ -104,5 +104,5 @@ {% include "project/_side_modals.html" %} {% include "project/_member_tasks_modal.html" %} - + {% endblock %} diff --git a/app/modules/project/templates/project/mytasks.html b/app/modules/project/templates/project/mytasks.html index 29a47a2..071d5ca 100644 --- a/app/modules/project/templates/project/mytasks.html +++ b/app/modules/project/templates/project/mytasks.html @@ -1,7 +1,7 @@ {% extends "erp_base.html" %} {% block head_extra %} - + {% endblock %} @@ -100,5 +100,5 @@ "today": {{ today | tojson }} } - + {% endblock %} diff --git a/app/modules/project/templates/project/project.html b/app/modules/project/templates/project/project.html index 9bcd684..31edfb1 100644 --- a/app/modules/project/templates/project/project.html +++ b/app/modules/project/templates/project/project.html @@ -1,7 +1,7 @@ {% extends "erp_base.html" %} {% block head_extra %} - + @@ -491,5 +491,5 @@ - + {% endblock %} diff --git a/app/modules/project/templates/project/trash.html b/app/modules/project/templates/project/trash.html index 58feed8..171e8e7 100644 --- a/app/modules/project/templates/project/trash.html +++ b/app/modules/project/templates/project/trash.html @@ -1,7 +1,7 @@ {% extends "erp_base.html" %} {% block head_extra %} - + {% endblock %} @@ -70,5 +70,5 @@ {% include "project/_side_modals.html" %} {% include "project/_member_tasks_modal.html" %} - + {% endblock %} diff --git a/app/static/project.css b/app/static/project.css index f14ca73..a855ca3 100644 --- a/app/static/project.css +++ b/app/static/project.css @@ -1678,8 +1678,13 @@ html.pj-embed .pj-btn-goto-project { display: inline-flex; align-items: center; .pj-comment-thread { border-top: 1px solid #f0f1f3; padding-top: 2px; } .pj-comment-thread:first-child { border-top: none; } -.pj-comment-replies { margin-left: 30px; } +/* 답글 — 원 댓글 본문 위치보다 더 들여 쓰고, 들여쓴 자리 왼쪽에 ↳ 화살표 */ +.pj-comment-replies { margin-left: 52px; } .pj-comment-item.is-reply { padding-top: 5px; padding-bottom: 5px; } +.pj-reply-arrow { + position: absolute; left: -26px; top: 6px; + font-size: 20px; color: #a3a8b0; pointer-events: none; +} .pj-reply-form { margin: 4px 0 8px; } .pj-reply-form input { padding: 5px 9px; font-size: 12.5px; } .pj-reply-form .pj-btn { padding: 5px 12px; font-size: 12px; } diff --git a/app/static/project.js b/app/static/project.js index 1b188b1..67bbb9a 100644 --- a/app/static/project.js +++ b/app/static/project.js @@ -1315,6 +1315,7 @@ const cmInput = el("pj-cm-input"); attachMentionInput(cmInput); attachEmojiPicker(cmInput); + attachMentionButton(cmInput); if (cmInput) cmInput.addEventListener("paste", function (e) { const cd = e.clipboardData || window.clipboardData || {}; // 글자(웹페이지 주소 등)가 있으면 글자 붙여넣기가 먼저 — 일부 프로그램은 복사할 때 @@ -1947,6 +1948,33 @@ }); input.insertAdjacentElement("afterend", btn); } + // @ 버튼 — 이모티콘 버튼 오른쪽. 누르면 커서 자리에 "@"를 넣고 멤버 메뉴를 연다 + // (attachMentionInput 의 input 이벤트가 메뉴를 띄운다). mousedown 을 막아 입력칸 + // 포커스를 유지한다 — 안 막으면 blur 로 메뉴 닫기 타이머가 돌아 방금 연 메뉴가 닫힌다. + function attachMentionButton(input) { + if (!input || input.dataset.pjMentionBtn) return; + input.dataset.pjMentionBtn = "1"; + const btn = document.createElement("button"); + btn.type = "button"; + btn.className = "pj-emoji-btn pj-mention-btn"; + btn.title = "멤버 태그(@)"; + btn.innerHTML = 'alternate_email'; + btn.addEventListener("mousedown", function (e) { e.preventDefault(); }); + btn.addEventListener("click", function () { + if (document.activeElement !== input) input.focus(); + const start = input.selectionStart == null ? input.value.length : input.selectionStart; + const end = input.selectionEnd == null ? start : input.selectionEnd; + const before = input.value.slice(0, start); + const ins = (before && !/\s$/.test(before) ? " " : "") + "@"; + input.value = before + ins + input.value.slice(end); + const caret = start + ins.length; + input.setSelectionRange(caret, caret); + input.dispatchEvent(new Event("input", { bubbles: true })); + }); + const after = input.nextElementSibling && input.nextElementSibling.classList.contains("pj-emoji-btn") + ? input.nextElementSibling : input; + after.insertAdjacentElement("afterend", btn); + } // ════════════════════════════════════════════════════════════ // 댓글 공용 — 작업 창 댓글 목록과 채팅형 댓글 팝업이 같이 쓴다 @@ -5533,6 +5561,8 @@ const mine = (c.author_email || "").toLowerCase() === me; const hasReplies = !c.parent_id; item.innerHTML = + // 답글 — 들여쓴 자리 왼쪽에 ↳ 화살표(원 댓글에 달린 글임을 한눈에). + (c.parent_id ? '' : "") + avatarHtml(c.author_email, "pj-gicon-sm") + '
' + escapeHtml(idOf(c.author_email)) + ' ' + @@ -5570,6 +5600,7 @@ const inp = form.querySelector("input"); attachMentionInput(inp); attachEmojiPicker(inp); + attachMentionButton(inp); async function send() { const body = inp.value.trim(); if (!body) return; @@ -5654,6 +5685,7 @@ } attachMentionInput(el("pj-comment-input")); attachEmojiPicker(el("pj-comment-input")); + attachMentionButton(el("pj-comment-input")); el("pj-comment-send").addEventListener("click", sendComment); el("pj-comment-input").addEventListener("keydown", function (e) { if (e.key === "Enter") { e.preventDefault(); sendComment(); }