v1.5.3 — 日历同步按日期自动填充

- 后端 api_calendar_sync_all 查询后自动去重保存到各日期 checkin
- 不再只填充当前选中的日期
- 弹窗显示已填充天数

app.py

@@ -77,7 +77,30 @@ def compute_stats():
     total_evening = 0
     total_study = 0
     calendar = {}
-    all_morning_items = []  # 收集所有立志项用于蓝图统计
+    all_morning_items = []
+    all_evening_items = []
+    all_study_items = []
+
+    # 关键词 → 板块 自动归类规则
+    PILLAR_KEYWORDS = {
+        '医药营销': ['科普','科研','学术会议','学术','会议','患者管理','临床推广','临床','药企','处方','KOL','代表','拜访','荣昌','恒瑞','信达','鲁银','OPC','项目','标杆','客户'],
+        '医疗服务': ['诊疗','治疗','医生','医院','科室','手术','门诊','患者','病','护理','诊断','影像','检验'],
+        '医疗支付': ['医保','商保','理赔','支付','保险','费用','报销','商业保险','保单'],
+        'AI 智能': ['AI','数字人','智能','算法','自动化','平台','系统','网站','开发','代码','程序','模型'],
+        '公司治理': ['团队','组织','管理','招聘','HR','制度','流程','财务','考核','KPI','规划','人才','架构','预算'],
+        '个人修养': ['早起','睡觉','俯卧撑','运动','冥想','阅读','复盘','写作','习惯','修身','立志','责善','改过','勤学'],
+    }
+
+    def classify_auto(text):
+        """根据文本内容自动归类"""
+        if not text or not text.strip():
+            return ''
+        text_lower = text.strip()
+        for pillar, keywords in PILLAR_KEYWORDS.items():
+            for kw in keywords:
+                if kw in text_lower:
+                    return pillar
+        return ''  # 未匹配
 
     for row in rows:
         d = row['date']
@@ -86,12 +109,37 @@ def compute_stats():
         evening = data.get('evening', [])
         study = data.get('study', [])
 
-        # 收集 morning items
+        # 收集并自动归类
         for mi in morning:
