Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
46862e5110 | ||
|
|
7b4134a72c | ||
|
|
13a0e12b34 | ||
|
|
1ea81b3086 |
100
static/app.js
100
static/app.js
@@ -237,9 +237,9 @@
|
||||
var eveningItems = [];
|
||||
var eRows = document.querySelectorAll('#evening-list .evening-row');
|
||||
for (var j=0; j<eRows.length; j++) {
|
||||
var cols = eRows[j].querySelectorAll('.col input');
|
||||
var mistake = cols[0] ? cols[0].value.trim() : '';
|
||||
var improve = cols[1] ? cols[1].value.trim() : '';
|
||||
var inputs = eRows[j].querySelectorAll('input[type="text"]');
|
||||
var mistake = inputs[0] ? inputs[0].value.trim() : '';
|
||||
var improve = inputs[1] ? inputs[1].value.trim() : '';
|
||||
if (mistake || improve) eveningItems.push({ mistake: mistake, improvement: improve });
|
||||
}
|
||||
|
||||
@@ -319,30 +319,15 @@
|
||||
|
||||
function addEveningRow(mistake, improve) {
|
||||
var container = document.getElementById('evening-list');
|
||||
var idx = container.children.length;
|
||||
mistake = mistake || '';
|
||||
improve = improve || '';
|
||||
var div = document.createElement('div');
|
||||
div.className = 'evening-row';
|
||||
div.innerHTML =
|
||||
'<div class="evening-header">' +
|
||||
'<span class="idx">' + (idx+1) + '.</span>' +
|
||||
'<button class="btn-del" onclick="this.parentElement.parentElement.remove();renumberEvening()"><svg class="icon-sm"><use href="#icon-x"/></svg></button>' +
|
||||
'</div>' +
|
||||
'<div class="mistake-row">' +
|
||||
'<div class="col"><label>错误</label><input type="text" value="' + esc(mistake) + '" placeholder="今天犯的错…"></div>' +
|
||||
'<div class="col"><label>改进方案</label><input type="text" value="' + esc(improve) + '" placeholder="下次怎么做…"></div>' +
|
||||
'</div>';
|
||||
'<button class="btn-del" onclick="this.parentElement.remove()"><svg class="icon-sm"><use href="#icon-x"/></svg></button>' +
|
||||
'<input type="text" value="' + esc(mistake) + '" placeholder="犯的错误…">' +
|
||||
'<input type="text" value="' + esc(improve) + '" placeholder="改进方案…">';
|
||||
container.appendChild(div);
|
||||
renumberEvening();
|
||||
}
|
||||
|
||||
function renumberEvening() {
|
||||
var rows = document.querySelectorAll('#evening-list .evening-row');
|
||||
for (var i=0; i<rows.length; i++) {
|
||||
var span = rows[i].querySelector('.idx');
|
||||
if (span) span.textContent = (i+1) + '.';
|
||||
}
|
||||
}
|
||||
|
||||
/* ── 勤学预设项目 ── */
|
||||
@@ -644,10 +629,19 @@
|
||||
var wishesLoaded = false;
|
||||
var QUADRANTS = ['重要紧急', '重要不紧急', '紧急不重要', '不紧急不重要'];
|
||||
|
||||
function normalizeQuadrant(w) {
|
||||
if (QUADRANTS.indexOf(w.quadrant) >= 0) return w.quadrant;
|
||||
// 老数据回退: priority → quadrant
|
||||
var map = {'高': '重要紧急', '中': '重要不紧急', '低': '不紧急不重要'};
|
||||
return map[w.priority] || '重要不紧急';
|
||||
}
|
||||
|
||||
function loadWishes() {
|
||||
if (wishesLoaded) { renderWishes(); return; }
|
||||
if (window.__INITIAL_WISHES__) {
|
||||
wishes = window.__INITIAL_WISHES__;
|
||||
// 规范化 quadrant
|
||||
wishes.forEach(function(w){ w.quadrant = normalizeQuadrant(w); });
|
||||
wishesLoaded = true;
|
||||
renderWishes();
|
||||
return;
|
||||
@@ -670,7 +664,7 @@
|
||||
QUADRANTS.forEach(function(quadrant) {
|
||||
var list = document.getElementById('quad-list-' + quadrant);
|
||||
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 = '';
|
||||
for (var i = 0; i < items.length; i++) {
|
||||
var w = items[i];
|
||||
@@ -688,8 +682,64 @@
|
||||
});
|
||||
|
||||
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 (跨象限) ── */
|
||||
|
||||
function bindDragEvents() {
|
||||
@@ -738,7 +788,7 @@
|
||||
method: 'PUT',
|
||||
headers: {'Content-Type': 'application/json'},
|
||||
body: JSON.stringify({quadrant: targetQuadrant})
|
||||
});
|
||||
}).catch(function(){ showToast('保存失败', 'error'); });
|
||||
}
|
||||
renderWishes();
|
||||
saveWishOrder();
|
||||
@@ -766,7 +816,7 @@
|
||||
method: 'PUT',
|
||||
headers: {'Content-Type': 'application/json'},
|
||||
body: JSON.stringify({quadrant: q})
|
||||
});
|
||||
}).catch(function(){ showToast('保存失败', 'error'); });
|
||||
renderWishes();
|
||||
}
|
||||
});
|
||||
@@ -840,6 +890,8 @@
|
||||
btn.classList.toggle('active', editing);
|
||||
};
|
||||
|
||||
window.renderWishes = renderWishes;
|
||||
|
||||
/* ================================================================
|
||||
Init
|
||||
================================================================ */
|
||||
|
||||
@@ -615,9 +615,13 @@ body {
|
||||
.btn-del:hover { background: var(--danger-light); }
|
||||
.btn-del .icon-sm { width: 16px; height: 16px; }
|
||||
|
||||
/* 责善改过 横排双输入 */
|
||||
/* 责善改过 — 简洁分割线风格 */
|
||||
|
||||
.evening-row {
|
||||
position: relative;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 8px;
|
||||
padding: 0 0 12px;
|
||||
margin-bottom: 12px;
|
||||
border-bottom: 1px solid var(--border);
|
||||
@@ -626,42 +630,17 @@ body {
|
||||
.evening-row:last-child {
|
||||
border-bottom: none;
|
||||
margin-bottom: 0;
|
||||
padding-bottom: 0;
|
||||
}
|
||||
|
||||
.evening-header {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
margin-bottom: 8px;
|
||||
.evening-row .btn-del {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
right: 0;
|
||||
z-index: 1;
|
||||
}
|
||||
|
||||
.evening-header .idx {
|
||||
font-size: 12px;
|
||||
color: var(--text-muted);
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.mistake-row {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 8px;
|
||||
align-items: stretch;
|
||||
}
|
||||
|
||||
.mistake-row .col {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 4px;
|
||||
}
|
||||
|
||||
.mistake-row .col label {
|
||||
font-size: 11px;
|
||||
color: var(--text-muted);
|
||||
font-weight: 500;
|
||||
padding-left: 2px;
|
||||
}
|
||||
|
||||
.mistake-row input[type="text"] {
|
||||
.evening-row input[type="text"] {
|
||||
width: 100%;
|
||||
padding: 9px 12px;
|
||||
border: 1.5px solid var(--border);
|
||||
@@ -671,8 +650,10 @@ body {
|
||||
color: var(--text);
|
||||
background: var(--bg);
|
||||
transition: border-color 0.2s, background 0.2s;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
.mistake-row input[type="text"]:focus {
|
||||
|
||||
.evening-row input[type="text"]:focus {
|
||||
outline: none;
|
||||
border-color: var(--primary);
|
||||
background: var(--card);
|
||||
@@ -1211,6 +1192,47 @@ body {
|
||||
.wish-del { display: none; }
|
||||
.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 {
|
||||
font-size: 13px; color: var(--text-muted); text-align: center; padding: 32px 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user