簡化郵件發送流程，新增發送記錄功能

app/api/post_routes.py

@@ -212,7 +212,7 @@ async def update_post(
 ):
     """
     更新貼文內容
-    只能編輯草稿狀態的貼文
+    允許任何狀態下編輯（簡化流程）
     """
     try:
         client = supabase_clients.get_license_client()
@@ -226,11 +226,7 @@ async def update_post(
 
         post = existing.data[0]
 
-        # 只能編輯草稿狀態的貼文
-        if post['status'] != 'draft':
-            raise HTTPException(status_code=400, detail="Can only edit draft posts")
-
-        # 準備更新資料
+        # 準備更新資料（允許任何狀態編輯）
         update_data = {}
         if post_data.subject is not None:
             update_data['subject'] = post_data.subject
@@ -599,8 +595,9 @@ async def send_post_email_selective(
     current_user = Depends(verify_admin)
 ):
     """
-    發送郵件給指定用戶
+    發送郵件給指定用戶（簡化流程：允許任何狀態發送，可重複發送）
     - user_emails: 指定收件人列表，為空則發送給所有啟用用戶
+    - 每次發送會記錄到 email_logs 陣列中
     """
     try:
         client = supabase_clients.get_license_client()
@@ -640,26 +637,41 @@ async def send_post_email_selective(
         sent_count = await email_service.send_to_specific_users(
             subject=post['subject'],
             content=post['content'],
-            recipients=recipients
+            recipients=recipients,
+            product_type=post.get('product_type', 'announcement')
         )
 
-        # 更新貼文狀態
+        # 建立新的發送記錄
+        send_log = {
+            'sent_at': datetime.utcnow().isoformat(),
+            'sent_by': current_user.get('email', 'Unknown'),
+            'recipient_count': sent_count,
+            'recipients_preview': recipients[:5] if len(recipients) > 5 else recipients
+        }
+
+        # 取得現有的 email_logs，如果沒有則初始化為空陣列
+        existing_logs = post.get('email_logs') or []
+        existing_logs.append(send_log)
+
+        # 更新貼文狀態（保留 sent 狀態，但允許重複發送）
         update_data = {
             'status': 'sent',
             'sent_at': datetime.utcnow().isoformat(),
             'sent_by': current_user.get('email', 'Unknown'),
-            'recipient_count': sent_count
+            'recipient_count': sent_count,
+            'email_logs': existing_logs
         }
 
         result = client.table('posts').update(update_data).eq('id', post_id).execute()
 
-        logger.info(f"Email sent for post {post_id} to {sent_count} recipients")
+        logger.info(f"Email sent for post {post_id} to {sent_count} recipients (total sends: {len(existing_logs)})")
 
         return {
             "success": True,
             "message": f"Email sent to {sent_count} recipients",
             "recipient_count": sent_count,
-            "recipients": recipients[:10] if len(recipients) > 10 else recipients,  # 只回傳前 10 個
+            "total_sends": len(existing_logs),
+            "recipients": recipients[:10] if len(recipients) > 10 else recipients,
             "post": result.data[0] if result.data else None
         }
 

frontend/css/posts.css

@@ -755,3 +755,91 @@
         font-size: 12px;
     }
 }
+
+/* ==================== 郵件發送記錄 ==================== */
+
+.email-logs-container {
+    max-height: 400px;
+    overflow-y: auto;
+}
+
+.email-logs-container .post-info {
+    padding: 12px;
+    background: var(--bg-secondary);
+    border-radius: 8px;
+    font-size: 14px;
+    color: var(--text-primary);
+}
+
+.logs-list {
+    display: flex;
+    flex-direction: column;
+    gap: 12px;
+}
+
+.email-log-item {
+    padding: 12px 16px;
+    background: var(--bg-secondary);
+    border: 1px solid var(--border-color);
+    border-radius: 8px;
+    transition: all 0.2s ease;
+}
+
+.email-log-item:hover {
+    border-color: var(--accent-blue);
+}
+
+.email-log-item .log-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 8px;
+}
+
+.email-log-item .log-number {
+    font-size: 14px;
+    font-weight: 600;
+    color: var(--accent-blue);
+}
+
+.email-log-item .log-time {
+    font-size: 12px;
+    color: var(--text-secondary);
+}
+
+.email-log-item .log-time i {
+    margin-right: 4px;
+}
+
+.email-log-item .log-details {
+    display: flex;
+    flex-direction: column;
+    gap: 4px;
+    font-size: 13px;
+    color: var(--text-secondary);
+}
+
+.email-log-item .log-details i {
+    margin-right: 6px;
+    width: 14px;
+    text-align: center;
+}
+
+/* 發送記錄點擊提示 */
+.sent-info {
+    font-size: 11px;
+    color: var(--accent-blue);
+    margin-right: 8px;
+    padding: 2px 6px;
+    background: rgba(88, 166, 255, 0.1);
+    border-radius: 4px;
+    transition: all 0.2s ease;
+}
+
+.sent-info:hover {
+    background: rgba(88, 166, 255, 0.2);
+}
+
+.sent-info i {
+    margin-right: 4px;
+}

