v2.1.15 — 勤学打卡支持增加和删除习惯

v2.1.14 — 勤学打卡改为3×3网格卡片布局
v2.1.13 — 本周重点+责善改过去掉编辑模式，默认显示增加一条
2026-07-27 09:14:31 +08:00 · 2026-07-27 09:13:21 +08:00 · 2026-07-27 09:07:45 +08:00 · 2026-07-27 08:56:47 +08:00 · 2026-07-27 08:53:48 +08:00 · 2026-07-27 08:47:49 +08:00
4 changed files with 209 additions and 87 deletions
--- a/app.py
+++ b/app.py
@@ -136,8 +136,7 @@ def compute_stats():
                    pillar = classify_auto(name)
                all_study_items.append({
                    'name': name.strip(),
-                    'done': si.get('done', False) if isinstance(si, dict) else False,
-                    'note': si.get('note', '') if isinstance(si, dict) else '',
+                    'count': si.get('count', 0) if isinstance(si, dict) else 0,
                    'pillar': pillar
                })

@@ -149,7 +148,7 @@ def compute_stats():
            isinstance(x, str) and x.strip() or
            isinstance(x, dict) and (x.get('mistake', '') or '').strip()
        ))
-        study_count = sum(1 for x in study if x.get('done'))
+        study_count = sum(1 for x in study if x.get('count', 0) > 0)

        total_morning += morning_count
        total_evening += evening_count
--- a/static/app.js
+++ b/static/app.js
@@ -169,29 +169,35 @@
      weeks.push(fmtWeek(monday));
      monday.setDate(monday.getDate() + 7);
    }
-    // 确保至少有4周显示
-    while (weeks.length < 4) {
-      var w = fmtWeek(monday);
-      if (weeks.indexOf(w) < 0) weeks.push(w);
-      monday.setDate(monday.getDate() + 7);
-    }

    var todayWk = fmtWeek(new Date());
+    var today = new Date();
    var wHtml = '';
    for (var i2 = 0; i2 < weeks.length; i2++) {
      var w = weeks[i2];
-      var cls = 'cal-week-cell';
+      var cls = 'cal-week-row';
      var status = calendarStatus[w];
-      if (status) cls += ' ' + status;
      if (w === todayWk) cls += ' today';
      if (w === selectedWeek) cls += ' selected';
-      wHtml += '<div class="' + cls + '" data-week="' + w + '" title="' + w + '">' +
-        '第' + w.split('-W')[1].replace(/^0/, '') + '周</div>';
+      // 计算日期范围
+      var monday = new Date(calYear, calMonth, 1);
+      while (fmtWeek(monday) !== w) monday.setDate(monday.getDate() + 7);
+      var sunday = new Date(monday);
+      sunday.setDate(sunday.getDate() + 6);
+      var dateRange = (monday.getMonth()+1) + '.' + monday.getDate() + ' - ' + sunday.getDate();
+      var statusLabel = status === 'pass' ? '达标' : (status === 'fail' ? '未达标' : '未打卡');
+      wHtml += '<div class="' + cls + '" data-week="' + w + '">' +
+        '<div class="cal-wk-info">' +
+          '<span class="cal-wk-label">第' + w.split('-W')[1].replace(/^0/, '') + '周</span>' +
+          '<span class="cal-wk-date">' + dateRange + '</span>' +
+        '</div>' +
+        '<span class="cal-wk-badge">' + statusLabel + '</span>' +
+      '</div>';
    }
    var we = document.getElementById('cal-weeks');
    we.innerHTML = wHtml;
