feat(v4.1.0): 文本类别添加待办事务功能
- 可在文本数据详情中追加待办事务 - 支持事务内容、剩余天数(默认1天)、完成状态 - 历史事务按时间倒序排列,显示创建/更新时间 - 分页显示,每页10条
This commit is contained in:
@@ -338,6 +338,105 @@ def reopen_item(item_id):
|
||||
return jsonify({'success': True, 'data': item})
|
||||
|
||||
|
||||
# ============ Todo Events 待办事务API ============
|
||||
|
||||
@app.route('/api/items/<int:item_id>/todo-events', methods=['GET'])
|
||||
def list_todo_events(item_id):
|
||||
"""列出待办事务"""
|
||||
limit = int(request.args.get('limit', 10))
|
||||
offset = int(request.args.get('offset', 0))
|
||||
|
||||
events = db.list_todo_events(item_id, limit=limit, offset=offset)
|
||||
total = db.count_todo_events(item_id)
|
||||
|
||||
return jsonify({'success': True, 'data': events, 'total': total})
|
||||
|
||||
|
||||
@app.route('/api/items/<int:item_id>/todo-events', methods=['POST'])
|
||||
def create_todo_event(item_id):
|
||||
"""创建待办事务"""
|
||||
data = request.get_json()
|
||||
|
||||
if not data or not data.get('content'):
|
||||
return jsonify({'success': False, 'error': '缺少事务内容'}), 400
|
||||
|
||||
# 检查item是否存在且是text类型
|
||||
item = db.get_item(item_id)
|
||||
if not item:
|
||||
return jsonify({'success': False, 'error': '条目不存在'}), 404
|
||||
|
||||
if item['type'] != 'text':
|
||||
return jsonify({'success': False, 'error': '只有文本类型可添加待办事务'}), 400
|
||||
|
||||
remaining_days = data.get('remaining_days', 1)
|
||||
if remaining_days < 0:
|
||||
remaining_days = 1
|
||||
|
||||
event_id = db.create_todo_event(item_id, data['content'], remaining_days)
|
||||
event = db.get_todo_event(event_id)
|
||||
|
||||
return jsonify({'success': True, 'data': event}), 201
|
||||
|
||||
|
||||
@app.route('/api/todo-events/<int:event_id>', methods=['GET'])
|
||||
def get_todo_event(event_id):
|
||||
"""获取单个待办事务"""
|
||||
event = db.get_todo_event(event_id)
|
||||
if not event:
|
||||
return jsonify({'success': False, 'error': '事务不存在'}), 404
|
||||
|
||||
return jsonify({'success': True, 'data': event})
|
||||
|
||||
|
||||
@app.route('/api/todo-events/<int:event_id>', methods=['PUT'])
|
||||
def update_todo_event(event_id):
|
||||
"""更新待办事务"""
|
||||
data = request.get_json()
|
||||
|
||||
if not data:
|
||||
return jsonify({'success': False, 'error': '无数据'}), 400
|
||||
|
||||
event = db.get_todo_event(event_id)
|
||||
if not event:
|
||||
return jsonify({'success': False, 'error': '事务不存在'}), 404
|
||||
|
||||
content = data.get('content')
|
||||
remaining_days = data.get('remaining_days')
|
||||
is_completed = data.get('is_completed')
|
||||
|
||||
if is_completed is not None:
|
||||
is_completed = bool(is_completed)
|
||||
|
||||
db.update_todo_event(event_id, content=content, remaining_days=remaining_days, is_completed=is_completed)
|
||||
event = db.get_todo_event(event_id)
|
||||
|
||||
return jsonify({'success': True, 'data': event})
|
||||
|
||||
|
||||
@app.route('/api/todo-events/<int:event_id>', methods=['DELETE'])
|
||||
def delete_todo_event(event_id):
|
||||
"""删除待办事务"""
|
||||
event = db.get_todo_event(event_id)
|
||||
if not event:
|
||||
return jsonify({'success': False, 'error': '事务不存在'}), 404
|
||||
|
||||
db.delete_todo_event(event_id)
|
||||
return jsonify({'success': True})
|
||||
|
||||
|
||||
@app.route('/api/todo-events/<int:event_id>/complete', methods=['POST'])
|
||||
def complete_todo_event(event_id):
|
||||
"""完成待办事务"""
|
||||
event = db.get_todo_event(event_id)
|
||||
if not event:
|
||||
return jsonify({'success': False, 'error': '事务不存在'}), 404
|
||||
|
||||
db.update_todo_event(event_id, is_completed=True)
|
||||
event = db.get_todo_event(event_id)
|
||||
|
||||
return jsonify({'success': True, 'data': event})
|
||||
|
||||
|
||||
@app.route('/api/items/<int:item_id>/convert', methods=['POST'])
|
||||
def convert_item(item_id):
|
||||
"""将收藏转换为待办"""
|
||||
@@ -1846,6 +1945,44 @@ INDEX_TEMPLATE = '''
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 待办事务模态框 -->
|
||||
<div class="modal fade" id="todoEventModal" tabindex="-1">
|
||||
<div class="modal-dialog">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title"><i class="bi bi-list-check"></i> <span id="todoEventModalTitle">添加待办事务</span></h5>
|
||||
<button type="button" class="btn-close" data-bs-dismiss="modal"></button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<input type="hidden" id="todoEventId">
|
||||
<input type="hidden" id="todoEventItemId">
|
||||
<div class="mb-3">
|
||||
<label class="form-label">事务内容</label>
|
||||
<textarea id="todoEventContent" class="form-control" rows="3" placeholder="输入事务内容..."></textarea>
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<label class="form-label">剩余天数</label>
|
||||
<input type="number" id="todoEventDays" class="form-control" value="1" min="0">
|
||||
<small class="text-muted">0表示已过期</small>
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<label class="form-label">完成状态</label>
|
||||
<select id="todoEventCompleted" class="form-select">
|
||||
<option value="0">未完成</option>
|
||||
<option value="1">已完成</option>
|
||||
</select>
|
||||
</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="saveTodoEvent()">
|
||||
<i class="bi bi-check"></i> 保存
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 移动到文件夹模态框 -->
|
||||
<div class="modal fade" id="moveToFolderModal" tabindex="-1">
|
||||
<div class="modal-dialog">
|
||||
@@ -2709,7 +2846,7 @@ async function deleteItem(id) {
|
||||
let currentDetailId = null;
|
||||
|
||||
// 显示详情
|
||||
async function showDetail(id) {
|
||||
async function showDetail(id, todoPage = 1) {
|
||||
currentDetailId = id;
|
||||
|
||||
// 增加阅读数
|
||||
@@ -2775,6 +2912,76 @@ async function showDetail(id) {
|
||||
}
|
||||
}
|
||||
|
||||
// 文本类型显示待办事务
|
||||
if (item.type === 'text') {
|
||||
const todoOffset = (todoPage - 1) * 10;
|
||||
const todoRes = await fetch(`${API_BASE}/items/${id}/todo-events?limit=10&offset=${todoOffset}`);
|
||||
const todoData = await todoRes.json();
|
||||
|
||||
html += `<hr><div class="mb-3">
|
||||
<div class="d-flex justify-content-between align-items-center">
|
||||
<strong><i class="bi bi-list-check"></i> 待办事务</strong>
|
||||
<button class="btn btn-sm btn-outline-primary" onclick="showAddTodoEventModal(${item.id})">
|
||||
<i class="bi bi-plus"></i> 添加事务
|
||||
</button>
|
||||
</div>
|
||||
</div>`;
|
||||
|
||||
if (todoData.success && todoData.data.length > 0) {
|
||||
html += `<div class="border rounded p-2 bg-light" id="todoEventsList">`;
|
||||
todoData.data.forEach(event => {
|
||||
const completedClass = event.is_completed ? 'text-muted' : '';
|
||||
const checkIcon = event.is_completed ? '✅' : '⏳';
|
||||
const remainingText = event.remaining_days > 0 ? `${event.remaining_days}天` : '已过期';
|
||||
const remainingClass = event.remaining_days <= 0 ? 'text-danger' : 'text-info';
|
||||
|
||||
html += `<div class="d-flex justify-content-between align-items-start py-2 border-bottom todo-event-item ${completedClass}">
|
||||
<div class="flex-grow-1">
|
||||
<div class="d-flex align-items-center gap-2">
|
||||
<span onclick="toggleTodoEventComplete(${event.id}, ${item.id})" style="cursor:pointer;" title="点击切换完成状态">${checkIcon}</span>
|
||||
<span class="${event.is_completed ? 'text-decoration-line-through' : ''}">${escapeHtml(event.content)}</span>
|
||||
<small class="${remainingClass}">(${remainingText})</small>
|
||||
</div>
|
||||
<div class="text-muted small mt-1">
|
||||
创建: ${formatShortDate(event.created_at)} | 更新: ${formatShortDate(event.updated_at)}
|
||||
</div>
|
||||
</div>
|
||||
<div class="btn-group btn-group-sm">
|
||||
<button class="btn btn-outline-secondary btn-sm" onclick="showEditTodoEventModal(${event.id}, ${item.id})" title="编辑">
|
||||
<i class="bi bi-pencil"></i>
|
||||
</button>
|
||||
<button class="btn btn-outline-danger btn-sm" onclick="deleteTodoEvent(${event.id}, ${item.id})" title="删除">
|
||||
<i class="bi bi-trash"></i>
|
||||
</button>
|
||||
</div>
|
||||
</div>`;
|
||||
});
|
||||
html += `</div>`;
|
||||
|
||||
// 分页
|
||||
const totalTodo = todoData.total;
|
||||
const totalPagesTodo = Math.ceil(totalTodo / 10);
|
||||
if (totalPagesTodo > 1) {
|
||||
html += `<div class="d-flex justify-content-center mt-2">
|
||||
<nav><ul class="pagination pagination-sm">`;
|
||||
for (let p = 1; p <= Math.min(totalPagesTodo, 5); p++) {
|
||||
html += `<li class="page-item ${p === todoPage ? 'active' : ''}">
|
||||
<a class="page-link" href="#" onclick="showDetail(${id}, ${p}); return false;">${p}</a>
|
||||
</li>`;
|
||||
}
|
||||
if (totalPagesTodo > 5) {
|
||||
html += `<li class="page-item disabled"><span class="page-link">...</span></li>`;
|
||||
html += `<li class="page-item"><a class="page-link" href="#" onclick="showDetail(${id}, ${totalPagesTodo}); return false;">${totalPagesTodo}</a></li>`;
|
||||
}
|
||||
html += `</ul></nav>
|
||||
<small class="text-muted ms-2">共 ${totalTodo} 条事务</small>
|
||||
</div>`;
|
||||
}
|
||||
} else {
|
||||
html += `<div class="text-center text-muted py-3">暂无待办事务</div>`;
|
||||
}
|
||||
}
|
||||
|
||||
if (item.tags.length) {
|
||||
html += `<div class="mb-3"><strong>标签:</strong> ${item.tags.map(t => `<span class="badge bg-secondary">${escapeHtml(t)}</span>`).join(' ')}</div>`;
|
||||
}
|
||||
@@ -2816,6 +3023,126 @@ async function showDetail(id) {
|
||||
new bootstrap.Modal(document.getElementById('detailModal')).show();
|
||||
}
|
||||
|
||||
// ============ 待办事务功能 ============
|
||||
|
||||
// 显示添加待办事务模态框
|
||||
function showAddTodoEventModal(itemId) {
|
||||
document.getElementById('todoEventId').value = '';
|
||||
document.getElementById('todoEventItemId').value = itemId;
|
||||
document.getElementById('todoEventContent').value = '';
|
||||
document.getElementById('todoEventDays').value = 1;
|
||||
document.getElementById('todoEventCompleted').value = 0;
|
||||
document.getElementById('todoEventModalTitle').textContent = '添加待办事务';
|
||||
|
||||
new bootstrap.Modal(document.getElementById('todoEventModal')).show();
|
||||
}
|
||||
|
||||
// 显示编辑待办事务模态框
|
||||
async function showEditTodoEventModal(eventId, itemId) {
|
||||
const res = await fetch(`${API_BASE}/todo-events/${eventId}`);
|
||||
const data = await res.json();
|
||||
|
||||
if (!data.success) {
|
||||
alert('获取事务失败');
|
||||
return;
|
||||
}
|
||||
|
||||
const event = data.data;
|
||||
document.getElementById('todoEventId').value = eventId;
|
||||
document.getElementById('todoEventItemId').value = itemId;
|
||||
document.getElementById('todoEventContent').value = event.content;
|
||||
document.getElementById('todoEventDays').value = event.remaining_days;
|
||||
document.getElementById('todoEventCompleted').value = event.is_completed;
|
||||
document.getElementById('todoEventModalTitle').textContent = '编辑待办事务';
|
||||
|
||||
new bootstrap.Modal(document.getElementById('todoEventModal')).show();
|
||||
}
|
||||
|
||||
// 保存待办事务
|
||||
async function saveTodoEvent() {
|
||||
const eventId = document.getElementById('todoEventId').value;
|
||||
const itemId = document.getElementById('todoEventItemId').value;
|
||||
const content = document.getElementById('todoEventContent').value.trim();
|
||||
const days = parseInt(document.getElementById('todoEventDays').value) || 1;
|
||||
const completed = document.getElementById('todoEventCompleted').value === '1';
|
||||
|
||||
if (!content) {
|
||||
alert('请输入事务内容');
|
||||
return;
|
||||
}
|
||||
|
||||
// 离线检查
|
||||
if (!checkOnlineBeforeAction('保存待办事务')) return;
|
||||
|
||||
if (eventId) {
|
||||
// 更新
|
||||
const res = await fetch(`${API_BASE}/todo-events/${eventId}`, {
|
||||
method: 'PUT',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ content, remaining_days: days, is_completed: completed })
|
||||
});
|
||||
const data = await res.json();
|
||||
|
||||
if (data.success) {
|
||||
bootstrap.Modal.getInstance(document.getElementById('todoEventModal')).hide();
|
||||
showDetail(itemId, 1); // 刷新详情,回到第一页
|
||||
} else {
|
||||
alert('更新失败: ' + data.error);
|
||||
}
|
||||
} else {
|
||||
// 创建
|
||||
const res = await fetch(`${API_BASE}/items/${itemId}/todo-events`, {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ content, remaining_days: days })
|
||||
});
|
||||
const data = await res.json();
|
||||
|
||||
if (data.success) {
|
||||
bootstrap.Modal.getInstance(document.getElementById('todoEventModal')).hide();
|
||||
showDetail(itemId, 1); // 刷新详情,回到第一页
|
||||
} else {
|
||||
alert('创建失败: ' + data.error);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 切换待办事务完成状态
|
||||
async function toggleTodoEventComplete(eventId, itemId) {
|
||||
// 离线检查
|
||||
if (!checkOnlineBeforeAction('切换完成状态')) return;
|
||||
|
||||
const res = await fetch(`${API_BASE}/todo-events/${eventId}/complete`, {
|
||||
method: 'POST'
|
||||
});
|
||||
const data = await res.json();
|
||||
|
||||
if (data.success) {
|
||||
showDetail(itemId, 1); // 刷新详情
|
||||
} else {
|
||||
alert('操作失败: ' + data.error);
|
||||
}
|
||||
}
|
||||
|
||||
// 删除待办事务
|
||||
async function deleteTodoEvent(eventId, itemId) {
|
||||
// 离线检查
|
||||
if (!checkOnlineBeforeAction('删除待办事务')) return;
|
||||
|
||||
if (!confirm('确认删除这条待办事务?')) return;
|
||||
|
||||
const res = await fetch(`${API_BASE}/todo-events/${eventId}`, {
|
||||
method: 'DELETE'
|
||||
});
|
||||
const data = await res.json();
|
||||
|
||||
if (data.success) {
|
||||
showDetail(itemId, 1); // 刷新详情
|
||||
} else {
|
||||
alert('删除失败: ' + data.error);
|
||||
}
|
||||
}
|
||||
|
||||
// 从详情页打开转换
|
||||
function showConvertModalFromDetail() {
|
||||
bootstrap.Modal.getInstance(document.getElementById('detailModal')).hide();
|
||||
|
||||
103
xian_favor/db.py
103
xian_favor/db.py
@@ -187,6 +187,22 @@ class Database:
|
||||
cursor.execute("CREATE INDEX IF NOT EXISTS idx_folders_type ON folders(type)")
|
||||
cursor.execute("CREATE INDEX IF NOT EXISTS idx_folders_parent ON folders(parent_id)")
|
||||
|
||||
# 待办事务表(关联到文本类别的items)
|
||||
cursor.execute("""
|
||||
CREATE TABLE IF NOT EXISTS todo_events (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
item_id INTEGER NOT NULL,
|
||||
content TEXT NOT NULL,
|
||||
remaining_days INTEGER DEFAULT 1,
|
||||
is_completed INTEGER DEFAULT 0,
|
||||
created_at TEXT NOT NULL,
|
||||
updated_at TEXT NOT NULL,
|
||||
FOREIGN KEY (item_id) REFERENCES items(id) ON DELETE CASCADE
|
||||
)
|
||||
""")
|
||||
cursor.execute("CREATE INDEX IF NOT EXISTS idx_todo_events_item ON todo_events(item_id)")
|
||||
cursor.execute("CREATE INDEX IF NOT EXISTS idx_todo_events_created ON todo_events(created_at)")
|
||||
|
||||
conn.commit()
|
||||
|
||||
# ============ Item 操作 ============
|
||||
@@ -1166,6 +1182,93 @@ class Database:
|
||||
# 删除
|
||||
self.delete_backup(backup['name'])
|
||||
|
||||
# ============ Todo Events 待办事务操作 ============
|
||||
|
||||
def create_todo_event(self, item_id: int, content: str, remaining_days: int = 1) -> int:
|
||||
"""创建待办事务"""
|
||||
self._ensure_init()
|
||||
now = datetime.now().isoformat()
|
||||
|
||||
with self.get_conn() as conn:
|
||||
cursor = conn.cursor()
|
||||
cursor.execute("""
|
||||
INSERT INTO todo_events (item_id, content, remaining_days, is_completed, created_at, updated_at)
|
||||
VALUES (?, ?, ?, 0, ?, ?)
|
||||
""", (item_id, content, remaining_days, now, now))
|
||||
conn.commit()
|
||||
return cursor.lastrowid
|
||||
|
||||
def list_todo_events(self, item_id: int, limit: int = 10, offset: int = 0) -> List[Dict[str, Any]]:
|
||||
"""列出待办事务(按时间倒序)"""
|
||||
self._ensure_init()
|
||||
|
||||
with self.get_conn() as conn:
|
||||
cursor = conn.cursor()
|
||||
cursor.execute("""
|
||||
SELECT * FROM todo_events
|
||||
WHERE item_id = ?
|
||||
ORDER BY created_at DESC
|
||||
LIMIT ? OFFSET ?
|
||||
""", (item_id, limit, offset))
|
||||
rows = cursor.fetchall()
|
||||
return [dict(row) for row in rows]
|
||||
|
||||
def count_todo_events(self, item_id: int) -> int:
|
||||
"""计算待办事务总数"""
|
||||
self._ensure_init()
|
||||
|
||||
with self.get_conn() as conn:
|
||||
cursor = conn.cursor()
|
||||
cursor.execute("SELECT COUNT(*) as count FROM todo_events WHERE item_id = ?", (item_id,))
|
||||
return cursor.fetchone()['count']
|
||||
|
||||
def get_todo_event(self, event_id: int) -> Optional[Dict[str, Any]]:
|
||||
"""获取单个待办事务"""
|
||||
self._ensure_init()
|
||||
|
||||
with self.get_conn() as conn:
|
||||
cursor = conn.cursor()
|
||||
cursor.execute("SELECT * FROM todo_events WHERE id = ?", (event_id,))
|
||||
row = cursor.fetchone()
|
||||
return dict(row) if row else None
|
||||
|
||||
def update_todo_event(self, event_id: int, content: str = None, remaining_days: int = None, is_completed: bool = None) -> bool:
|
||||
"""更新待办事务"""
|
||||
self._ensure_init()
|
||||
now = datetime.now().isoformat()
|
||||
|
||||
with self.get_conn() as conn:
|
||||
cursor = conn.cursor()
|
||||
|
||||
# 获取当前数据
|
||||
cursor.execute("SELECT * FROM todo_events WHERE id = ?", (event_id,))
|
||||
row = cursor.fetchone()
|
||||
if not row:
|
||||
return False
|
||||
|
||||
# 更新字段
|
||||
new_content = content if content is not None else row['content']
|
||||
new_days = remaining_days if remaining_days is not None else row['remaining_days']
|
||||
new_completed = 1 if is_completed is True else (0 if is_completed is False else row['is_completed'])
|
||||
|
||||
cursor.execute("""
|
||||
UPDATE todo_events
|
||||
SET content = ?, remaining_days = ?, is_completed = ?, updated_at = ?
|
||||
WHERE id = ?
|
||||
""", (new_content, new_days, new_completed, now, event_id))
|
||||
conn.commit()
|
||||
return True
|
||||
|
||||
def delete_todo_event(self, event_id: int) -> bool:
|
||||
"""删除待办事务"""
|
||||
self._ensure_init()
|
||||
|
||||
with self.get_conn() as conn:
|
||||
cursor = conn.cursor()
|
||||
cursor.execute("DELETE FROM todo_events WHERE id = ?", (event_id,))
|
||||
conn.commit()
|
||||
return cursor.rowcount > 0
|
||||
|
||||
|
||||
# 全局数据库实例
|
||||
db = Database()
|
||||
Reference in New Issue
Block a user