frontend/js/pages/posts.js

@@ -333,41 +333,27 @@ class PostsPage {
             ? post.selected_emails.length
             : '全部';
 
-        // 根據狀態顯示不同的操作按鈕
-        let actionButtons = '';
-
-        if (post.status === 'draft') {
-            actionButtons = `
-                <button class="btn btn-sm btn-secondary" onclick="postsPage.editPost('${post.id}')" title="編輯">
-                    <i class="fas fa-edit"></i>
-                </button>
-                <button class="btn btn-sm btn-primary" onclick="postsPage.publishPost('${post.id}')" title="發布">
-                    <i class="fas fa-paper-plane"></i>
-                </button>
-                <button class="btn btn-sm btn-danger" onclick="postsPage.deletePost('${post.id}')" title="刪除">
-                    <i class="fas fa-trash"></i>
-                </button>
-            `;
-        } else if (post.status === 'published') {
-            actionButtons = `
-                <button class="btn btn-sm btn-primary" onclick="postsPage.sendEmail('${post.id}')" title="發送郵件">
-                    <i class="fas fa-envelope"></i> 發送郵件
-                </button>
-                <button class="btn btn-sm btn-danger" onclick="postsPage.deletePost('${post.id}')" title="刪除">
-                    <i class="fas fa-trash"></i>
-                </button>
-            `;
-        } else if (post.status === 'sent') {
-            const sentInfo = post.sent_at
-                ? `<small class="sent-info">已發送 ${post.recipient_count || 0} 封郵件</small>`
-                : '';
-            actionButtons = `
-                ${sentInfo}
-                <button class="btn btn-sm btn-secondary" onclick="postsPage.viewPost('${post.id}')" title="查看">
-                    <i class="fas fa-eye"></i>
-                </button>
-            `;
-        }
+        // 統一的操作按鈕（簡化流程：所有狀態都可以編輯和發送）
+        const emailLogs = post.email_logs || [];
+        const sendCount = emailLogs.length;
+        const sentInfo = sendCount > 0
+            ? `<small class="sent-info" onclick="postsPage.viewEmailLogs('${post.id}')" style="cursor:pointer;" title="點擊查看發送記錄">
+                <i class="fas fa-history"></i> 已發送 ${sendCount} 次
+               </small>`
+            : '';
+
+        const actionButtons = `
+            ${sentInfo}
+            <button class="btn btn-sm btn-secondary" onclick="postsPage.editPost('${post.id}')" title="編輯">
+                <i class="fas fa-edit"></i>
+            </button>
+            <button class="btn btn-sm btn-primary" onclick="postsPage.sendEmail('${post.id}')" title="發送郵件">
+                <i class="fas fa-envelope"></i>
+            </button>
+            <button class="btn btn-sm btn-danger" onclick="postsPage.deletePost('${post.id}')" title="刪除">
+                <i class="fas fa-trash"></i>
+            </button>
+        `;
 
         // 版本顯示
         const versionDisplay = post.product_type === 'announcement'
@@ -460,7 +446,7 @@ class PostsPage {
         }
     }
 
