v1.3.2 — 日历同步批量查询+弹窗结果展示

- /api/calendar-sync-all 批量查询过去15天~未来15天
- 弹窗展示：加载动画 → 统计摘要 → 按日期分组日程列表
- 自动填充今日日程到早间立志
- 批量查询约需10秒，首次查询后同步写入缓存

app.py

@@ -225,6 +225,106 @@ def api_reorder_wishes():
     return jsonify({'ok': True})
 
 
+# ── 日历同步 API ────────────────────────────
+
+CALENDAR_CACHE = os.path.join(os.path.expanduser('~'), '.workbuddy', 'data', 'ziwei-power', 'calendar_cache.json')
+DING_MCP_URL = 'https://mcp-gw.dingtalk.com/server/95959163f85d8b58a167f65cd8bd3d22690b16c75ebacd0fa095016396a10e0d?key=0993e4d4e44c50ea25a0db840cc5815e'
+
+
+def _fetch_dingtalk_events(date_str):
+    """调用钉钉 MCP 实时查询指定日期的日程"""
+    import json as _json, urllib.request as _ur
+    from datetime import datetime, timezone, timedelta
+    tz = timezone(timedelta(hours=8))
+    try:
+        d = datetime.strptime(date_str, '%Y-%m-%d').replace(tzinfo=tz)
+    except ValueError:
+        return []
+    start_ts = int(d.replace(hour=0, minute=0, second=0).timestamp() * 1000)
+    end_ts = int(d.replace(hour=23, minute=59, second=59).timestamp() * 1000)
+    body = _json.dumps({
+        'jsonrpc': '2.0', 'method': 'tools/call', 'id': 1,
+        'params': {'name': 'list_calendar_events', 'arguments': {
+            'calendarId': 'primary', 'startTime': start_ts, 'endTime': end_ts, 'limit': 20
+        }}
+    }).encode('utf-8')
+    req = _ur.Request(DING_MCP_URL, data=body, headers={
+        'Content-Type': 'application/json', 'Accept': 'application/json'
+    })
+    try:
+        with _ur.urlopen(req, timeout=10) as resp:
+            data = _json.loads(resp.read())
+        events = data.get('result', {}).get('structuredContent', {}).get('result', {}).get('events', [])
+    except Exception:
+        return None  # 网络错误返回 None，调用方回退缓存
+    results = []
+    for e in events:
+        summary = (e.get('summary') or '').strip()
+        if not summary:
+            continue
+        start = e.get('start', {}).get('dateTime', '')
+        end = e.get('end', {}).get('dateTime', '')
+        time_str = ''
+        if start and end:
+            time_str = start[11:16] + '-' + end[11:16]
+        results.append({
+            'date': date_str, 'summary': summary,
+            'time': time_str, 'location': e.get('location') or ''
+        })
+    # 写入缓存
+    try:
+        all_cached = []
+        try:
+            with open(CALENDAR_CACHE, 'r') as f:
+                all_cached = _json.load(f)
+        except (FileNotFoundError, _json.JSONDecodeError):
+            pass
+        # 替换同一天的旧缓存
+        all_cached = [c for c in all_cached if c.get('date') != date_str] + results
+        with open(CALENDAR_CACHE, 'w') as f:
+            _json.dump(all_cached, f, ensure_ascii=False, indent=2)
+    except Exception:
+        pass
+    return results
+
+
+@app.route('/api/calendar-sync', methods=['GET'])
+@login_required
+def api_calendar_sync():
+    import json as _json
+    date = request.args.get('date', '')
+    if not date:
+        return jsonify({'ok': False, 'error': '缺少 date 参数'}), 400
+    # 优先实时查询钉钉 MCP
+    events = _fetch_dingtalk_events(date)
+    if events is None:
+        # MCP 不可用，回退缓存
+        try:
+            with open(CALENDAR_CACHE, 'r') as f:
+                all_cached = _json.load(f)
+            events = [e for e in all_cached if e.get('date') == date]
+        except (FileNotFoundError, _json.JSONDecodeError):
+            events = []
+    return jsonify({'ok': True, 'data': events})
+
+
+@app.route('/api/calendar-sync-all', methods=['GET'])
+@login_required
+def api_calendar_sync_all():
+    """批量查询过去15天~未来15天的钉钉日程，按日期分组返回"""
+    import json as _json
+    from datetime import datetime, timedelta
+    today = datetime.now().replace(hour=0, minute=0, second=0, microsecond=0)
+    results = []
+    for delta in range(-15, 16):
+        d = today + timedelta(days=delta)
+        ds = d.strftime('%Y-%m-%d')
+        events = _fetch_dingtalk_events(ds)
+        if events:
+            results.append({'date': ds, 'events': events})
+    return jsonify({'ok': True, 'data': results})
+
+
 # ── 启动 ──────────────────────────────────────────────
 
 if __name__ == '__main__':

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) + '.';
-    }
   }
 
   /* ── 勤学预设项目 ── */
@@ -377,6 +362,97 @@
     }
   }
 