-            if isinstance(mi, dict) and (mi.get('text', '') or '').strip():
-                all_morning_items.append(mi)
-            elif isinstance(mi, str) and mi.strip():
-                all_morning_items.append({'text': mi, 'pillar': ''})
+            text = mi if isinstance(mi, str) else mi.get('text', '')
+            if isinstance(text, str) and text.strip():
+                auto_pillar = mi.get('pillar', '') if isinstance(mi, dict) else ''
+                if not auto_pillar:
+                    auto_pillar = classify_auto(text)
+                all_morning_items.append({'text': text.strip(), 'pillar': auto_pillar})
+
+        for ei in evening:
+            if isinstance(ei, dict):
+                m = (ei.get('mistake') or '').strip()
+                imp = (ei.get('improvement') or '').strip()
+                if m or imp:
+                    pillar = ei.get('pillar', '') or classify_auto(m + ' ' + imp)
+                    all_evening_items.append({'mistake': m, 'improvement': imp, 'pillar': pillar})
+            elif isinstance(ei, str) and ei.strip():
+                all_evening_items.append({'mistake': ei.strip(), 'improvement': '', 'pillar': classify_auto(ei)})
+
+        for si in study:
+            name = si.get('name', '') if isinstance(si, dict) else str(si)
+            if name.strip():
+                pillar = si.get('pillar', '') if isinstance(si, dict) else ''
+                if not pillar:
+                    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 '',
+                    'pillar': pillar
+                })
 
         morning_count = sum(1 for x in morning if (
             isinstance(x, str) and x.strip() or
@@ -114,11 +162,38 @@ def compute_stats():
             # day_score = 60 + extra * 5  (不在此处使用，仅用于日历状态)
         calendar[d] = 'pass' if all_three else 'fail'
 
+    # 构建板块统计
+    pillars = ['医疗服务','医药营销','医疗支付','AI 智能','公司治理','个人修养']
+    pillar_breakdown = {}
+    for p in pillars:
+        pillar_breakdown[p] = {
+            'morning': 0, 'evening': 0, 'study': 0,
+            'morning_items': [], 'evening_items': [], 'study_items': []
+        }
+    for mi in all_morning_items:
+        p = mi['pillar']
+        if p in pillar_breakdown:
+            pillar_breakdown[p]['morning'] += 1
+            pillar_breakdown[p]['morning_items'].append(mi)
+    for ei in all_evening_items:
+        p = ei['pillar']
+        if p in pillar_breakdown:
+            pillar_breakdown[p]['evening'] += 1
+            pillar_breakdown[p]['evening_items'].append(ei)
+    for si in all_study_items:
+        p = si['pillar']
+        if p in pillar_breakdown:
+            pillar_breakdown[p]['study'] += 1
+            pillar_breakdown[p]['study_items'].append(si)
+
     return dict(
         total_days=total_days, total_morning=total_morning,
         total_evening=total_evening, total_study=total_study,
         calendar=calendar,
-        morning_items=all_morning_items
+        morning_items=all_morning_items,
+        evening_items=all_evening_items,
+        study_items=all_study_items,
+        pillar_breakdown=pillar_breakdown
     )
 
 
@@ -323,18 +398,46 @@ def api_calendar_sync():
 @app.route('/api/calendar-sync-all', methods=['GET'])
 @login_required
 def api_calendar_sync_all():
-    """批量查询过去15天~未来15天的钉钉日程，按日期分组返回"""
+    """批量查询过去15天~未来15天的钉钉日程，按日期分组返回，并自动填充到对应日期的 checkin"""
     import json as _json
     from datetime import datetime, timedelta
     today = datetime.now().replace(hour=0, minute=0, second=0, microsecond=0)
     results = []
+    saved_days = 0
     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})
+            # 自动去重填充到对应日期的 checkin
+            existing = get_checkin(ds)
+            data = existing['data'] if existing else {'morning': [], 'evening': [], 'study': []}
+            morning = data.get('morning', [])
+            existing_texts = set()
+            for mi in morning:
+                t = mi if isinstance(mi, str) else mi.get('text', '')
+                if t.strip():
+                    existing_texts.add(t.strip())
+            added = False
+            for evt in events:
+                summary = (evt.get('summary') or '').strip()
+                if not summary:
+                    continue
+                text = f"【{evt['time']}】{summary}" if evt.get('time') else summary
+                loc = evt.get('location', '')
+                if loc:
+                    text += f" @{loc}"
+                text = text.strip()
+                if text not in existing_texts:
+                    morning.append(text)
+                    existing_texts.add(text)
+                    added = True
+            if added:
+                data['morning'] = morning
+                save_checkin(ds, data)
+                saved_days += 1
+    return jsonify({'ok': True, 'data': results, 'saved_days': saved_days})
 
 
 # ── 启动 ──────────────────────────────────────────────

static/app.js

@@ -86,7 +86,7 @@
   function apiGetStats(cb) {
     fetch('/api/stats')
       .then(function(r){ return r.json(); })
-      .then(function(res){ if (res.ok) cb(null, res.data); else cb(res.error); })
+      .then(function(res){ if (res.ok) cb(null, res); else cb(res.error); })
       .catch(function(e){ cb(e.message); });
   }
 
@@ -242,11 +242,7 @@
     var mEls = document.querySelectorAll('#morning-list .item-row input');
     for (var i=0; i<mEls.length; i++) {
       var v = mEls[i].value.trim();
-      if (v) {
-        var row = mEls[i].closest('.item-row');
-        var sel = row ? row.querySelector('.morning-pillar') : null;
-        morningItems.push({ text: v, pillar: sel ? sel.value : '' });
-      }
+      if (v) morningItems.push(v);
     }
 
     var eveningItems = [];
