From 55dc83ce83cbb9aaacb201e096c8c7c1e384cbfc Mon Sep 17 00:00:00 2001
From: mac <mac@Qiukais-m1-macPro.local>
Date: Tue, 28 Jul 2026 13:53:30 +0800
Subject: [PATCH] =?UTF-8?q?v2.1.23=20=E2=80=94=20=E6=9C=AC=E5=91=A8?=
 =?UTF-8?q?=E9=87=8D=E7=82=B9=E6=8B=86=E5=88=86=E6=89=8B=E5=8A=A8=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1+=E6=97=A5=E5=8E=86=E6=97=A5=E7=A8=8B=E4=B8=A4?=
 =?UTF-8?q?=E5=BC=A0=E5=8D=A1=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/app.js        | 27 +++++++++++++++++++++++++--
 static/style.css     |  7 +++++++
 templates/index.html |  7 +++++++
 3 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/static/app.js b/static/app.js
index 73d5825..7a71bfd 100644
--- a/static/app.js
+++ b/static/app.js
@@ -246,6 +246,12 @@
       var v = mEls[i].value.trim();
       if (v) morningItems.push(v);
     }
+    // 收集日历日程
+    var calEls = document.querySelectorAll('#morning-calendar-list .cal-task-item span:last-child');
+    for (var ci=0; ci<calEls.length; ci++) {
+      var txt = calEls[ci].textContent.trim();
+      if (txt) { morningItems.push(txt); }
+    }
 
     var eveningItems = [];
     var eRows = document.querySelectorAll('#evening-list .evening-row');
@@ -275,12 +281,29 @@
     var evening = data.evening || [];
     var study = data.study || [];
 
-    // 早间立志
+    // 本周重点：拆分手动任务 vs 日历日程
     document.getElementById('morning-list').innerHTML = '';
+    document.getElementById('morning-calendar-list').innerHTML = '';
+    var manualItems = [];
+    var calItems = [];
     if (morning.length === 0) morning = [''];
     for (var m=0; m<morning.length; m++) {
       var txt = typeof morning[m] === 'string' ? morning[m] : (morning[m].text || '');
-      addMorningRow(txt);
+      if (txt && txt.trim().startsWith('【')) { calItems.push(txt); }
+      else { manualItems.push(txt); }
+    }
+    if (manualItems.length === 0) manualItems = [''];
+    for (var a=0; a<manualItems.length; a++) { addMorningRow(manualItems[a]); }
+    if (calItems.length > 0) {
+      document.getElementById('morning-calendar').style.display = 'block';
+      for (var b=0; b<calItems.length; b++) {
+        var div = document.createElement('div');
+        div.className = 'cal-task-item';
+        div.innerHTML = '<span class="cal-task-dot">&#128197;</span><span>' + esc(calItems[b]) + '</span>';
+        document.getElementById('morning-calendar-list').appendChild(div);
+      }
+    } else {
+      document.getElementById('morning-calendar').style.display = 'none';
     }
 
     // 责善改过
diff --git a/static/style.css b/static/style.css
index ef3cc26..f4d8fb8 100644
--- a/static/style.css
+++ b/static/style.css
@@ -1803,3 +1803,10 @@ body {
 /* 编辑模式下显示删除按钮 */
 .btn-del { display: none; }
 .card.editing .btn-del { display: inline-flex; }
+
+/* 本周日程 */
+.morning-calendar { margin-top: 14px; border-top: 1px solid var(--border); padding-top: 12px; }
+.morning-calendar-head { display: flex; align-items: center; gap: 6px; font-size: 12px; font-weight: 600; color: var(--text-muted); margin-bottom: 8px; }
+.cal-task-item { display: flex; align-items: flex-start; gap: 8px; padding: 6px 0; font-size: 13px; color: var(--text-dim); line-height: 1.5; border-bottom: 1px solid var(--bg); }
+.cal-task-item:last-child { border-bottom: none; }
+.cal-task-dot { flex-shrink: 0; font-size: 14px; margin-top: 1px; }
diff --git a/templates/index.html b/templates/index.html
index 982fa2e..8be9dd8 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -157,6 +157,13 @@
           <button class="btn-add edit-only" onclick="addMorning()">
             <svg class="icon-sm"><use href="#icon-plus"/></svg> 增加一条
           </button>
+          <div class="morning-calendar" id="morning-calendar" style="display:none">
+            <div class="morning-calendar-head">
+              <svg class="icon-sm"><use href="#icon-calendar"/></svg>
+              <span>本周日程</span>
+            </div>
+            <div id="morning-calendar-list"></div>
+          </div>
         </div>
         <div class="card card-evening daily-card" data-card="evening">
           <div class="card-head">