Compare commits

...

22 Commits

Author SHA1 Message Date
d2f64f98a1 fix: 初始化时清空搜索框和筛选状态
- 页面加载时强制清空 searchInput
- 重置 typeFilter 和 currentFilter
- 删除重复的 pageSize 定义
2026-04-16 13:47:46 +08:00
161b93f368 docs: 更新版本历史 v2.3.2 2026-04-16 13:41:06 +08:00
31f2d8b428 fix: 搜索功能修复 - debounce函数定义顺序
- debounce函数在使用前必须先定义
- 之前定义在代码末尾,导致搜索事件绑定失败
- 现移到代码开头,确保正确执行
2026-04-16 13:40:44 +08:00
5d6dd10dfa docs: 更新版本历史 v2.3.1 2026-04-16 12:20:51 +08:00
d0f7b07260 fix: 日期放到标题后面,不增加卡片高度
- 日期紧跟标题后面,同一行显示
- 格式更紧凑:04-16 11:09 →04-16 12:00
- 字体10px,透明度0.5,不影响阅读
2026-04-16 12:20:32 +08:00
0be768ca8e docs: 更新版本历史 v2.3.0 2026-04-16 12:17:24 +08:00
68ecb16303 feat: 卡片显示创建和更新日期
- 每个收藏卡片底部显示日期
- 格式:04-16 11:09(月-日 时:分)
- 有更新时显示:创建 → 更新
- 字体更小更淡,不影响卡片高度
2026-04-16 12:16:54 +08:00
82d928f497 docs: 更新版本历史 v2.2.0 2026-04-16 11:45:57 +08:00
c99eca35f0 feat: 快捷添加按钮,一键选择类型
- 顶部按钮栏分离为4个快捷添加按钮
- 点击直接进入对应类型的添加弹窗
- 弹窗标题显示类型图标和名称
- 不再需要下拉选择类型
2026-04-16 11:45:25 +08:00
47b195ed1c docs: 更新版本历史 v2.1.0 2026-04-16 11:37:49 +08:00
1f1528979c feat: 待办截止时间支持日期+时间
- 截止日期改为日期时间选择器(datetime-local)
- 新增友好显示函数:今天/明天/昨天 + 时间
- 详情页显示完整日期时间格式
- 提醒弹窗显示友好格式
- 后端支持多种日期格式解析
- 只有日期的待办视为当天23:59到期
2026-04-16 11:37:04 +08:00
bcb24e474d docs: 更新版本历史 v2.0.1 2026-04-16 11:26:06 +08:00
a19b260ef7 fix: 转换弹窗优化
- 内容预览保留换行格式,提高可读性
- 转换方式默认改为复制创建
2026-04-16 11:25:49 +08:00
1d8ce5cfb9 docs: 更新版本历史 v2.0.0 2026-04-16 11:18:54 +08:00
cb2cbd4c6b feat: 收藏转待办功能 v2.0.0
- 新增 /api/items/<id>/convert API
- 支持两种转换方式:
  - 直接转换(convert):原收藏变为待办
  - 复制创建(copy):保留原收藏,新建待办
- 文本/链接/专栏类型可转换
- 内容自动合并到待办备注
- 前端列表和详情页添加转换按钮
- 弹窗配置:标题、状态、优先级、截止日期
2026-04-16 11:18:26 +08:00
c0d221c2a3 docs: 更新版本历史 v1.11.0 2026-04-16 11:06:02 +08:00
6b775c99f9 feat: 已完成待办可重新打开
- 新增 /api/items/<id>/reopen 接口
- 前端列表已完成待办显示重新打开按钮
- 恢复为 pending 或 in_progress 状态
2026-04-16 11:05:34 +08:00
061bfa3b55 docs: 更新版本历史 v1.10.0 2026-04-16 10:59:44 +08:00
2eccc11369 feat: 网页端待办到期提醒功能
- 新增 /api/reminders API 接口
- 获取已过期、今天到期、即将到期的待办
- 前端显示提醒栏和弹窗详情
- 每5分钟自动刷新提醒
- 支持快速完成待办
2026-04-16 10:59:26 +08:00
d874577458 feat: 邮件发送历史记录 v1.9.2 2026-04-14 17:27:37 +08:00
bc59fb39db fix: 邮件发送添加Date和Reply-To头 2026-04-14 17:09:04 +08:00
fba2c1290d fix: 端口587无SSL直接连接 2026-04-14 16:40:57 +08:00
8 changed files with 804 additions and 50 deletions

View File