@@ -281,14 +277,12 @@
     var evening = data.evening || [];
     var study = data.study || [];
 
-    // 早间立志 (兼容旧纯字符串和新 {text, pillar} 格式)
+    // 早间立志
     document.getElementById('morning-list').innerHTML = '';
-    if (morning.length === 0) morning = [{text: '', pillar: ''}];
+    if (morning.length === 0) morning = [''];
     for (var m=0; m<morning.length; m++) {
-      var mi = morning[m];
-      var txt = typeof mi === 'string' ? mi : (mi.text || '');
-      var pil = typeof mi === 'string' ? '' : (mi.pillar || '');
-      addMorningRow(txt, pil);
+      var txt = typeof morning[m] === 'string' ? morning[m] : (morning[m].text || '');
+      addMorningRow(txt);
     }
 
     // 责善改过
@@ -316,21 +310,15 @@
      Dynamic Rows
      ================================================================ */
 
-  function addMorningRow(val, pillar) {
+  function addMorningRow(val) {
     var container = document.getElementById('morning-list');
     var idx = container.children.length;
     var text = typeof val === 'string' ? val : (val && val.text ? val.text : '');
-    var pil = pillar || (val && val.pillar ? val.pillar : '');
     text = text || '';
-    var pillOpts = '<option value="">-- 板块 --</option>';
-    PILLARS.forEach(function(p){
-      pillOpts += '<option value="' + p.name + '"' + (pil === p.name ? ' selected' : '') + '>' + p.emoji + ' ' + p.name + '</option>';
-    });
     var div = document.createElement('div');
     div.className = 'item-row';
     div.innerHTML = '<span class="idx">' + (idx+1) + '.</span>' +
       '<input type="text" value="' + esc(text) + '" placeholder="今天最重要的一件事…">' +
-      '<select class="morning-pillar">' + pillOpts + '</select>' +
       '<button class="btn-del" onclick="this.parentElement.remove();renumberMorning()"><svg class="icon-sm"><use href="#icon-x"/></svg></button>';
     container.appendChild(div);
     renumberMorning();
@@ -422,7 +410,7 @@
         var totalDays = data.length;
         var totalEvents = 0;
         data.forEach(function(d){ totalEvents += d.events.length; });
-        summary.innerHTML = '同步完成！共 <b>' + totalDays + '</b> 天有日程，合计 <b>' + totalEvents + '</b> 个会议';
+        summary.innerHTML = '同步完成！共 <b>' + totalDays + '</b> 天有日程，合计 <b>' + totalEvents + '</b> 个会议' + (res.saved_days ? '，已自动填充 <b>' + res.saved_days + '</b> 天' : '');
 
         // 渲染结果列表
         var html = '';
@@ -547,13 +535,20 @@
     var panel = document.getElementById('panel-daily');
     if (!panel) return;
 
-    // 输入框 & 文本域：失去焦点时保存
+    // 输入框 & 文本域 & 下拉选择器：失去焦点时保存
     panel.addEventListener('blur', function(e) {
-      if (e.target.matches('input[type="text"], textarea, input[type="date"]')) {
+      if (e.target.matches('input[type="text"], textarea, input[type="date"], select')) {
         triggerAutoSave();
       }
     }, true);
 
+    // 选择器：change 事件也保存（及时响应）
+    panel.addEventListener('change', function(e) {
+      if (e.target.matches('select.morning-pillar')) {
+        triggerAutoSave();
+      }
+    });
+
     // 复选框：change 事件
     panel.addEventListener('change', function(e) {
       if (e.target.matches('input[type="checkbox"]')) {
@@ -1014,23 +1009,82 @@
      Blueprint — 蓝图六板块
      ================================================================ */
 
+  var blueprintData = null;
+  var blueprintFilter = 'all';
+
   function loadBlueprint() {
     apiGetStats(function(err, data) {
-      if (err || !data || !data.morning_items) return;
-      var counts = {};
-      PILLARS.forEach(function(p){ counts[p.name] = 0; });
-      var total = 0;
-      (data.morning_items || []).forEach(function(item){
-        var name = (typeof item === 'string') ? '' : (item.pillar || '');
-        if (counts[name] !== undefined) { counts[name]++; total++; }
-      });
-      PILLARS.forEach(function(p){
-        var el = document.getElementById('bp-count-' + p.name);
-        if (el) el.textContent = counts[p.name] + ' 条';
-      });
+      if (err || !data || !data.pillar_breakdown) return;
+      blueprintData = data.pillar_breakdown;
+      renderBlueprintList();
     });
   }
 
+  function renderBlueprintPillars(pb) {
+    var container = document.getElementById('blueprint-pillars');
+    if (!container) return;
+    var html = '';
+    PILLARS.forEach(function(p){
+      html += '<div class="blueprint-pillar" data-pillar="' + p.name + '">' +
+        '<div class="bp-icon">' + p.emoji + '</div>' +
+        '<div class="bp-name">' + p.name + '</div>' +
+      '</div>';
+    });
+    container.innerHTML = html;
+  }
+
+  function renderBlueprintList() {
+    var list = document.getElementById('bp-list');
+    var empty = document.getElementById('bp-list-empty');
+    if (!list || !blueprintData) return;
+    var items = [];
+    PILLARS.forEach(function(p){
+      var info = blueprintData[p.name] || {};
+      if (blueprintFilter === 'all' || blueprintFilter === 'morning') {
+        (info.morning_items || []).forEach(function(mi){ items.push({pillar: p, text: mi.text, type: 'morning'}); });
+      }
+      if (blueprintFilter === 'all' || blueprintFilter === 'evening') {
+        (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}); });
+      }
+    });
+    if (items.length === 0) {
+      list.innerHTML = '';
+      if (empty) empty.style.display = 'block';
+      return;
+    }
+    if (empty) empty.style.display = 'none';
+    var typeLabels = {morning: '立志', evening: '责善', study: '勤学'};
+    var pillarColors = {
+      '医疗服务': '#4A6CF7', '医药营销': '#D97706', '医疗支付': '#059669',
+      'AI 智能': '#7C3AED', '公司治理': '#DC2626', '个人修养': '#0891B2'
+    };
+    var html = '';
+    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 === 'evening' && item.improvement) extra = '<span class="bp-item-note evening">→ ' + esc(item.improvement) + '</span>';
+      html += '<div class="bp-list-item">' +
+        dot +
+        '<span class="bp-item-pillar">' + item.pillar.name + '</span>' +
+        '<span class="bp-item-type ' + item.type + '">' + (typeLabels[item.type] || item.type) + '</span>' +
+        '<span class="bp-item-text">' + esc(item.text) + '</span>' +
+        extra +
+      '</div>';
+    });
+    list.innerHTML = html;
+  }
+
+  window.filterBlueprint = function(btn) {
+    blueprintFilter = btn.dataset.filter;
+    document.querySelectorAll('.bp-tab').forEach(function(t){ t.classList.remove('active'); });
+    btn.classList.add('active');
+    renderBlueprintList();
+  };
+
   /* ================================================================
      Init
      ================================================================ */