-    we.querySelectorAll('.cal-week-cell').forEach(function(cell) {
-      cell.addEventListener('click', function() {
+    we.querySelectorAll('.cal-week-row').forEach(function(row) {
+      row.addEventListener('click', function() {
        var wk = this.dataset.week;
        if (wk) navigateToWeek(wk);
      });
@@ -251,17 +257,13 @@
    }

    var studyItems = [];
-    var pItems = document.querySelectorAll('#study-list .preset-item');
-    for (var k=0; k<pItems.length; k++) {
-      var cb = pItems[k].querySelector('input[type="checkbox"]');
-      var noteEl = pItems[k].querySelector('.preset-note');
-      var nameEl = pItems[k].querySelector('.preset-name');
-      var name = nameEl ? nameEl.textContent : '';
-      if (cb && cb.checked) {
-        studyItems.push({ name: name, done: true, note: noteEl ? noteEl.value.trim() : '' });
-      } else {
-        studyItems.push({ name: name, done: false, note: '' });
-      }
+    var sCards = document.querySelectorAll('#study-cards .study-card');
+    for (var k=0; k<sCards.length; k++) {
+      var nameEl = sCards[k].querySelector('.study-card-name');
+      var countEl = sCards[k].querySelector('.study-card-count');
+      var name = nameEl ? nameEl.textContent.trim() : '';
+      var count = parseInt(countEl ? countEl.textContent : '0') || 0;
+      studyItems.push({ name: name, count: count, last_checkin_date: sCards[k].dataset.lastDate || '' });
    }

    return { morning: morningItems, evening: eveningItems, study: studyItems };
@@ -289,16 +291,25 @@
      addEveningRow(item.mistake || '', item.improvement || '');
    }

-    // 勤学 — 渲染预设项目并回填状态
+    // 勤学 — 渲染已保存习惯 + 未渲染预设
    var studyMap = {};
    for (var si=0; si<study.length; si++) {
      studyMap[study[si].name] = study[si];
    }
-    document.getElementById('study-list').innerHTML = '';
+    var rendered = {};
+    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++) {
      var sName = PRESET_STUDY_ITEMS[sp];
-      var saved = studyMap[sName] || { done: false, note: '' };
-      addPresetItem(sName, saved.done, saved.note || '');
+      if (!rendered[sName]) {
+        renderStudyCard(sName, 0, '');
+      }
    }
  }

@@ -341,35 +352,60 @@
    container.appendChild(div);
  }

-  /* ── 勤学预设项目 ── */
+  /* ── 勤学打卡卡片 ── */

-  function addPresetItem(name, done, note) {
-    var container = document.getElementById('study-list');
+  function renderStudyCard(name, count, lastDate) {
+    var container = document.getElementById('study-cards');
+    var today = fmtDate(new Date());
+    var checked = count > 0;
+    var checkedToday = lastDate === today;
+    var btnText = checkedToday ? '已打卡' : '打卡';
    var div = document.createElement('div');
-    div.className = 'preset-item' + (done ? ' active' : '');
-    var noteEsc = esc(note || '');
+    div.className = 'study-card' + (checked ? ' checked' : '');
+    div.setAttribute('data-last-date', lastDate || '');
    div.innerHTML =
-      '<label class="preset-check">' +
-        '<input type="checkbox"' + (done ? ' checked' : '') + ' onchange="togglePresetNote(this)">' +
-        '<span class="preset-name">' + esc(name) + '</span>' +
-      '</label>' +
-      '<textarea class="preset-note" placeholder="一句话备注…">' + noteEsc + '</textarea>';
+      '<button class="study-card-del" onclick="deleteStudyItem(this)" title="删除">×</button>' +
+      '<div class="study-card-info">' +
+        '<span class="study-card-name">' + esc(name) + '</span>' +
+        '<span class="study-card-count">' + count + '</span>' +
+      '</div>' +
+      '<button class="study-card-btn' + (checkedToday ? ' done' : '') + '" onclick="checkinStudy(this)">' + btnText + '</button>';
    container.appendChild(div);
  }

-  window.togglePresetNote = function(cb) {
-    var item = cb.closest('.preset-item');
-    if (item) {
-      if (cb.checked) item.classList.add('active');
-      else { item.classList.remove('active'); item.querySelector('.preset-note').value = ''; }
-    }
+  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) {
+    var card = btn.closest('.study-card');
+    var today = fmtDate(new Date());
+    if (card.dataset.lastDate === today) { showToast('今天已打卡', 'info'); return; }
+    var countEl = card.querySelector('.study-card-count');
+    var count = parseInt(countEl.textContent) + 1;
+    countEl.textContent = count;
+    card.dataset.lastDate = today;
+    card.classList.add('checked');
+    btn.classList.add('done');
+    btn.textContent = '已打卡';
    triggerAutoSave();
  };

  function initStudyPresets() {
-    document.getElementById('study-list').innerHTML = '';
+    document.getElementById('study-cards').innerHTML = '';
    for (var i=0; i<PRESET_STUDY_ITEMS.length; i++) {
-      addPresetItem(PRESET_STUDY_ITEMS[i], false, '');
+      renderStudyCard(PRESET_STUDY_ITEMS[i], 0, '');
    }
  }

@@ -441,8 +477,6 @@
  };

  window.addMorning = function() {
-    var count = document.querySelectorAll('#morning-list .item-row').length;
-    if (count >= 3) { showToast('最多 3 条立志', 'error'); return; }
    addMorningRow('');
  };
  window.addEvening = function() {
@@ -469,6 +503,17 @@
    if (card) card.classList.add('active');
  };

+  /* 头像菜单 */
+  window.toggleUserMenu = function(e) {
+    e.stopPropagation();
+    var dd = document.getElementById('user-dropdown');
+    if (dd) dd.style.display = dd.style.display === 'none' ? 'block' : 'none';
+  };
+  document.addEventListener('click', function() {
+    var dd = document.getElementById('user-dropdown');
+    if (dd) dd.style.display = 'none';
+  });
+
  /* ================================================================
     Load & Auto Save Checkin
     ================================================================ */
@@ -482,7 +527,7 @@
    if (lastSavedWeek && lastSavedData !== null && currentStr !== lastSavedData) {
      var hasContent = currentData.morning.some(function(x){return x && x.trim();}) ||
                       currentData.evening.some(function(x){return (x.mistake||'').trim() || (x.improvement||'').trim();}) ||
-                       currentData.study.some(function(x){return x.done;});
+                       currentData.study.some(function(x){return x.count > 0;});
      if (hasContent) {
        apiSaveCheckin(lastSavedWeek, currentData, function(){});
      }
@@ -1002,7 +1047,7 @@
        (info.evening_items || []).forEach(function(ei){ items.push({pillar: p, text: ei.mistake || ei.improvement, improvement: ei.improvement, type: 'evening'}); });
      }
      if (blueprintFilter === 'all' || blueprintFilter === 'study') {
-        (info.study_items || []).forEach(function(si){ items.push({pillar: p, text: si.name, type: 'study', done: si.done, note: si.note}); });
+        (info.study_items || []).forEach(function(si){ items.push({pillar: p, text: si.name, type: 'study', count: si.count}); });
      }
    });
    if (items.length === 0) {
@@ -1020,7 +1065,7 @@
    items.forEach(function(item){
      var dot = '<span class="bp-pillar-dot" style="background:' + (pillarColors[item.pillar.name] || '#94A3B8') + '"></span>';
      var extra = '';
-      if (item.type === 'study' && item.note) extra = '<span class="bp-item-note">' + esc(item.note) + '</span>';
+      if (item.type === 'study' && item.count > 0) extra = '<span class="bp-item-note">打卡 ' + item.count + ' 次</span>';
      if (item.type === 'evening' && item.improvement) extra = '<span class="bp-item-note evening">→ ' + esc(item.improvement) + '</span>';
      html += '<div class="bp-list-item">' +
        dot +
--- a/static/style.css
+++ b/static/style.css
@@ -71,6 +71,41 @@ body {
  gap: 8px;
  padding: 24px 12px 16px;
  position: relative;
+  cursor: pointer;
+}
+
+.sidebar-user .user-avatar {
+  transition: transform 0.15s;
+}
+.sidebar-user:hover .user-avatar { transform: scale(1.05); }
+
+.user-dropdown {
+  position: absolute;
+  top: 100%;
+  left: 50%;
+  transform: translateX(-50%);
+  background: var(--card);
+  border: 1px solid var(--border);
+  border-radius: var(--radius-sm);
+  box-shadow: var(--shadow-hover);
+  z-index: 100;
+  min-width: 120px;
+  padding: 4px;
+}
+.user-dropdown-item {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  padding: 8px 12px;
+  font-size: 13px;
+  color: var(--text-dim);
+  text-decoration: none;
+  border-radius: 6px;
+  transition: all 0.15s;
+}
+.user-dropdown-item:hover {
+  background: var(--danger-light);
+  color: var(--danger);
 }

 .sidebar-user .user-name {
@@ -257,36 +292,60 @@ body {
  color: var(--text);
 }

-/* 周选择 */
-.cal-weeks {
-  display: grid;
-  grid-template-columns: repeat(2, 1fr);
-  gap: 8px;
+/* 周列表行 */
+.cal-week-rows {
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
  padding: 8px 14px 10px;
 }
-.cal-week-cell {
-  height: 42px;
+.cal-week-row {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  padding: 8px 10px;
+  border: 0.5px solid var(--border);
+  border-radius: 8px;
+  background: var(--card);
+  cursor: pointer;
+  transition: all 0.15s;
+}
+.cal-week-row:hover { border-color: var(--primary); }
+.cal-week-row.today { border-color: var(--primary); }
+.cal-week-row.selected { background: var(--primary); color: #FFF; border-color: transparent; }
+.cal-week-row.selected .cal-wk-label,
+.cal-week-row.selected .cal-wk-date,
+.cal-week-row.selected .cal-wk-badge { color: #FFF; }
+.cal-week-row.selected .cal-wk-status { background: rgba(255,255,255,0.2); color: #FFF; }
+
+.cal-wk-status {
+  width: 28px;
+  height: 28px;
+  border-radius: 50%;
  display: flex;
  align-items: center;
  justify-content: center;
-  font-size: 13px;
+  font-size: 12px;
  font-weight: 600;
-  border-radius: 8px;
-  color: var(--text-dim);
-  cursor: pointer;
-  transition: all 0.15s;
-  border: 1.5px solid var(--border);
-  background: var(--card);
+  flex-shrink: 0;
 }
-.cal-week-cell:hover { border-color: var(--primary); color: var(--primary); }
-.cal-week-cell.pass { background: var(--success-light); border-color: var(--success); color: var(--success); }
-.cal-week-cell.fail { background: var(--danger-light); border-color: var(--danger); color: var(--danger); }
-.cal-week-cell.today { border-color: var(--primary); box-shadow: 0 0 0 2px var(--primary-light); }
-.cal-week-cell.selected { background: var(--primary); color: #FFF; border-color: var(--primary); }
+.cal-wk-status.pass { background: var(--success-light); color: var(--success); }
+.cal-wk-status.fail { background: var(--danger-light); color: var(--danger); }
+.cal-wk-status.empty { background: var(--bg); color: var(--text-muted); }

-/* 旧样式清理 */
-.cal-week-list { display: none; }
-.cal-week-cell .wk-num, .cal-week-cell .wk-dot { display: none; }
+.cal-wk-info {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  gap: 1px;
+}
+.cal-wk-label { font-size: 12px; font-weight: 600; color: var(--text); }
+.cal-wk-date { font-size: 10px; color: var(--text-muted); }
+.cal-wk-badge { font-size: 10px; color: var(--text-muted); }
+
+/* 旧样式隐藏 */
+.cal-weeks { display: none; }
+.cal-week-cell { display: none; }

 .cal-header {
  display: flex;
@@ -773,9 +832,8 @@ body {
 }

 /* 编辑模式下才显示的元素 */
-.edit-only { display: none; }
-.card.editing .edit-only { display: flex; }
-.card.editing .btn-del { display: inline-flex; }
+.edit-only { display: flex; }
+.btn-edit-toggle { display: none; }

 /* 默认隐藏删除按钮 */
 .btn-del { display: none; }
@@ -1724,3 +1782,18 @@ body {
@media (max-width: 900px) {
  .quad-grid { grid-template-columns: 1fr; grid-template-rows: auto; }
 }
+
+/* 勤学打卡卡片 - 3×3网格 */
+#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-info { display:flex; flex-direction:column; align-items:center; gap:4px; }
+.study-card-name { font-size:12px; color:var(--text); font-weight:500; line-height:1.3; }
+.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-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.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; }
--- a/templates/index.html
+++ b/templates/index.html
@@ -40,12 +40,14 @@
  <aside class="sidebar">

    <!-- 用户信息 -->
-    <div class="sidebar-user">
+    <div class="sidebar-user" id="sidebar-user-menu" onclick="toggleUserMenu(event)">
      <div class="user-avatar">{{ username[0] }}</div>
      <span class="user-name">{{ username }}</span>
-      <a href="/logout" class="btn-logout-icon" title="退出登录" onclick="return confirm('确定退出登录？')">
-        <svg class="icon-sm"><use href="#icon-logout"/></svg>
-      </a>
+      <div class="user-dropdown" id="user-dropdown" style="display:none">
+        <a class="user-dropdown-item" href="/logout" onclick="return confirm('确定退出登录？')">
+          <svg class="icon-sm"><use href="#icon-logout"/></svg> 退出登录
+        </a>
+      </div>
    </div>

    <!-- 功能入口 -->
@@ -123,14 +125,14 @@
                <svg class="icon-sm"><use href="#icon-chevron-right"/></svg>
              </button>
            </div>
-            <div class="cal-weeks" id="cal-weeks"></div>
+            <div class="cal-week-rows" id="cal-weeks"></div>
          </div>
        </div>
        <!-- 右侧：Tab + 内容 -->
        <div class="daily-main">
          <div class="daily-tabs">
            <button class="daily-tab active" data-tab="morning" onclick="switchDailyTab(this)">
-              <svg class="icon-sm"><use href="#icon-sun"/></svg> 早间立志
+              <svg class="icon-sm"><use href="#icon-sun"/></svg> 本周重点
            </button>
            <button class="daily-tab" data-tab="evening" onclick="switchDailyTab(this)">
              <svg class="icon-sm"><use href="#icon-magnifying-glass"/></svg> 责善改过
@@ -144,13 +146,13 @@
          <div class="card-head">
            <div class="card-head-left">
              <svg class="icon-h2"><use href="#icon-sun"/></svg>
-              <h3>早间立志</h3>
+              <h3>本周重点</h3>
            </div>
            <button class="btn-edit-toggle" onclick="toggleEditMode(this)" title="编辑">
              <svg class="icon-sm"><use href="#icon-pencil"/></svg>
            </button>
          </div>
-          <p class="card-desc">本周最重要的 1~3 件事</p>
+          <p class="card-desc">本周最重要的事</p>
          <div id="morning-list"></div>
          <button class="btn-add edit-only" onclick="addMorning()">
            <svg class="icon-sm"><use href="#icon-plus"/></svg> 增加一条
@@ -178,7 +180,10 @@
            <h3>勤学打卡</h3>
          </div>
          <p class="card-desc">本周修行清单</p>
-          <div id="study-list"></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><!-- /daily-main -->
Author	SHA1	Message	Date
mac	8188364813	v2.1.15 — 勤学打卡支持增加和删除习惯	2026-07-27 09:14:31 +08:00
mac	b50d8e17e2	v2.1.14 — 勤学打卡改为3×3网格卡片布局	2026-07-27 09:13:21 +08:00
mac	c70aeff2ed	v2.1.13 — 本周重点+责善改过去掉编辑模式，默认显示增加一条	2026-07-27 09:07:45 +08:00
mac	f63ab8b8ea	v2.1.12 — 勤学打卡每天最多一次，已打卡按钮禁用	2026-07-27 08:56:47 +08:00
mac	b48e95c800	v2.1.11 — 本周重点去3条限制 + 勤学改为卡片打卡按钮	2026-07-27 08:53:48 +08:00
mac	bf1be1aa9f	v2.1.10 — 移除周列表强制4周填充逻辑，避免跨月虚周	2026-07-27 08:47:49 +08:00
mac	083935f2da	v2.1.9 — 早间立志改为本周重点	2026-07-27 08:43:07 +08:00
mac	e6ae7f2eb4	v2.1.8 — 周列表移除圆形状态icon，只保留文字标签	2026-07-27 08:35:19 +08:00
mac	24561e1f59	v2.1.7 — 修复周列表点击事件变量名错误	2026-07-24 17:43:23 +08:00
mac	9fad18733e	v2.1.6 — 日历改为周列表式：每行显示周号+日期范围+状态	2026-07-24 17:42:15 +08:00
mac	5e97f6d6d8	v2.1.5 — 退出改为点击头像弹出下拉菜单	2026-07-24 17:39:40 +08:00