-    // 發送郵件
+    // 發送郵件（簡化流程：可重複發送）
     async sendEmail(postId) {
         const post = this.posts.find(p => p.id === postId);
         if (!post) return;
@@ -480,11 +466,17 @@ class PostsPage {
             : post.product_type === 'autocad' ? 'AutoCAD'
             : '公告';
 
+        const emailLogs = post.email_logs || [];
+        const resendWarning = emailLogs.length > 0
+            ? `\n⚠️ 此貼文已發送過 ${emailLogs.length} 次`
+            : '';
+
         const confirmed = confirm(
             `確定要發送郵件通知嗎？\n\n` +
             `主旨：${post.subject}\n` +
             `類型：${productName}\n` +
-            `收件人：${recipientInfo}\n\n` +
+            `收件人：${recipientInfo}` +
+            `${resendWarning}\n\n` +
             `發送後無法撤回。`
         );
         if (!confirmed) return;
@@ -492,7 +484,8 @@ class PostsPage {
         try {
             // 使用貼文中儲存的收件人列表
             const result = await api.sendPostEmailSelective(postId, post.selected_emails);
-            Utils.showSuccess(`郵件已發送給 ${result.recipient_count || 0} 位用戶`);
+            const totalSends = result.total_sends || (emailLogs.length + 1);
+            Utils.showSuccess(`郵件已發送給 ${result.recipient_count || 0} 位用戶（第 ${totalSends} 次發送）`);
             await this.loadPosts();
         } catch (error) {
             Utils.handleError(error, '發送郵件時');
@@ -546,6 +539,110 @@ class PostsPage {
         `;
     }
 
+    // 查看郵件發送記錄
+    viewEmailLogs(postId) {
+        const post = this.posts.find(p => p.id === postId);
+        if (!post) return;
+
+        const emailLogs = post.email_logs || [];
+        if (emailLogs.length === 0) {
+            Utils.showInfo('發送記錄', '此貼文尚未發送過郵件');
+            return;
+        }
+
+        // 建立發���記錄 HTML
+        const logsHtml = emailLogs.map((log, index) => {
+            const sentAt = new Date(log.sent_at).toLocaleString('zh-TW');
+            const recipients = log.recipients_preview || [];
+            const recipientText = recipients.length > 0
+                ? recipients.join(', ') + (log.recipient_count > recipients.length ? ` 等 ${log.recipient_count} 人` : '')
+                : `${log.recipient_count} 位用戶`;
+
+            return `
+                <div class="email-log-item">
+                    <div class="log-header">
+                        <span class="log-number">#${emailLogs.length - index}</span>
+                        <span class="log-time"><i class="fas fa-clock"></i> ${sentAt}</span>
+                    </div>
+                    <div class="log-details">
+                        <div><i class="fas fa-user"></i> 發送者: ${log.sent_by || '未知'}</div>
+                        <div><i class="fas fa-users"></i> 收件人: ${recipientText}</div>
+                    </div>
+                </div>
+            `;
+        }).reverse().join('');
+
+        // 使用編輯 Modal 顯示發送記錄
+        const modal = document.getElementById('editPostModal');
+        modal.querySelector('.modal-title').textContent = '郵件發送記錄';
+        modal.querySelector('.modal-body').innerHTML = `
+            <div class="email-logs-container">
+                <div class="post-info mb-3">
+                    <strong>主旨:</strong> ${this.escapeHtml(post.subject || '(未設定)')}
+                </div>
+                <div class="logs-list">
+                    ${logsHtml}
+                </div>
+            </div>
+        `;
+        modal.querySelector('.modal-footer').innerHTML = `
+            <button class="btn btn-secondary" onclick="postsPage.closeEmailLogsModal()">關閉</button>
+        `;
+
+        modal.classList.add('active');
+        modal.style.display = 'flex';
+        modal.style.opacity = '1';
+        modal.style.visibility = 'visible';
+    }
+
+    closeEmailLogsModal() {
+        const modal = document.getElementById('editPostModal');
+        modal.classList.remove('active');
+        modal.style.display = 'none';
+        modal.style.opacity = '';
+        modal.style.visibility = '';
+
+        // 恢復原本的 modal 內容
+        modal.querySelector('.modal-title').textContent = '編輯貼文';
+        modal.querySelector('.modal-body').innerHTML = `
+            <form id="editPostForm">
+                <div class="form-group">
+                    <label class="form-label">主旨</label>
+                    <input type="text" id="editSubject" class="form-input" placeholder="輸入郵件主旨..." required>
+                </div>
+                <div class="form-group">
+                    <label class="form-label">內容</label>
+                    <textarea id="editContent" class="form-textarea" rows="8" placeholder="輸入貼文內容..." required></textarea>
+                    <small class="form-hint">可使用 {download_link} 變數，系統會自動替換為下載連結</small>
+                </div>
+                <div class="form-group">
+                    <label class="form-label">收件人</label>
+                    <div class="recipient-controls mb-2">
+                        <button type="button" class="btn btn-sm btn-secondary" onclick="postsPage.selectAllUsers()">
+                            <i class="fas fa-check-double"></i> 全選
+                        </button>
+                        <button type="button" class="btn btn-sm btn-secondary" onclick="postsPage.deselectAllUsers()">
+                            <i class="fas fa-times"></i> 取消全選
+                        </button>
+                        <span class="selected-count" id="selectedCount">已選擇: 0 位用戶</span>
+                    </div>
+                    <div class="recipient-list" id="recipientList">
+                        <div class="text-center p-3">
+                            <div class="spinner-sm"></div>
+                            <small>載入用戶列表...</small>
+                        </div>
+                    </div>
+                </div>
+            </form>
+        `;
+        modal.querySelector('.modal-footer').innerHTML = `
+            <button class="btn btn-secondary" onclick="postsPage.closeEditModal()">取消</button>
+            <button class="btn btn-primary" onclick="postsPage.savePost()">
+                <i class="fas fa-save"></i> 儲存
+            </button>
+        `;
+    }
+
     // 刪除貼文
     async deletePost(postId) {
         const post = this.posts.find(p => p.id === postId);
@@ -724,16 +821,11 @@ class PostsPage {
 
     // ==================== 更新編輯功能 ====================
 
-    // 編輯貼文（覆寫原方法）
+    // 編輯貼文（允許任何狀態編輯）
     async editPost(postId) {
         const post = this.posts.find(p => p.id === postId);
         if (!post) return;
 
-        if (post.status !== 'draft') {
-            Utils.showError('無法編輯', '只能編輯草稿狀態的貼文');
-            return;
-        }
-
         this.currentEditPost = post;
         document.getElementById('editSubject').value = post.subject || '';
         document.getElementById('editContent').value = post.content || '';

schemas/supabase-posts-schema.sql

@@ -24,6 +24,7 @@ CREATE TABLE IF NOT EXISTS posts (
     sent_at TIMESTAMP WITH TIME ZONE,
     sent_by VARCHAR(255),
     recipient_count INTEGER DEFAULT 0,
+    email_logs JSONB DEFAULT '[]'::jsonb,
     created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
     updated_at TIMESTAMP WITH TIME ZONE DEFAULT NOW()
 );
@@ -78,6 +79,13 @@ COMMENT ON COLUMN posts.content IS '郵件內容';
 COMMENT ON COLUMN posts.status IS '狀態: draft(草稿) -> published(已發布) -> sent(已發送郵件)';
 COMMENT ON COLUMN posts.is_deleted IS '軟刪除標記';
 COMMENT ON COLUMN posts.selected_emails IS '選定的收件人郵箱陣列，NULL 表示發送給所有用戶';
-COMMENT ON COLUMN posts.sent_at IS '郵件發送時間';
-COMMENT ON COLUMN posts.sent_by IS '發送者';
-COMMENT ON COLUMN posts.recipient_count IS '收件人數量';
+COMMENT ON COLUMN posts.sent_at IS '最後一次郵件發送時間';
+COMMENT ON COLUMN posts.sent_by IS '最後一次發送者';
+COMMENT ON COLUMN posts.recipient_count IS '最後一次收件人數量';
+COMMENT ON COLUMN posts.email_logs IS '郵件發送記錄陣列，每次發送都會新增一筆記錄';
+
+-- ============================================
+-- Migration: Add email_logs column (for existing installations)
+-- ============================================
+-- Run this ALTER TABLE if the posts table already exists:
+-- ALTER TABLE posts ADD COLUMN IF NOT EXISTS email_logs JSONB DEFAULT '[]'::jsonb;