v2.1.25 — 修复拖拽排序drop事件this上下文丢失

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';
     }
 
     // 责善改过
@@ -324,9 +347,15 @@
     text = text || '';
     var div = document.createElement('div');
     div.className = 'item-row';
-    div.innerHTML = '<span class="idx">' + (idx+1) + '.</span>' +
+    div.draggable = true;
+    div.innerHTML = '<span class="drag-handle" title="拖动排序">⋮⋮</span>' +
+      '<span class="idx">' + (idx+1) + '.</span>' +
       '<input type="text" value="' + esc(text) + '" placeholder="本周最重要的一件事…">' +
       '<button class="btn-del" onclick="this.parentElement.remove();renumberMorning()"><svg class="icon-sm"><use href="#icon-x"/></svg></button>';
+    div.addEventListener('dragstart', dragStart);
+    div.addEventListener('dragover', dragOver);
+    div.addEventListener('drop', function(e){ dragDrop.call(this, e, 'morning-list'); });
+    div.addEventListener('dragend', dragEnd);
     container.appendChild(div);
     renumberMorning();
   }
@@ -345,10 +374,16 @@
     improve = improve || '';
     var div = document.createElement('div');
     div.className = 'evening-row';
+    div.draggable = true;
     div.innerHTML =
+      '<span class="drag-handle evening-drag" title="拖动排序">⋮⋮</span>' +
       '<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="改进方案…">';
+    div.addEventListener('dragstart', dragStart);
+    div.addEventListener('dragover', dragOver);
+    div.addEventListener('drop', function(e){ dragDrop.call(this, e, 'evening-list'); });
+    div.addEventListener('dragend', dragEnd);
     container.appendChild(div);
   }
 
@@ -381,6 +416,41 @@
     btn.classList.toggle('active', editing);
   };
 
+  /* ── 拖拽排序 ── */
+  var dragSrc = null;
+
+  function dragStart(e) {
+    dragSrc = this;
+    this.classList.add('dragging');
+    e.dataTransfer.effectAllowed = 'move';
+  }
+
+  function dragOver(e) {
+    e.preventDefault();
+    e.dataTransfer.dropEffect = 'move';
+    if (this !== dragSrc) this.classList.add('drag-over');
+  }
+
+  function dragDrop(e, listId) {
+    e.preventDefault();
+    this.classList.remove('drag-over');
+    if (dragSrc === this) return;
+    var container = document.getElementById(listId);
+    var items = container.querySelectorAll('.' + (dragSrc.classList.contains('evening-row') ? 'evening-row' : 'item-row'));
+    var from = Array.prototype.indexOf.call(items, dragSrc);
+    var to = Array.prototype.indexOf.call(items, this);
+    if (from < to) { container.insertBefore(dragSrc, this.nextSibling); }
+    else { container.insertBefore(dragSrc, this); }
+    if (listId === 'morning-list') renumberMorning();
+    triggerAutoSave();
+  }
+
+  function dragEnd() {
+    this.classList.remove('dragging');
+    document.querySelectorAll('.drag-over').forEach(function(el){ el.classList.remove('drag-over'); });
+    dragSrc = null;
+  }
+
   window.addStudyItem = function() {
     var name = prompt('请输入新习惯名称：');
     if (!name || !name.trim()) return;

static/style.css

@@ -1803,3 +1803,17 @@ 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; }
+
+/* 拖拽排序 */
+.drag-handle { display: none; cursor: grab; color: var(--text-muted); font-size: 14px; user-select: none; padding: 0 4px; line-height: 1; letter-spacing: -2px; }
+.card.editing .drag-handle { display: block; }
+.item-row.dragging, .evening-row.dragging { opacity: 0.5; }
+.item-row.drag-over, .evening-row.drag-over { border-color: var(--primary) !important; background: var(--primary-light); }
+.evening-drag { position: absolute; left: 6px; top: 8px; }

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">