Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7b4134a72c |
@@ -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];
|
||||||
@@ -711,7 +720,7 @@
|
|||||||
el.classList.add('editing');
|
el.classList.add('editing');
|
||||||
var deadline = w.deadline || '';
|
var deadline = w.deadline || '';
|
||||||
var quadOpts = QUADRANTS.map(function(q){
|
var quadOpts = QUADRANTS.map(function(q){
|
||||||
return '<option value="' + q + '"' + (q === (w.quadrant || w.priority || '重要不紧急') ? ' selected' : '') + '>' + q + '</option>';
|
return '<option value="' + q + '"' + (q === normalizeQuadrant(w) ? ' selected' : '') + '>' + q + '</option>';
|
||||||
}).join('');
|
}).join('');
|
||||||
el.innerHTML =
|
el.innerHTML =
|
||||||
'<div class="wish-edit-form">' +
|
'<div class="wish-edit-form">' +
|
||||||
@@ -794,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();
|
||||||
@@ -822,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();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user