static/style.css

@@ -1428,55 +1428,93 @@ body {
    Blueprint Panel
    ═══════════════════════════════════════════ */
 
-.blueprint-mission {
-  font-size: 15px;
-  font-weight: 600;
-  color: var(--primary);
-  margin-bottom: 24px;
-  padding: 12px 16px;
-  background: var(--primary-light);
-  border-radius: var(--radius);
-  text-align: center;
+/* Tab 筛选 */
+.bp-tabs {
+  display: flex;
+  gap: 4px;
+  margin-bottom: 20px;
+  border-bottom: 1.5px solid var(--border);
+  padding-bottom: 0;
 }
-
-.blueprint-pillars {
-  display: grid;
-  grid-template-columns: repeat(3, 1fr);
-  gap: 16px;
-}
-
-.blueprint-pillar {
-  background: var(--card);
-  border: 1.5px solid var(--border);
-  border-radius: var(--radius);
-  padding: 20px 16px;
-  text-align: center;
-  transition: border-color 0.2s, box-shadow 0.2s;
-}
-.blueprint-pillar:hover {
-  border-color: var(--primary);
-  box-shadow: 0 4px 16px rgba(74,108,247,0.08);
-}
-
-.bp-icon { font-size: 32px; margin-bottom: 8px; }
-.bp-name { font-size: 14px; font-weight: 700; color: var(--text); margin-bottom: 4px; }
-.bp-desc { font-size: 11px; color: var(--text-muted); margin-bottom: 10px; line-height: 1.5; }
-.bp-count { font-size: 13px; font-weight: 600; color: var(--primary); }
-
-/* 立志板块选择器 */
-.morning-pillar {
-  padding: 4px 8px;
-  border: 1.5px solid var(--border);
-  border-radius: var(--radius-sm);
-  font-size: 11px;
-  font-family: inherit;
+.bp-tab {
+  display: inline-flex;
+  align-items: center;
+  gap: 5px;
+  padding: 8px 16px;
+  border: none;
+  background: none;
+  font-size: 13px;
+  font-weight: 500;
   color: var(--text-dim);
-  background: var(--card);
-  min-width: 100px;
   cursor: pointer;
+  border-bottom: 2px solid transparent;
+  margin-bottom: -1.5px;
+  transition: all 0.15s;
+  font-family: inherit;
+}
+.bp-tab .icon-sm { opacity: 0.6; }
+.bp-tab:hover { color: var(--text); }
+.bp-tab.active { color: var(--primary); border-bottom-color: var(--primary); }
+.bp-tab.active .icon-sm { opacity: 1; }
+
+/* 明细列表 */
+.bp-list {
+  display: flex;
+  flex-direction: column;
+  gap: 1px;
+}
+.bp-list-item {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  padding: 10px 14px;
+  background: var(--card);
+  border-bottom: 0.5px solid var(--border);
+  transition: background 0.15s;
+}
+.bp-list-item:hover { background: var(--bg); }
+.bp-pillar-dot {
+  width: 8px;
+  height: 8px;
+  border-radius: 50%;
+  flex-shrink: 0;
+}
+.bp-item-pillar {
+  font-size: 12px;
+  color: var(--text-dim);
+  white-space: nowrap;
+}
+.bp-item-type {
+  font-size: 11px;
+  font-weight: 600;
+  padding: 2px 8px;
+  border-radius: 8px;
+  white-space: nowrap;
+}
+.bp-item-type.morning { background: var(--warning-light); color: #D97706; }
+.bp-item-type.evening { background: var(--danger-light); color: var(--danger); }
+.bp-item-type.study { background: var(--success-light); color: var(--success); }
+.bp-item-text {
+  font-size: 13px;
+  color: var(--text);
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.bp-item-note {
+  font-size: 11px;
+  color: var(--text-muted);
+  margin-left: 4px;
+  white-space: nowrap;
+}
+.bp-item-note.evening { color: var(--danger); }
+.bp-list-empty {
+  font-size: 13px;
+  color: var(--text-muted);
+  text-align: center;
+  padding: 32px 0;
 }
-.morning-pillar:hover { border-color: var(--primary); }
 
 @media (max-width: 900px) {
-  .blueprint-pillars { grid-template-columns: repeat(2, 1fr); }
+  .quad-grid { grid-template-columns: 1fr; grid-template-rows: auto; }
 }

templates/index.html

@@ -108,8 +108,8 @@
         历史记录
       </a>
       <a class="nav-item" data-panel="blueprint" onclick="switchPanel('blueprint')">
-        <svg class="icon-sm"><use href="#icon-star"/></svg>
-        蓝图
+        <svg class="icon-sm"><use href="#icon-sun"/></svg>
+        人生蓝图
       </a>
     </nav>
 
@@ -276,49 +276,26 @@
     <!-- ── 蓝图面板 ── -->
     <section class="panel" id="panel-blueprint">
       <div class="panel-header">
-        <h2>蓝图 · 数字医疗集团</h2>
+        <h2>人生蓝图</h2>
       </div>
-      <div class="blueprint-mission">
-        一辈子，干成一件事 — 用 AI 重构医疗全链路
-      </div>
-      <div class="blueprint-pillars" id="blueprint-pillars">
-        <div class="blueprint-pillar" data-pillar="医疗服务">
-          <div class="bp-icon">🥼</div>
-          <div class="bp-name">医疗服务</div>
-          <div class="bp-desc">诊疗能力 · 临床路径 · 医疗质量</div>
-          <div class="bp-count" id="bp-count-医疗服务">—</div>
-        </div>
-        <div class="blueprint-pillar" data-pillar="医药营销">
-          <div class="bp-icon">💊</div>
-          <div class="bp-name">医药营销</div>
-          <div class="bp-desc">科普 · 科研 · 学术会议 · 患者管理</div>
-          <div class="bp-count" id="bp-count-医药营销">—</div>
-        </div>
-        <div class="blueprint-pillar" data-pillar="医疗支付">
-          <div class="bp-icon">🛡️</div>
-          <div class="bp-name">医疗支付</div>
-          <div class="bp-desc">医保 · 商保 · 支付闭环</div>
-          <div class="bp-count" id="bp-count-医疗支付">—</div>
-        </div>
-        <div class="blueprint-pillar" data-pillar="AI 智能">
-          <div class="bp-icon">🤖</div>
-          <div class="bp-name">AI 智能</div>
-          <div class="bp-desc">数字人 · 智能平台 · AI 赋能</div>
-          <div class="bp-count" id="bp-count-AI 智能">—</div>
-        </div>
-        <div class="blueprint-pillar" data-pillar="公司治理">
-          <div class="bp-icon">🏛️</div>
-          <div class="bp-name">公司治理</div>
-          <div class="bp-desc">组织 · 人才 · 制度 · 文化</div>
-          <div class="bp-count" id="bp-count-公司治理">—</div>
-        </div>
-        <div class="blueprint-pillar" data-pillar="个人修养">
-          <div class="bp-icon">🎯</div>
-          <div class="bp-name">个人修养</div>
-          <div class="bp-desc">立志 · 责善 · 改过 · 勤学</div>
-          <div class="bp-count" id="bp-count-个人修养">—</div>
-        </div>
+      <!-- Tab 筛选 -->
+      <div class="bp-tabs">
+        <button class="bp-tab active" data-filter="all" onclick="filterBlueprint(this)">
+          <svg class="icon-sm"><use href="#icon-list-bullet"/></svg> 全部
+        </button>
+        <button class="bp-tab" data-filter="morning" onclick="filterBlueprint(this)">
+          <svg class="icon-sm"><use href="#icon-bolt"/></svg> 立志
+        </button>
+        <button class="bp-tab" data-filter="evening" onclick="filterBlueprint(this)">
+          <svg class="icon-sm"><use href="#icon-magnifying-glass"/></svg> 责善
+        </button>
+        <button class="bp-tab" data-filter="study" onclick="filterBlueprint(this)">
+          <svg class="icon-sm"><use href="#icon-book-open"/></svg> 勤学
+        </button>
       </div>
+      <!-- 明细列表 -->
+      <div class="bp-list" id="bp-list"></div>
+      <div class="bp-list-empty" id="bp-list-empty" style="display:none">暂无记录</div>
     </section>
 
   </main>