Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7b4134a72c | ||
|
|
13a0e12b34 | ||
|
|
1ea81b3086 |
@@ -644,10 +644,19 @@
|
|||||||
var wishesLoaded = false;
|
var wishesLoaded = false;
|
||||||
var QUADRANTS = ['重要紧急', '重要不紧急', '紧急不重要', '不紧急不重要'];
|
var QUADRANTS = ['重要紧急', '重要不紧急', '紧急不重要', '不紧急不重要'];
|
||||||
|
|
||||||
|
function normalizeQuadrant(w) {
|
||||||
|
if (QUADRANTS.indexOf(w.quadrant) >= 0) return w.quadrant;
|
||||||
|
// 老数据回退: priority → quadrant
|
||||||
|
var map = {'高': '重要紧急', '中': '重要不紧急', '低': '不紧急不重要'};
|
||||||
|
return map[w.priority] || '重要不紧急';
|
||||||
|
}
|
||||||
|
|
||||||
function loadWishes() {
|
function loadWishes() {
|
||||||
if (wishesLoaded) { renderWishes(); return; }
|
if (wishesLoaded) { renderWishes(); return; }
|
||||||
if (window.__INITIAL_WISHES__) {
|
if (window.__INITIAL_WISHES__) {
|
||||||
wishes = window.__INITIAL_WISHES__;
|
wishes = window.__INITIAL_WISHES__;
|
||||||
|
// 规范化 quadrant
|
||||||
|
wishes.forEach(function(w){ w.quadrant = normalizeQuadrant(w); });
|
||||||
wishesLoaded = true;
|
wishesLoaded = true;
|
||||||
renderWishes();
|
renderWishes();
|
||||||
return;
|
return;
|
||||||
@@ -670,7 +679,7 @@
|
|||||||
QUADRANTS.forEach(function(quadrant) {
|
QUADRANTS.forEach(function(quadrant) {
|
||||||
var list = document.getElementById('quad-list-' + quadrant);
|
var list = document.getElementById('quad-list-' + quadrant);
|
||||||
if (!list) return;
|
if (!list) return;
|
||||||
var items = wishes.filter(function(w){ return (w.quadrant || w.priority || '重要不紧急') === quadrant; });
|
var items = wishes.filter(function(w){ return normalizeQuadrant(w) === quadrant; });
|
||||||
var html = '';
|
var html = '';
|
||||||
for (var i = 0; i < items.length; i++) {
|
for (var i = 0; i < items.length; i++) {
|
||||||
var w = items[i];
|
var w = items[i];
|
||||||
@@ -688,8 +697,64 @@
|
|||||||
});
|
});
|
||||||
|
|
||||||
bindDragEvents();
|
bindDragEvents();
|
||||||
|
bindEditClicks();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* ── 点击编辑 ── */
|
||||||
|
|
||||||
|
function bindEditClicks() {
|
||||||
|
document.querySelectorAll('#panel-wishes .wish-item').forEach(function(item) {
|
||||||
|
// 只在点击名称或日期区域时触发编辑(排除 checkbox / 拖拽手柄 / 删除按钮)
|
||||||
|
item.addEventListener('click', function(e) {
|
||||||
|
if (e.target.closest('.wish-check') || e.target.closest('.wish-drag-handle') ||
|
||||||
|
e.target.closest('.wish-del') || e.target.closest('.wish-edit-form')) return;
|
||||||
|
var id = parseInt(this.dataset.id);
|
||||||
|
var w = wishes.find(function(x){ return x.id === id; });
|
||||||
|
if (w) startEditWish(this, w);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function startEditWish(el, w) {
|
||||||
|
if (el.querySelector('.wish-edit-form')) return; // 已在编辑中
|
||||||
|
el.classList.add('editing');
|
||||||
|
var deadline = w.deadline || '';
|
||||||
|
var quadOpts = QUADRANTS.map(function(q){
|
||||||
|
return '<option value="' + q + '"' + (q === normalizeQuadrant(w) ? ' selected' : '') + '>' + q + '</option>';
|
||||||
|
}).join('');
|
||||||
|
el.innerHTML =
|
||||||
|
'<div class="wish-edit-form">' +
|
||||||
|
'<input type="text" class="wish-edit-name" value="' + esc(w.name) + '" maxlength="50">' +
|
||||||
|
'<div class="wish-edit-row">' +
|
||||||
|
'<select class="wish-edit-quadrant">' + quadOpts + '</select>' +
|
||||||
|
'<input type="date" class="wish-edit-deadline" value="' + esc(deadline) + '">' +
|
||||||
|
'</div>' +
|
||||||
|
'<div class="wish-edit-actions">' +
|
||||||
|
'<button class="btn-wish-save" onclick="event.stopPropagation();saveEditWish(' + w.id + ', this)">保存</button>' +
|
||||||
|
'<button class="btn-wish-cancel" onclick="event.stopPropagation();window.renderWishes()">取消</button>' +
|
||||||
|
'</div>' +
|
||||||
|
'</div>';
|
||||||
|
}
|
||||||
|
|
||||||
|
window.saveEditWish = function(id, btn) {
|
||||||
|
var form = btn.closest('.wish-edit-form');
|
||||||
|
var name = form.querySelector('.wish-edit-name').value.trim();
|
||||||
|
if (!name) { showToast('名称不能为空', 'error'); return; }
|
||||||
|
var quadrant = form.querySelector('.wish-edit-quadrant').value;
|
||||||
|
var deadline = form.querySelector('.wish-edit-deadline').value;
|
||||||
|
fetch('/api/wishes/' + id, {
|
||||||
|
method: 'PUT',
|
||||||
|
headers: {'Content-Type': 'application/json'},
|
||||||
|
body: JSON.stringify({name: name, quadrant: quadrant, deadline: deadline})
|
||||||
|
}).then(function(r){ return r.json(); })
|
||||||
|
.then(function(res) {
|
||||||
|
if (!res.ok) { showToast(res.error, 'error'); return; }
|
||||||
|
var w = wishes.find(function(x){ return x.id === id; });
|
||||||
|
if (w) { w.name = name; w.quadrant = quadrant; w.deadline = deadline; }
|
||||||
|
renderWishes();
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
/* ── Drag & Drop (跨象限) ── */
|
/* ── Drag & Drop (跨象限) ── */
|
||||||
|
|
||||||
function bindDragEvents() {
|
function bindDragEvents() {
|
||||||
@@ -738,7 +803,7 @@
|
|||||||
method: 'PUT',
|
method: 'PUT',
|
||||||
headers: {'Content-Type': 'application/json'},
|
headers: {'Content-Type': 'application/json'},
|
||||||
body: JSON.stringify({quadrant: targetQuadrant})
|
body: JSON.stringify({quadrant: targetQuadrant})
|
||||||
});
|
}).catch(function(){ showToast('保存失败', 'error'); });
|
||||||
}
|
}
|
||||||
renderWishes();
|
renderWishes();
|
||||||
saveWishOrder();
|
saveWishOrder();
|
||||||
@@ -766,7 +831,7 @@
|
|||||||
method: 'PUT',
|
method: 'PUT',
|
||||||
headers: {'Content-Type': 'application/json'},
|
headers: {'Content-Type': 'application/json'},
|
||||||
body: JSON.stringify({quadrant: q})
|
body: JSON.stringify({quadrant: q})
|
||||||
});
|
}).catch(function(){ showToast('保存失败', 'error'); });
|
||||||
renderWishes();
|
renderWishes();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -840,6 +905,8 @@
|
|||||||
btn.classList.toggle('active', editing);
|
btn.classList.toggle('active', editing);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
window.renderWishes = renderWishes;
|
||||||
|
|
||||||
/* ================================================================
|
/* ================================================================
|
||||||
Init
|
Init
|
||||||
================================================================ */
|
================================================================ */
|
||||||
|
|||||||
@@ -1211,6 +1211,47 @@ body {
|
|||||||
.wish-del { display: none; }
|
.wish-del { display: none; }
|
||||||
.wish-del .icon-xs { width: 13px; height: 13px; }
|
.wish-del .icon-xs { width: 13px; height: 13px; }
|
||||||
|
|
||||||
|
/* 内联编辑 */
|
||||||
|
.wish-item.editing {
|
||||||
|
background: var(--card);
|
||||||
|
padding: 8px 10px;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
}
|
||||||
|
.wish-edit-form {
|
||||||
|
width: 100%;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 6px;
|
||||||
|
}
|
||||||
|
.wish-edit-form input[type="text"],
|
||||||
|
.wish-edit-form input[type="date"],
|
||||||
|
.wish-edit-form select {
|
||||||
|
width: 100%;
|
||||||
|
padding: 6px 8px;
|
||||||
|
border: 1.5px solid var(--border);
|
||||||
|
border-radius: var(--radius-sm);
|
||||||
|
font-size: 12px;
|
||||||
|
font-family: inherit;
|
||||||
|
color: var(--text);
|
||||||
|
background: var(--card);
|
||||||
|
box-sizing: border-box;
|
||||||
|
}
|
||||||
|
.wish-edit-form input:focus,
|
||||||
|
.wish-edit-form select:focus {
|
||||||
|
outline: none;
|
||||||
|
border-color: var(--primary);
|
||||||
|
box-shadow: 0 0 0 2px rgba(74,108,247,0.08);
|
||||||
|
}
|
||||||
|
.wish-edit-name { font-weight: 500; }
|
||||||
|
.wish-edit-row { display: flex; gap: 6px; }
|
||||||
|
.wish-edit-row select,
|
||||||
|
.wish-edit-row input { flex: 1; }
|
||||||
|
.wish-edit-actions { display: flex; gap: 6px; }
|
||||||
|
.wish-edit-actions .btn-wish-save,
|
||||||
|
.wish-edit-actions .btn-wish-cancel {
|
||||||
|
flex: 1; padding: 6px; font-size: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
.wishes-empty {
|
.wishes-empty {
|
||||||
font-size: 13px; color: var(--text-muted); text-align: center; padding: 32px 0;
|
font-size: 13px; color: var(--text-muted); text-align: center; padding: 32px 0;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user