@@ -141,6 +141,53 @@ xian-favor/
## 版本历史
- **v2.3.2** (2026-04-16): 搜索功能修复
- 修复 debounce 函数定义顺序问题
- 搜索框输入后可正常过滤列表
- **v2.3.1** (2026-04-16): 日期放到标题后面,不增加卡片高度
- 日期紧跟标题,同一行显示
- 格式紧凑:`04-16 11:09→04-16 12:00`
- **v2.3.0** (2026-04-16): 卡片显示创建和更新日期
- 每个收藏卡片底部显示日期
- 格式04-16 11:09月-日 时:分)
- 有更新时显示:创建 → 更新
- 字体更小更淡,不影响卡片高度
- **v2.2.0** (2026-04-16): 快捷添加按钮,一键选择类型
- 顶部按钮栏分离为4个快捷添加按钮文本、链接、待办、专栏
- 点击直接进入对应类型的添加弹窗
- 弹窗标题显示类型图标和名称
- 不再需要下拉选择类型,操作更快捷
- **v2.1.0** (2026-04-16): 待办截止时间支持日期+时间
- 截止日期改为日期时间选择器
- 列表显示友好格式:今天 18:30、明天 09:00 等
- 详情页显示完整格式2026年4月16日 18:30
- 后端支持多种日期格式解析
- 只有日期的待办视为当天 23:59 到期
- **v2.0.1** (2026-04-16): 转换弹窗优化
- 内容预览保留换行格式,提高可读性
- 转换方式默认改为复制创建
- **v2.0.0** (2026-04-16): 收藏转待办功能(大版本更新)
- 新增 `/api/items/<id>/convert` API
- **直接转换**:原收藏变为待办,数据合并
- **复制创建**:保留原收藏,新建待办任务
- 文本/链接/专栏类型可转换
- 内容自动合并到待办备注
- 前端列表和详情页添加转换按钮
- 弹窗配置:标题、状态、优先级、截止日期
- v1.11.0 (2026-04-16): 已完成待办可重新打开
- 新增 `/api/items/<id>/reopen` 接口
- 前端列表已完成待办显示重新打开按钮(↻图标)
- 可恢复为 pending 或 in_progress 状态
- v1.10.0 (2026-04-16): 网页端待办到期提醒功能
- 新增提醒 API `/api/reminders`
- 获取已过期、今天到期、即将到期的待办
- 前端顶部提醒栏显示提醒数量和概要
- 弹窗详情支持快速完成待办
- 每5分钟自动刷新提醒
- v1.9.2 (2026-04-14): 邮件发送历史记录
- 详情页面显示邮件发送记录(发送邮箱、时间)
- 支持多次发送,显示多条记录
- 发送成功/失败状态标记
- v1.9.0 (2026-04-14): 发送邮件功能 + 邮箱管理
- 每个收藏卡片添加"发送邮件"按钮
- 选择已有邮箱或输入新邮箱发送

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -65,6 +65,9 @@ def get_item(item_id):
item = db.get_item(item_id)
if not item:
return jsonify({'success': False, 'error': '条目不存在'}), 404
# 获取邮件发送历史
email_logs = db.get_email_logs(item_id)
item['email_logs'] = email_logs
return jsonify({'success': True, 'data': item})
@@ -109,6 +112,93 @@ def complete_item(item_id):
return jsonify({'success': True, 'data': item})
@app.route('/api/items/<int:item_id>/reopen', methods=['POST'])
def reopen_item(item_id):
"""重新打开待办"""
item = db.get_item(item_id)
if not item:
return jsonify({'success': False, 'error': '条目不存在'}), 404
if item['type'] != 'todo':
return jsonify({'success': False, 'error': '不是待办事项'}), 400
# 获取请求中的目标状态,默认为 pending
data = request.get_json() or {}
new_status = data.get('status', 'pending')
if new_status not in ['pending', 'in_progress']:
return jsonify({'success': False, 'error': '无效状态'}), 400
db.update_item(item_id, status=new_status)
item = db.get_item(item_id)
return jsonify({'success': True, 'data': item})
@app.route('/api/items/<int:item_id>/convert', methods=['POST'])
def convert_item(item_id):
"""将收藏转换为待办"""
item = db.get_item(item_id)
if not item:
return jsonify({'success': False, 'error': '条目不存在'}), 404
# 不能转换已经是待办的
if item['type'] == 'todo':
return jsonify({'success': False, 'error': '已经是待办事项'}), 400
data = request.get_json() or {}
mode = data.get('mode', 'convert') # convert 或 copy
if mode not in ['convert', 'copy']:
return jsonify({'success': False, 'error': '无效转换模式'}), 400
# 构建待办数据
todo_data = {
'type': 'todo',
'title': data.get('title') or item['title'] or f'{item["type"]}收藏',
'status': data.get('status', 'pending'),
'priority': data.get('priority', 'medium'),
'due_date': data.get('due_date'),
'tags': item['tags'], # 继承原标签
}
# 根据原类型处理内容
if item['type'] == 'text':
# 文本content 放到 note
todo_data['note'] = item['content'] or ''
if item['note']:
todo_data['note'] += '\n\n' + item['note']
elif item['type'] == 'link':
# 链接url 放到 note保留链接可点击
todo_data['note'] = f'链接: {item["url"]}\n\n'
if item['content']:
todo_data['note'] += item['content'] + '\n\n'
if item['note']:
todo_data['note'] += item['note']
# url 字段也保留(方便后续操作)
todo_data['content'] = item['url']
elif item['type'] == 'column':
# 专栏url + source 放到 note
todo_data['note'] = f'专栏: {item["url"]}\n'
if item['source']:
todo_data['note'] += f'来源: {item["source"]}\n\n'
if item['content']:
todo_data['note'] += item['content'] + '\n\n'
if item['note']:
todo_data['note'] += item['note']
todo_data['content'] = item['url']
if mode == 'convert':
# 直接转换:更新原条目
db.update_item(item_id, **todo_data)
result = db.get_item(item_id)
return jsonify({'success': True, 'data': result, 'mode': 'convert'})
else:
# 复制创建:新建待办,原条目保留
new_id = db.create_item(**todo_data)
result = db.get_item(new_id)
return jsonify({'success': True, 'data': result, 'mode': 'copy', 'original_id': item_id})
@app.route('/api/tags', methods=['GET'])
def list_tags():
"""列出标签"""
@@ -164,6 +254,13 @@ def get_stats():
return jsonify({'success': True, 'data': stats})
@app.route('/api/reminders', methods=['GET'])
def get_reminders():
"""获取提醒信息"""
reminders = db.get_reminders()
return jsonify({'success': True, 'data': reminders})
@app.route('/api/ai-process', methods=['POST'])
def ai_process():
"""AI处理文本"""
@@ -379,8 +476,9 @@ def send_email():
import smtplib
from email.mime.text import MIMEText
from email.mime.multipart import MIMEMultipart
from datetime import datetime
# SMTP配置
# SMTP配置端口587无SSL
smtp_host = 'mail.tphai.com'
smtp_port = 587
smtp_user = 'favor@tphai.com'
@@ -390,22 +488,26 @@ def send_email():
msg['From'] = smtp_user
msg['To'] = email_addr
msg['Subject'] = subject
msg['Date'] = datetime.now().strftime('%a, %d %b %Y %H:%M:%S +0800')
msg['Reply-To'] = email_addr
msg.attach(MIMEText(body, 'plain', 'utf-8'))
# 端口587无SSL尝试STARTTLS失败则用普通连接
# 直接连接无SSL
server = smtplib.SMTP(smtp_host, smtp_port)
try:
server.starttls()
except smtplib.SMTPNotSupportedError:
pass # 服务器不支持TLS继续用普通连接
server.ehlo()
server.login(smtp_user, smtp_pass)
server.sendmail(smtp_user, email_addr, msg.as_string())
server.quit()
# 记录发送日志
db.log_email_send(item_id, email_addr, success=True)
return jsonify({'success': True, 'message': f'已发送到 {email_addr}'})
except Exception as e:
# 记录失败日志
db.log_email_send(item_id, email_addr, success=False)
return jsonify({'success': False, 'error': f'发送失败: {str(e)}'}), 500
@@ -437,11 +539,11 @@ INDEX_TEMPLATE = '''
.content { padding: 20px; }
.card { margin-bottom: 8px; transition: transform 0.2s; }
.card:hover { transform: translateY(-2px); box-shadow: 0 4px 12px rgba(0,0,0,0.15); }
.card-body { padding: 10px 15px; }
.card-body { padding: 8px 12px; }
.tag { margin-right: 5px; }
.item-card { font-size: 14px; }
.item-card h6 { font-size: 14px; margin-bottom: 4px; }
.item-card p { margin-bottom: 4px; }
.item-card h6 { font-size: 14px; margin-bottom: 2px; }
.item-card p { margin-bottom: 2px; }
.item-card .text-muted.small { font-size: 12px; }
.type-text { border-left: 4px solid #17a2b8; }
.type-link { border-left: 4px solid #28a745; }
@@ -482,6 +584,16 @@ INDEX_TEMPLATE = '''
<!-- 主内容 -->
<div class="col-md-10 content">
<!-- 提醒栏 -->
<div id="reminderBar" class="alert alert-warning alert-dismissible fade show mb-3" style="display:none;" role="alert">
<i class="bi bi-bell-fill"></i>
<span id="reminderText">有待办事项需要关注</span>
<button type="button" class="btn btn-sm btn-warning ms-2" onclick="showRemindersModal()">
<i class="bi bi-eye"></i> 查看详情
</button>
<button type="button" class="btn-close" data-bs-dismiss="alert" onclick="dismissReminderBar()"></button>
</div>
<!-- 顶部操作栏 -->
<div class="d-flex justify-content-between align-items-center mb-4">
<div class="d-flex gap-2">
@@ -497,12 +609,21 @@ INDEX_TEMPLATE = '''
<button class="btn btn-outline-info me-2" onclick="showAIAddModal()" title="AI自动添加">
<i class="bi bi-robot"></i> AI添加
</button>
<button class="btn btn-outline-secondary me-1" onclick="showAddModal('text')" title="添加文本">
<i class="bi bi-file-text"></i>
</button>
<button class="btn btn-outline-success me-1" onclick="showAddModal('link')" title="添加链接">
<i class="bi bi-link-45deg"></i>
</button>
<button class="btn btn-outline-warning me-1" onclick="showAddModal('todo')" title="添加待办">
<i class="bi bi-check2-square"></i>
</button>
<button class="btn btn-outline-primary me-1" onclick="showAddModal('column')" title="添加专栏">
<i class="bi bi-newspaper"></i>
</button>
<button class="btn btn-outline-success me-2" onclick="exportData()" title="导出JSON">
<i class="bi bi-download"></i> 导出
</button>
<button class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#addModal">
<i class="bi bi-plus-lg"></i> 添加
</button>
</div>
<!-- 统计卡片 -->
@@ -555,20 +676,15 @@ INDEX_TEMPLATE = '''
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">添加条目</h5>
<h5 class="modal-title">
<span id="addModalIcon"></span>
<span id="addModalTitle">添加条目</span>
</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal"></button>
</div>
<div class="modal-body">
<form id="addForm">
<div class="mb-3">
<label class="form-label">类型</label>
<select id="addType" class="form-select">
<option value="text">📝 文本</option>
<option value="link">🔗 链接</option>
<option value="column">📰 专栏</option>
<option value="todo">✅ 待办</option>
</select>
</div>
<input type="hidden" id="addType" value="text">
<div class="mb-3">
<label class="form-label">标题</label>
<input type="text" id="addTitle" class="form-control" placeholder="可选">
@@ -579,11 +695,11 @@ INDEX_TEMPLATE = '''
</div>
<div class="mb-3" id="urlGroup" style="display:none;">
<label class="form-label">URL</label>
<input type="url" id="addUrl" class="form-control">
<input type="url" id="addUrl" class="form-control" placeholder="https://...">
</div>
<div class="mb-3" id="sourceGroup" style="display:none;">
<label class="form-label">来源</label>
<input type="text" id="addSource" class="form-control">
<input type="text" id="addSource" class="form-control" placeholder="专栏来源">
</div>
<div class="mb-3" id="todoFields" style="display:none;">
<div class="row">
@@ -606,8 +722,8 @@ INDEX_TEMPLATE = '''
</div>
</div>
<div class="mt-3">
<label class="form-label">截止日期</label>
<input type="date" id="addDueDate" class="form-control">
<label class="form-label">截止时间</label>
<input type="datetime-local" id="addDueDate" class="form-control">
</div>
</div>
<div class="mb-3">
@@ -644,6 +760,9 @@ INDEX_TEMPLATE = '''
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-outline-secondary" id="detailConvertBtn" onclick="showConvertModalFromDetail()" style="display:none;">
<i class="bi bi-arrow-repeat"></i> 转为待办
</button>
<button type="button" class="btn btn-outline-primary" onclick="openEditModalFromDetail()">
<i class="bi bi-pencil"></i> 编辑
</button>
@@ -710,8 +829,8 @@ INDEX_TEMPLATE = '''
</div>
</div>
<div class="mt-3">
<label class="form-label">截止日期</label>
<input type="date" id="editDueDate" class="form-control">
<label class="form-label">截止时间</label>
<input type="datetime-local" id="editDueDate" class="form-control">
</div>
</div>
<div class="mb-3">
@@ -873,16 +992,128 @@ INDEX_TEMPLATE = '''
</div>
</div>
<!-- 提醒详情模态框 -->
<div class="modal fade" id="remindersModal" tabindex="-1">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header bg-warning text-dark">
<h5 class="modal-title"><i class="bi bi-bell-fill"></i> 待办提醒</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal"></button>
</div>
<div class="modal-body">
<div id="remindersContent">
<!-- 动态填充 -->
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">关闭</button>
</div>
</div>
</div>
</div>
<!-- 转换为待办模态框 -->
<div class="modal fade" id="convertModal" tabindex="-1">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title"><i class="bi bi-arrow-repeat"></i> 转为待办</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal"></button>
</div>
<div class="modal-body">
<input type="hidden" id="convertItemId">
<div class="mb-3">
<label class="form-label fw-bold">转换方式</label>
<div class="form-check">
<input class="form-check-input" type="radio" name="convertMode" id="modeConvert" value="convert">
<label class="form-check-label" for="modeConvert">
<strong>直接转换</strong> - 原收藏变为待办,数据合并
</label>
</div>
<div class="form-check">
<input class="form-check-input" type="radio" name="convertMode" id="modeCopy" value="copy" checked>
<label class="form-check-label" for="modeCopy">
<strong>复制创建</strong> - 保留原收藏,新建待办任务
</label>
</div>
</div>
<hr>
<div class="mb-3">
<label class="form-label">待办标题</label>
<input type="text" id="convertTitle" class="form-control">
</div>
<div class="row mb-3">
<div class="col">
<label class="form-label">状态</label>
<select id="convertStatus" class="form-select">
<option value="pending">⏳ 待处理</option>
<option value="in_progress">🔄 进行中</option>
</select>
</div>
<div class="col">
<label class="form-label">优先级</label>
<select id="convertPriority" class="form-select">
<option value="low">🟢 低</option>
<option value="medium" selected>🟡 中</option>
<option value="high">🟠 高</option>
<option value="urgent">🔴 紧急</option>
</select>
</div>
<div class="col">
<label class="form-label">截止时间</label>
<input type="datetime-local" id="convertDueDate" class="form-control">
</div>
</div>
<div class="mb-3">
<label class="form-label text-muted">内容预览(转换后会合并到待办备注)</label>
<div id="convertPreview" class="border rounded p-2 bg-light" style="max-height: 150px; overflow-y: auto; white-space: pre-wrap; word-break: break-all;">
<!-- 动态填充 -->
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">取消</button>
<button type="button" class="btn btn-primary" onclick="executeConvert()">
<i class="bi bi-check"></i> 确认转换
</button>
</div>
</div>
</div>
</div>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
<script>
const API_BASE = '/api';
let currentFilter = { type: '', status: '' };
let currentPage = 1;
const pageSize = 20;
function debounce(fn, delay) {
let timer;
return function(...args) {
clearTimeout(timer);
timer = setTimeout(() => fn.apply(this, args), delay);
};
}
// 初始化
document.addEventListener('DOMContentLoaded', async () => {
// 确保初始状态清空
document.getElementById('searchInput').value = '';
document.getElementById('typeFilter').value = '';
currentFilter = { type: '', status: '' };
await loadStats(); // 先加载统计,确保总数可用
loadItems();
loadTags();
loadReminders(); // 加载提醒
// 定时刷新提醒每5分钟
setInterval(loadReminders, 5 * 60 * 1000);
// 标签输入自动提示
document.getElementById('addTags').addEventListener('input', showTagSuggestions);
@@ -891,15 +1122,6 @@ document.addEventListener('DOMContentLoaded', async () => {
// 标签搜索实时过滤
document.getElementById('tagSearch')?.addEventListener('input', debounce(loadTagManagerList, 300));
// 类型切换时显示/隐藏字段
document.getElementById('addType').addEventListener('change', (e) => {
const type = e.target.value;
document.getElementById('contentGroup').style.display = type === 'text' ? 'block' : 'none';
document.getElementById('urlGroup').style.display = ['link', 'column'].includes(type) ? 'block' : 'none';
document.getElementById('sourceGroup').style.display = type === 'column' ? 'block' : 'none';
document.getElementById('todoFields').style.display = type === 'todo' ? 'block' : 'none';
});
// 编辑时类型切换
document.getElementById('editType').addEventListener('change', (e) => {
updateEditFieldsByType(e.target.value);
@@ -935,9 +1157,6 @@ document.addEventListener('DOMContentLoaded', async () => {
});
// 加载列表
let currentPage = 1;
const pageSize = 20;
async function loadItems(page = 1) {
currentPage = page;
const keyword = document.getElementById('searchInput').value;
@@ -968,19 +1187,25 @@ function renderItems(items) {
<div class="card-body">
<div class="d-flex justify-content-between align-items-start">
<div style="flex: 1; min-width: 0;">
<h6 class="card-title text-truncate mb-1">
<h6 class="card-title text-truncate mb-1 ${item.type === 'todo' && item.status === 'completed' ? 'text-muted' : ''}">
${getTypeIcon(item.type)} ${item.title || truncate(item.content || item.url, 30)}
${item.type === 'todo' && item.status === 'completed' ? '' : ''}
<span style="font-size:10px; opacity:0.5; margin-left:8px;">
${formatShortDate(item.created_at)}${item.updated_at && item.updated_at !== item.created_at ? '' + formatShortDate(item.updated_at) : ''}
</span>
</h6>
<p class="card-text text-muted small mb-0 text-truncate" style="font-size:12px;">
${item.url ? truncate(item.url, 50) : item.content ? truncate(item.content, 50) : item.note ? truncate(item.note, 50) : ''}
${item.type === 'todo' ? `${getStatusLabelShort(item.status)} ${getPriorityLabelShort(item.priority)} ${item.due_date ? '📅' + item.due_date : ''}` : ''}
${item.type === 'todo' ? `${getStatusLabelShort(item.status)} ${getPriorityLabelShort(item.priority)} ${item.due_date ? '📅' + formatDueDate(item.due_date) : ''}` : ''}
</p>
</div>
<div class="d-flex align-items-center gap-1 flex-wrap ms-2" onclick="event.stopPropagation();">
${item.tags.slice(0, 2).map(t => `<span class="badge bg-secondary" style="font-size:10px;">${t}</span>`).join('')}
${item.type !== 'todo' ? `<button class="btn btn-sm btn-outline-secondary py-0 px-1" onclick="showConvertModal(${item.id})" title="转为待办"><i class="bi bi-arrow-repeat" style="font-size:11px;"></i></button>` : ''}
<button class="btn btn-sm btn-outline-info py-0 px-1" onclick="showSendEmailModal(${item.id})" title="发送邮件"><i class="bi bi-envelope" style="font-size:11px;"></i></button>
<button class="btn btn-sm btn-outline-primary py-0 px-1" onclick="openEditModal(${item.id})" title="编辑"><i class="bi bi-pencil" style="font-size:11px;"></i></button>
${item.type === 'todo' && item.status !== 'completed' ? `<button class="btn btn-sm btn-outline-success py-0 px-1" onclick="completeItem(${item.id})" title="完成"><i class="bi bi-check-lg" style="font-size:11px;"></i></button>` : ''}
${item.type === 'todo' && item.status === 'completed' ? `<button class="btn btn-sm btn-outline-warning py-0 px-1" onclick="reopenItem(${item.id})" title="重新打开"><i class="bi bi-arrow-counterclockwise" style="font-size:11px;"></i></button>` : ''}
<button class="btn btn-sm btn-outline-danger py-0 px-1" onclick="deleteItem(${item.id})" title="删除"><i class="bi bi-trash" style="font-size:11px;"></i></button>
</div>
</div>
@@ -1054,6 +1279,37 @@ async function refreshData() {
loadItems(currentPage);
}
// ============ 添加功能 ============
// 快捷添加按钮
function showAddModal(type) {
// 设置类型
document.getElementById('addType').value = type;
// 设置弹窗标题和图标
const typeInfo = {
text: { icon: '📝', title: '添加文本' },
link: { icon: '🔗', title: '添加链接' },
column: { icon: '📰', title: '添加专栏' },
todo: { icon: '', title: '添加待办' }
};
document.getElementById('addModalIcon').textContent = typeInfo[type].icon;
document.getElementById('addModalTitle').textContent = typeInfo[type].title;
// 显示/隐藏对应字段
document.getElementById('contentGroup').style.display = type === 'text' ? 'block' : 'none';
document.getElementById('urlGroup').style.display = ['link', 'column'].includes(type) ? 'block' : 'none';
document.getElementById('sourceGroup').style.display = type === 'column' ? 'block' : 'none';
document.getElementById('todoFields').style.display = type === 'todo' ? 'block' : 'none';
// 清空表单
document.getElementById('addForm').reset();
// 打开弹窗
new bootstrap.Modal(document.getElementById('addModal')).show();
}
// 添加条目
async function addItem() {
const type = document.getElementById('addType').value;
@@ -1089,6 +1345,94 @@ async function completeItem(id) {
refreshData();
}
// 重新打开待办
async function reopenItem(id) {
const res = await fetch(`${API_BASE}/items/${id}/reopen`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ status: 'pending' })
});
if (res.ok) {
refreshData();
loadReminders(); // 刷新提醒
}
}
// ============ 转换为待办 ============
let convertItemData = null;
async function showConvertModal(itemId) {
const res = await fetch(`${API_BASE}/items/${itemId}`);
const data = await res.json();
if (!data.success) return;
convertItemData = data.data;
document.getElementById('convertItemId').value = itemId;
// 设置默认标题
document.getElementById('convertTitle').value = convertItemData.title || '';
// 重置选项(默认复制创建)
document.getElementById('modeCopy').checked = true;
document.getElementById('convertStatus').value = 'pending';
document.getElementById('convertPriority').value = 'medium';
document.getElementById('convertDueDate').value = '';
// 显示内容预览
let preview = '';
if (convertItemData.type === 'text') {
preview = convertItemData.content || '';
} else if (convertItemData.type === 'link') {
preview = `链接: ${convertItemData.url}`;
if (convertItemData.content) preview += `\n${convertItemData.content}`;
} else if (convertItemData.type === 'column') {
preview = `专栏: ${convertItemData.url}`;
if (convertItemData.source) preview += `\n来源: ${convertItemData.source}`;
}
if (convertItemData.note) preview += `\n\n备注: ${convertItemData.note}`;
document.getElementById('convertPreview').textContent = preview || '(无内容)';
new bootstrap.Modal(document.getElementById('convertModal')).show();
}
async function executeConvert() {
const itemId = document.getElementById('convertItemId').value;
const mode = document.querySelector('input[name="convertMode"]:checked').value;
const data = {
mode: mode,
title: document.getElementById('convertTitle').value,
status: document.getElementById('convertStatus').value,
priority: document.getElementById('convertPriority').value,
due_date: document.getElementById('convertDueDate').value || null
};
const res = await fetch(`${API_BASE}/items/${itemId}/convert`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify(data)
});
const result = await res.json();
if (result.success) {
bootstrap.Modal.getInstance(document.getElementById('convertModal')).hide();
if (mode === 'copy') {
alert(`已创建新待办,原收藏保留\n新待办ID: ${result.data.id}`);
}
refreshData();
loadReminders();
} else {
alert(result.error || '转换失败');
}
}
// 删除条目
async function deleteItem(id) {
if (!confirm('确认删除?')) return;
@@ -1111,6 +1455,10 @@ async function showDetail(id) {
document.getElementById('detailTypeIcon').textContent = getTypeIcon(item.type);
document.getElementById('detailTitle').textContent = item.title || '(无标题)';
// 非待办类型显示转换按钮
const convertBtn = document.getElementById('detailConvertBtn');
convertBtn.style.display = item.type !== 'todo' ? 'inline-block' : 'none';
let html = `<div class="mb-3"><strong>类型:</strong> ${getTypeLabel(item.type)}</div>`;
if (item.url) {
@@ -1129,7 +1477,7 @@ async function showDetail(id) {
html += `<div class="mb-3"><strong>状态:</strong> ${getStatusLabel(item.status)}</div>`;
html += `<div class="mb-3"><strong>优先级:</strong> ${getPriorityLabel(item.priority)}</div>`;
if (item.due_date) {
html += `<div class="mb-3"><strong>截止日期:</strong> ${item.due_date}</div>`;
html += `<div class="mb-3"><strong>截止时间:</strong> ${formatDueDateFull(item.due_date)}</div>`;
}
}
@@ -1143,11 +1491,31 @@ async function showDetail(id) {
html += `<div class="text-muted small"><strong>创建时间:</strong> ${formatDate(item.created_at)}<br><strong>更新时间:</strong> ${formatDate(item.updated_at)}</div>`;
// 邮件发送历史
if (item.email_logs && item.email_logs.length > 0) {
html += `<hr><div class="mb-3"><strong>📧 邮件发送记录:</strong></div>`;
html += `<div class="border rounded p-2 bg-light">`;
item.email_logs.forEach(log => {
const statusIcon = log.success ? '' : '';
html += `<div class="d-flex justify-content-between align-items-center py-1 border-bottom">
<span>${statusIcon} 发送到: <strong>${log.email}</strong></span>
<span class="text-muted small">${formatDate(log.sent_at)}</span>
</div>`;
});
html += `</div>`;
}
document.getElementById('detailContent').innerHTML = html;
new bootstrap.Modal(document.getElementById('detailModal')).show();
}
// 从详情页打开转换
function showConvertModalFromDetail() {
bootstrap.Modal.getInstance(document.getElementById('detailModal')).hide();
setTimeout(() => showConvertModal(currentDetailId), 300);
}
// 从详情页打开编辑
function openEditModalFromDetail() {
bootstrap.Modal.getInstance(document.getElementById('detailModal')).hide();
@@ -1181,7 +1549,21 @@ async function openEditModal(id) {
if (type === 'todo') {
document.getElementById('editStatus').value = item.status;
document.getElementById('editPriority').value = item.priority;
document.getElementById('editDueDate').value = item.due_date || '';
// 处理 datetime-local 格式
if (item.due_date) {
// 尝试解析日期时间格式
let dueDate = item.due_date;
if (dueDate.includes('T')) {
// ISO 格式,截取到分钟
dueDate = dueDate.substring(0, 16);
} else if (dueDate.length === 10) {
// 只有日期,添加默认时间 00:00
dueDate = dueDate + 'T00:00';
}
document.getElementById('editDueDate').value = dueDate;
} else {
document.getElementById('editDueDate').value = '';
}
}
new bootstrap.Modal(document.getElementById('editModal')).show();
@@ -1260,10 +1642,79 @@ function truncate(str, len) {
return str && str.length > len ? str.substring(0, len) + '...' : str || '';
}
// 简短日期格式(用于卡片显示)
function formatShortDate(dateStr) {
if (!dateStr) return '';
const date = new Date(dateStr);
const month = String(date.getMonth() + 1).padStart(2, '0');
const day = String(date.getDate()).padStart(2, '0');
const hour = String(date.getHours()).padStart(2, '0');
const min = String(date.getMinutes()).padStart(2, '0');
return `${month}-${day} ${hour}:${min}`;
}
function formatDate(dateStr) {
return new Date(dateStr).toLocaleString('zh-CN');
}
// 格式化截止时间(友好显示)
function formatDueDate(dueDate) {
if (!dueDate) return '';
let date;
if (dueDate.includes('T')) {
date = new Date(dueDate);
} else if (dueDate.length === 10) {
// 只有日期
date = new Date(dueDate + 'T00:00:00');
} else {
date = new Date(dueDate);
}
// 格式化为友好格式
const now = new Date();
const today = new Date(now.getFullYear(), now.getMonth(), now.getDate());
const targetDay = new Date(date.getFullYear(), date.getMonth(), date.getDate());
const daysDiff = Math.floor((targetDay - today) / (1000 * 60 * 60 * 24));
let datePart;
if (daysDiff === 0) {
datePart = '今天';
} else if (daysDiff === 1) {
datePart = '明天';
} else if (daysDiff === -1) {
datePart = '昨天';
} else {
datePart = date.toLocaleDateString('zh-CN', {month: 'short', day: 'numeric'});
}
const timePart = date.toLocaleTimeString('zh-CN', {hour: '2-digit', minute: '2-digit'});
return `${datePart} ${timePart}`;
}
// 格式化截止时间(完整显示)
function formatDueDateFull(dueDate) {
if (!dueDate) return '';
let date;
if (dueDate.includes('T')) {
date = new Date(dueDate);
} else if (dueDate.length === 10) {
date = new Date(dueDate + 'T00:00:00');
} else {
date = new Date(dueDate);
}
return date.toLocaleString('zh-CN', {
year: 'numeric',
month: 'long',
day: 'numeric',
hour: '2-digit',
minute: '2-digit'
});
}
function escapeHtml(str) {
if (!str) return '';
return str.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
@@ -1756,12 +2207,163 @@ async function sendItemEmail() {
}
}
function debounce(fn, delay) {
let timer;
return function(...args) {
clearTimeout(timer);
timer = setTimeout(() => fn.apply(this, args), delay);
};
// ============ 提醒功能 ============
let reminderData = null;
let reminderDismissed = false;
async function loadReminders() {
const res = await fetch(`${API_BASE}/reminders`);
const data = await res.json();
if (data.success) {
reminderData = data.data;
updateReminderBar();
}
}
function updateReminderBar() {
if (!reminderData || reminderDismissed) return;
const total = reminderData.total;
if (total === 0) {
document.getElementById('reminderBar').style.display = 'none';
return;
}
// 显示提醒栏
document.getElementById('reminderBar').style.display = 'block';
// 构建提醒文本
let text = '';
if (reminderData.overdue.length > 0) {
text += `<span class="text-danger fw-bold">${reminderData.overdue.length}个已过期</span> `;
}
if (reminderData.due_today.length > 0) {
text += `<span class="text-warning fw-bold">${reminderData.due_today.length}个今天到期</span> `;
}
if (reminderData.due_soon.length > 0) {
text += `<span>${reminderData.due_soon.length}个即将到期</span>`;
}
document.getElementById('reminderText').innerHTML = text;
// 更新提醒角标样式
const bar = document.getElementById('reminderBar');
if (reminderData.overdue.length > 0) {
bar.className = 'alert alert-danger alert-dismissible fade show mb-3';
} else if (reminderData.due_today.length > 0) {
bar.className = 'alert alert-warning alert-dismissible fade show mb-3';
} else {
bar.className = 'alert alert-info alert-dismissible fade show mb-3';
}
}
function dismissReminderBar() {
reminderDismissed = true;
document.getElementById('reminderBar').style.display = 'none';
}
function showRemindersModal() {
if (!reminderData) return;
let html = '';
// 已过期
if (reminderData.overdue.length > 0) {
html += `<div class="mb-3"><h6 class="text-danger"><i class="bi bi-exclamation-circle"></i> 已过期 (${reminderData.overdue.length})</h6>`;
html += `<div class="list-group">`;
reminderData.overdue.forEach(item => {
html += `<div class="list-group-item list-group-item-danger d-flex justify-content-between align-items-center">
<div>
<strong>${item.title || '(无标题)'}</strong>
<br><small class="text-muted">截止: ${formatDueDateFull(item.due_date)} | 已过期 ${item.days_overdue} 天</small>
</div>
<div>
<button class="btn btn-sm btn-success" onclick="completeReminder(${item.id})" title="完成">
<i class="bi bi-check"></i>
</button>
<button class="btn btn-sm btn-outline-primary" onclick="openEditModal(${item.id}); bootstrap.Modal.getInstance(document.getElementById('remindersModal')).hide();" title="编辑">
<i class="bi bi-pencil"></i>
</button>
</div>
</div>`;
});
html += `</div></div>`;
}
// 今天到期
if (reminderData.due_today.length > 0) {
html += `<div class="mb-3"><h6 class="text-warning"><i class="bi bi-clock-fill"></i> 今天到期 (${reminderData.due_today.length})</h6>`;
html += `<div class="list-group">`;
reminderData.due_today.forEach(item => {
html += `<div class="list-group-item list-group-item-warning d-flex justify-content-between align-items-center">
<div>
<strong>${item.title || '(无标题)'}</strong>
<br><small class="text-muted">截止: ${formatDueDateFull(item.due_date)}</small>
</div>
<div>
<button class="btn btn-sm btn-success" onclick="completeReminder(${item.id})" title="完成">
<i class="bi bi-check"></i>
</button>
<button class="btn btn-sm btn-outline-primary" onclick="openEditModal(${item.id}); bootstrap.Modal.getInstance(document.getElementById('remindersModal')).hide();" title="编辑">
<i class="bi bi-pencil"></i>
</button>
</div>
</div>`;
});
html += `</div></div>`;
}
// 即将到期
if (reminderData.due_soon.length > 0) {
html += `<div class="mb-3"><h6 class="text-info"><i class="bi bi-hourglass-split"></i> 即将到期 (${reminderData.due_soon.length})</h6>`;
html += `<div class="list-group">`;
reminderData.due_soon.forEach(item => {
html += `<div class="list-group-item list-group-item-info d-flex justify-content-between align-items-center">
<div>
<strong>${item.title || '(无标题)'}</strong>
<br><small class="text-muted">截止: ${formatDueDateFull(item.due_date)}</small>
</div>
<div>
<button class="btn btn-sm btn-success" onclick="completeReminder(${item.id})" title="完成">
<i class="bi bi-check"></i>
</button>
<button class="btn btn-sm btn-outline-primary" onclick="openEditModal(${item.id}); bootstrap.Modal.getInstance(document.getElementById('remindersModal')).hide();" title="编辑">
<i class="bi bi-pencil"></i>
</button>
</div>
</div>`;
});
html += `</div></div>`;
}
if (!html) {
html = '<div class="text-center text-muted py-3">暂无待办提醒</div>';
}
document.getElementById('remindersContent').innerHTML = html;
new bootstrap.Modal(document.getElementById('remindersModal')).show();
}
async function completeReminder(id) {
await fetch(`${API_BASE}/items/${id}/done`, { method: 'POST' });
// 刷新数据
await loadReminders();
refreshData();
// 如果弹窗打开,更新显示
const modalEl = document.getElementById('remindersModal');
const modal = bootstrap.Modal.getInstance(modalEl);
if (modal) {
// 检查是否还有提醒
if (reminderData && reminderData.total > 0) {
showRemindersModal();
} else {
modal.hide();
}
}
}
</script>
</body>

View File

@@ -90,6 +90,18 @@ class Database:
)
""")
# 邮件发送记录表
cursor.execute("""
CREATE TABLE IF NOT EXISTS email_logs (
id INTEGER PRIMARY KEY AUTOINCREMENT,
item_id INTEGER NOT NULL,
email TEXT NOT NULL,
sent_at TEXT NOT NULL,
success INTEGER DEFAULT 1,
FOREIGN KEY (item_id) REFERENCES items(id) ON DELETE CASCADE
)
""")
# 创建索引
cursor.execute("CREATE INDEX IF NOT EXISTS idx_items_type ON items(type)")
cursor.execute("CREATE INDEX IF NOT EXISTS idx_items_status ON items(status)")
@@ -371,6 +383,31 @@ class Database:
conn.commit()
return cursor.rowcount > 0
# ============ 邮件日志 操作 ============
def log_email_send(self, item_id: int, email: str, success: bool = True) -> int:
"""记录邮件发送"""
now = datetime.now().isoformat()
with self.get_conn() as conn:
cursor = conn.cursor()
cursor.execute("""
INSERT INTO email_logs (item_id, email, sent_at, success)
VALUES (?, ?, ?, ?)
""", (item_id, email, now, 1 if success else 0))
conn.commit()
return cursor.lastrowid
def get_email_logs(self, item_id: int) -> List[Dict[str, Any]]:
"""获取收藏的邮件发送记录"""
with self.get_conn() as conn:
cursor = conn.cursor()
cursor.execute("""
SELECT * FROM email_logs
WHERE item_id = ?
ORDER BY sent_at DESC
""", (item_id,))
return [dict(row) for row in cursor.fetchall()]
def stats(self) -> Dict[str, Any]:
"""获取统计信息"""
self._ensure_init()
@@ -396,6 +433,74 @@ class Database:
stats['tags'] = cursor.fetchone()['count']
return stats
# ============ 提醒相关 ============
def get_reminders(self) -> Dict[str, Any]:
"""获取提醒信息:即将到期和已过期的待办"""
self._ensure_init()
with self.get_conn() as conn:
cursor = conn.cursor()
now = datetime.now()
reminders = {
'overdue': [], # 已过期
'due_today': [], # 今天到期
'due_soon': [] # 24小时内到期不含今天
}
# 查询未完成的待办(有截止日期的)
cursor.execute("""
SELECT * FROM items
WHERE type = 'todo'
AND status != 'completed'
AND due_date IS NOT NULL
AND due_date != ''
ORDER BY due_date ASC
""")
for row in cursor.fetchall():
item = dict(row)
item['tags'] = self._get_item_tags(conn, item['id'])
try:
due_date_str = item['due_date']
# 支持多种日期格式
if 'T' in due_date_str:
# ISO 格式2026-04-16T14:30
due_date = datetime.strptime(due_date_str[:16], '%Y-%m-%dT%H:%M')
elif len(due_date_str) == 10:
# 只有日期2026-04-16视为当天 23:59:59
due_date = datetime.strptime(due_date_str, '%Y-%m-%d').replace(hour=23, minute=59, second=59)
else:
# 其他格式,尝试解析
due_date = datetime.strptime(due_date_str.split('.')[0], '%Y-%m-%dT%H:%M:%S')
# 计算距离到期的时间
time_left = due_date - now
if time_left.total_seconds() < 0:
# 已过期
days_overdue = abs(int(time_left.total_seconds() / 86400))
item['days_overdue'] = days_overdue
reminders['overdue'].append(item)
elif time_left.total_seconds() < 86400: # 24小时内
# 判断是今天还是明天
if due_date.date() == now.date():
reminders['due_today'].append(item)
else:
reminders['due_soon'].append(item)
elif due_date.date() == now.date():
# 今天到期超过24小时的情况比如现在凌晨截止时间是晚上
reminders['due_today'].append(item)
except (ValueError, AttributeError) as e:
# 日期格式错误,跳过
continue
# 统计总数
reminders['total'] = len(reminders['overdue']) + len(reminders['due_today']) + len(reminders['due_soon'])
return reminders
# 全局数据库实例