Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8188364813 | ||
|
|
b50d8e17e2 | ||
|
|
c70aeff2ed |
@@ -291,16 +291,25 @@
|
|||||||
addEveningRow(item.mistake || '', item.improvement || '');
|
addEveningRow(item.mistake || '', item.improvement || '');
|
||||||
}
|
}
|
||||||
|
|
||||||
// 勤学 — 渲染预设项目并回填状态
|
// 勤学 — 渲染已保存习惯 + 未渲染预设
|
||||||
var studyMap = {};
|
var studyMap = {};
|
||||||
for (var si=0; si<study.length; si++) {
|
for (var si=0; si<study.length; si++) {
|
||||||
studyMap[study[si].name] = study[si];
|
studyMap[study[si].name] = study[si];
|
||||||
}
|
}
|
||||||
|
var rendered = {};
|
||||||
document.getElementById('study-cards').innerHTML = '';
|
document.getElementById('study-cards').innerHTML = '';
|
||||||
|
for (var sk=0; sk<study.length; sk++) {
|
||||||
|
var item = study[sk];
|
||||||
|
if (item.name) {
|
||||||
|
renderStudyCard(item.name, item.count || 0, item.last_checkin_date || '');
|
||||||
|
rendered[item.name] = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
for (var sp=0; sp<PRESET_STUDY_ITEMS.length; sp++) {
|
for (var sp=0; sp<PRESET_STUDY_ITEMS.length; sp++) {
|
||||||
var sName = PRESET_STUDY_ITEMS[sp];
|
var sName = PRESET_STUDY_ITEMS[sp];
|
||||||
var saved = studyMap[sName] || { count: 0 };
|
if (!rendered[sName]) {
|
||||||
renderStudyCard(sName, saved.count || 0, saved.last_checkin_date || '');
|
renderStudyCard(sName, 0, '');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -355,6 +364,7 @@
|
|||||||
div.className = 'study-card' + (checked ? ' checked' : '');
|
div.className = 'study-card' + (checked ? ' checked' : '');
|
||||||
div.setAttribute('data-last-date', lastDate || '');
|
div.setAttribute('data-last-date', lastDate || '');
|
||||||
div.innerHTML =
|
div.innerHTML =
|
||||||
|
'<button class="study-card-del" onclick="deleteStudyItem(this)" title="删除">×</button>' +
|
||||||
'<div class="study-card-info">' +
|
'<div class="study-card-info">' +
|
||||||
'<span class="study-card-name">' + esc(name) + '</span>' +
|
'<span class="study-card-name">' + esc(name) + '</span>' +
|
||||||
'<span class="study-card-count">' + count + '</span>' +
|
'<span class="study-card-count">' + count + '</span>' +
|
||||||
@@ -363,6 +373,21 @@
|
|||||||
container.appendChild(div);
|
container.appendChild(div);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
window.addStudyItem = function() {
|
||||||
|
var name = prompt('请输入新习惯名称:');
|
||||||
|
if (!name || !name.trim()) return;
|
||||||
|
renderStudyCard(name.trim(), 0, '');
|
||||||
|
triggerAutoSave();
|
||||||
|
};
|
||||||
|
|
||||||
|
window.deleteStudyItem = function(btn) {
|
||||||
|
var card = btn.closest('.study-card');
|
||||||
|
var nameEl = card.querySelector('.study-card-name');
|
||||||
|
if (nameEl && !confirm('确定删除「' + nameEl.textContent + '」?')) return;
|
||||||
|
card.remove();
|
||||||
|
triggerAutoSave();
|
||||||
|
};
|
||||||
|
|
||||||
window.checkinStudy = function(btn) {
|
window.checkinStudy = function(btn) {
|
||||||
var card = btn.closest('.study-card');
|
var card = btn.closest('.study-card');
|
||||||
var today = fmtDate(new Date());
|
var today = fmtDate(new Date());
|
||||||
|
|||||||
@@ -832,9 +832,8 @@ body {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* 编辑模式下才显示的元素 */
|
/* 编辑模式下才显示的元素 */
|
||||||
.edit-only { display: none; }
|
.edit-only { display: flex; }
|
||||||
.card.editing .edit-only { display: flex; }
|
.btn-edit-toggle { display: none; }
|
||||||
.card.editing .btn-del { display: inline-flex; }
|
|
||||||
|
|
||||||
/* 默认隐藏删除按钮 */
|
/* 默认隐藏删除按钮 */
|
||||||
.btn-del { display: none; }
|
.btn-del { display: none; }
|
||||||
@@ -1784,13 +1783,17 @@ body {
|
|||||||
.quad-grid { grid-template-columns: 1fr; grid-template-rows: auto; }
|
.quad-grid { grid-template-columns: 1fr; grid-template-rows: auto; }
|
||||||
}
|
}
|
||||||
|
|
||||||
/* 勤学打卡卡片 */
|
/* 勤学打卡卡片 - 3×3网格 */
|
||||||
.study-card { display:flex; align-items:center; gap:12px; padding:10px 14px; border:1px solid var(--border); border-radius:var(--radius-sm); background:var(--card); margin-bottom:8px; transition:all 0.15s; }
|
#study-cards { display: grid; grid-template-columns: repeat(3, 1fr); gap: 10px; }
|
||||||
|
.study-card { display:flex; flex-direction:column; align-items:center; gap:8px; padding:14px 10px; border:1px solid var(--border); border-radius:var(--radius-sm); background:var(--card); transition:all 0.15s; text-align:center; }
|
||||||
.study-card.checked { border-color:var(--success); background:var(--success-light); }
|
.study-card.checked { border-color:var(--success); background:var(--success-light); }
|
||||||
.study-card-info { flex:1; display:flex; align-items:center; justify-content:space-between; gap:8px; }
|
.study-card-info { display:flex; flex-direction:column; align-items:center; gap:4px; }
|
||||||
.study-card-name { font-size:13px; color:var(--text); font-weight:500; }
|
.study-card-name { font-size:12px; color:var(--text); font-weight:500; line-height:1.3; }
|
||||||
.study-card-count { font-size:12px; color:var(--text-muted); font-weight:600; background:var(--bg); border-radius:50%; width:24px; height:24px; display:flex; align-items:center; justify-content:center; }
|
.study-card-count { font-size:18px; color:var(--text-muted); font-weight:700; background:var(--bg); border-radius:50%; width:32px; height:32px; display:flex; align-items:center; justify-content:center; }
|
||||||
.study-card.checked .study-card-count { background:var(--success); color:#FFF; }
|
.study-card.checked .study-card-count { background:var(--success); color:#FFF; }
|
||||||
.study-card-btn { padding:6px 14px; border:1px solid var(--primary); border-radius:var(--radius-sm); background:transparent; color:var(--primary); font-size:12px; font-weight:500; cursor:pointer; transition:all 0.15s; font-family:inherit; white-space:nowrap; }
|
.study-card-btn { padding:5px 12px; border:1px solid var(--primary); border-radius:var(--radius-sm); background:transparent; color:var(--primary); font-size:12px; font-weight:500; cursor:pointer; transition:all 0.15s; font-family:inherit; }
|
||||||
.study-card-btn:hover { background:var(--primary); color:#FFF; }
|
.study-card-btn:hover { background:var(--primary); color:#FFF; }
|
||||||
.study-card-btn.done { background:var(--success-light); color:var(--success); border-color:var(--success); cursor:default; }
|
.study-card-btn.done { background:var(--success-light); color:var(--success); border-color:var(--success); cursor:default; }
|
||||||
|
.study-card-del { position:absolute; top:4px; right:4px; border:none; background:none; color:var(--text-muted); cursor:pointer; font-size:14px; padding:2px 6px; border-radius:4px; line-height:1; }
|
||||||
|
.study-card-del:hover { background:var(--danger-light); color:var(--danger); }
|
||||||
|
.study-card { position:relative; }
|
||||||
|
|||||||
@@ -181,6 +181,9 @@
|
|||||||
</div>
|
</div>
|
||||||
<p class="card-desc">本周修行清单</p>
|
<p class="card-desc">本周修行清单</p>
|
||||||
<div id="study-cards"></div>
|
<div id="study-cards"></div>
|
||||||
|
<button class="btn-add" onclick="addStudyItem()" style="margin-top:10px">
|
||||||
|
<svg class="icon-sm"><use href="#icon-plus"/></svg> 增加习惯
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div><!-- /daily-main -->
|
</div><!-- /daily-main -->
|
||||||
|
|||||||
Reference in New Issue
Block a user