+  /* ── 日历同步 ── */
+
+  window.syncCalendar = function() {
+    var overlay = document.getElementById('sync-modal-overlay');
+    var loading = document.getElementById('sync-loading');
+    var resultsEl = document.getElementById('sync-results');
+    var summary = document.getElementById('sync-summary');
+    var list = document.getElementById('sync-list');
+    var btn = document.querySelector('.btn-cal-sync');
+    if (!overlay) return;
+
+    // 打开弹窗，显示加载中
+    overlay.style.display = 'flex';
+    loading.style.display = 'block';
+    resultsEl.style.display = 'none';
+    if (btn) { btn.style.opacity = '0.5'; btn.disabled = true; }
+
+    fetch('/api/calendar-sync-all')
+      .then(function(r){ return r.json(); })
+      .then(function(res){
+        loading.style.display = 'none';
+        resultsEl.style.display = 'block';
+        if (btn) { btn.style.opacity = '1'; btn.disabled = false; }
+        if (!res.ok) { summary.innerHTML = '<span style="color:var(--danger)">同步失败: ' + (res.error || '未知错误') + '</span>'; return; }
+        var data = res.data || [];
+        if (data.length === 0) {
+          summary.innerHTML = '未查询到任何日程';
+          return;
+        }
+        // 统计
+        var totalDays = data.length;
+        var totalEvents = 0;
+        data.forEach(function(d){ totalEvents += d.events.length; });
+        summary.innerHTML = '同步完成！共 <b>' + totalDays + '</b> 天有日程，合计 <b>' + totalEvents + '</b> 个会议';
+
+        // 渲染结果列表
+        var html = '';
+        data.forEach(function(day) {
+          html += '<div class="sync-day">';
+          html += '<div class="sync-day-header"><span>' + day.date + '</span></div>';
+          day.events.forEach(function(e) {
+            var timeStr = e.time ? ' (' + e.time + ')' : '';
+            html += '<div class="sync-event">' +
+              '<span class="sync-event-icon">📌</span>' +
+              '<span class="sync-event-text">' + esc(e.summary) + '<span class="sync-event-time">' + esc(timeStr) + '</span></span>' +
+            '</div>';
+          });
+          html += '</div>';
+        });
+        list.innerHTML = html;
+
+        // 自动填充今天到选中日期的日程
+        autoFillTodayEvents(data);
+      })
+      .catch(function(){
+        loading.style.display = 'none';
+        resultsEl.style.display = 'block';
+        summary.innerHTML = '<span style="color:var(--danger)">网络错误，请重试</span>';
+        if (btn) { btn.style.opacity = '1'; btn.disabled = false; }
+      });
+  };
+
+  function autoFillTodayEvents(data) {
+    var todayDate = document.getElementById('check-date').value;
+    var added = 0;
+    data.forEach(function(day) {
+      if (day.date !== todayDate) return;
+      day.events.forEach(function(e) {
+        var text = e.time ? '【' + e.time + '】' + e.summary : e.summary;
+        if (e.location) text += ' @' + e.location;
+        var existing = document.querySelectorAll('#morning-list input[type="text"]');
+        var already = false;
+        existing.forEach(function(inp){ if (inp.value.indexOf(e.summary) >= 0) already = true; });
+        if (already) return;
+        var count = document.querySelectorAll('#morning-list .item-row').length;
+        if (count >= 3) return;
+        addMorningRow(text);
+        added++;
+      });
+    });
+    if (added > 0) {
+      showToast('已自动填充 ' + added + ' 条今日日程', 'info');
+      triggerAutoSave();
+    }
+  }
+
+  window.closeSyncModal = function() {
+    var overlay = document.getElementById('sync-modal-overlay');
+    if (overlay) overlay.style.display = 'none';
+  };
+
   window.addMorning = function() {
     var count = document.querySelectorAll('#morning-list .item-row').length;
     if (count >= 3) { showToast('最多 3 条立志', 'error'); return; }
@@ -644,10 +720,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 +755,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];
@@ -711,7 +796,7 @@
     el.classList.add('editing');
     var deadline = w.deadline || '';
     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('');
     el.innerHTML =
       '<div class="wish-edit-form">' +
@@ -794,7 +879,7 @@
               method: 'PUT',
               headers: {'Content-Type': 'application/json'},
               body: JSON.stringify({quadrant: targetQuadrant})
-            });
+            }).catch(function(){ showToast('保存失败', 'error'); });
           }
           renderWishes();
           saveWishOrder();
@@ -822,7 +907,7 @@
             method: 'PUT',
             headers: {'Content-Type': 'application/json'},
             body: JSON.stringify({quadrant: q})
-          });
+          }).catch(function(){ showToast('保存失败', 'error'); });
           renderWishes();
         }
       });

static/style.css

@@ -535,6 +535,26 @@ body {
   color: var(--primary);
 }
 
+/* 日历同步按钮 */
+.btn-cal-sync {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 28px;
+  height: 28px;
+  border: none;
+  background: transparent;
+  color: var(--text-muted);
+  border-radius: 6px;
+  cursor: pointer;
+  transition: all 0.2s;
+  flex-shrink: 0;
+}
+.btn-cal-sync:hover {
+  background: var(--success-light);
+  color: var(--success);
+}
+
 /* 编辑模式下才显示的元素 */
 .edit-only { display: none; }
 .card.editing .edit-only { display: flex; }
@@ -615,9 +635,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 +650,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 +670,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);
@@ -1080,6 +1081,124 @@ body {
 .toast.error   { background: var(--danger);   color: #FFF; }
 .toast.info    { background: var(--primary);  color: #FFF; }
 
+/* ═══════════════════════════════════════════
+   Sync Modal
+   ═══════════════════════════════════════════ */
+
+.sync-modal-overlay {
+  position: fixed;
+  inset: 0;
+  background: rgba(0,0,0,0.4);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 9998;
+  backdrop-filter: blur(2px);
+}
+.sync-modal {
+  background: var(--card);
+  border-radius: var(--radius);
+  width: 90%;
+  max-width: 560px;
+  max-height: 80vh;
+  display: flex;
+  flex-direction: column;
+  box-shadow: 0 8px 40px rgba(0,0,0,0.15);
+  overflow: hidden;
+}
+.sync-modal-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 16px 20px;
+  border-bottom: 1px solid var(--border);
+  flex-shrink: 0;
+}
+.sync-modal-header h3 {
+  font-size: 16px;
+  font-weight: 700;
+  margin: 0;
+}
+.sync-modal-close {
+  background: none;
+  border: none;
+  font-size: 22px;
+  color: var(--text-muted);
+  cursor: pointer;
+  padding: 0 4px;
+  line-height: 1;
+}
+.sync-modal-loading {
+  padding: 40px 20px;
+  text-align: center;
+  color: var(--text-dim);
+  font-size: 14px;
+}
+.sync-spinner {
+  width: 36px;
+  height: 36px;
+  border: 3px solid var(--border);
+  border-top-color: var(--primary);
+  border-radius: 50%;
+  animation: spin 0.8s linear infinite;
+  margin: 0 auto 14px;
+}
+@keyframes spin { to { transform: rotate(360deg); } }
+.sync-modal-results {
+  padding: 16px 20px;
+  overflow-y: auto;
+  flex: 1;
+}
+.sync-summary {
+  font-size: 14px;
+  color: var(--text);
+  margin-bottom: 14px;
+  padding: 10px 14px;
+  background: var(--primary-light);
+  border-radius: var(--radius-sm);
+}
+.sync-list {
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+}
+.sync-day {
+  border: 1px solid var(--border);
+  border-radius: var(--radius-sm);
+  overflow: hidden;
+}
+.sync-day-header {
+  background: var(--bg);
+  padding: 6px 12px;
+  font-size: 12px;
+  font-weight: 600;
+  color: var(--text-dim);
+  border-bottom: 1px solid var(--border);
+}
+.sync-event {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  padding: 8px 12px;
+  font-size: 13px;
+  color: var(--text);
+}
+.sync-event + .sync-event { border-top: 1px solid var(--bg); }
+.sync-event-icon { flex-shrink: 0; }
+.sync-event-text { flex: 1; }
+.sync-event-time { font-size: 11px; color: var(--text-muted); margin-left: 6px; }
+.sync-modal-footer {
+  padding: 12px 20px;
+  border-top: 1px solid var(--border);
+  display: flex;
+  justify-content: flex-end;
+  flex-shrink: 0;
+}
+.sync-modal-footer .btn-wish-save {
+  width: auto;
+  padding: 8px 24px;
+}
+
 /* ═══════════════════════════════════════════
    Wishes — 四象限
    ═══════════════════════════════════════════ */

templates/index.html

@@ -13,6 +13,27 @@
 
 <div id="toast" class="toast"></div>
 
+<!-- 日历同步弹窗 -->
+<div class="sync-modal-overlay" id="sync-modal-overlay" style="display:none">
+  <div class="sync-modal">
+    <div class="sync-modal-header">
+      <h3>📅 日历同步</h3>
+      <button class="sync-modal-close" onclick="closeSyncModal()">&times;</button>
+    </div>
+    <div class="sync-modal-loading" id="sync-loading">
+      <div class="sync-spinner"></div>
+      <p>正在从钉钉同步过去15天~未来15天日程…</p>
+    </div>
+    <div class="sync-modal-results" id="sync-results" style="display:none">
+      <div class="sync-summary" id="sync-summary"></div>
+      <div class="sync-list" id="sync-list"></div>
+    </div>
+    <div class="sync-modal-footer">
+      <button class="btn-wish-save" onclick="closeSyncModal()">关闭</button>
+    </div>
+  </div>
+</div>
+
 <div class="app-layout">
 
   <!-- ═══ 左侧边栏 ═══ -->
@@ -113,6 +134,9 @@
               <svg class="icon-h2"><use href="#icon-sun"/></svg>
               <h3>早间立志</h3>
             </div>
+            <button class="btn-cal-sync" onclick="syncCalendar()" title="同步钉钉日历">
+              <svg class="icon-sm"><use href="#icon-calendar"/></svg>
+            </button>
             <button class="btn-edit-toggle" onclick="toggleEditMode(this)" title="编辑">
               <svg class="icon-sm"><use href="#icon-pencil"/></svg>
             </button>