From 7b4134a72c9ce86d1d054e6187b4bb78cf95c77e Mon Sep 17 00:00:00 2001
From: mac <mac@Qiukais-m1-macPro.local>
Date: Wed, 3 Jun 2026 14:55:54 +0800
Subject: [PATCH] =?UTF-8?q?v1.2.3=20=E2=80=94=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=B1=A1=E9=99=90=E5=88=86=E7=B1=BB=E5=88=B7=E6=96=B0=E4=B8=A2?=
 =?UTF-8?q?=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- normalizeQuadrant(): priority→quadrant 回退映射
- 拖拽跨象限 API 调用增加错误提示
- loadWishes 加载时自动规范化 quadrant 字段
---
 static/app.js | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/static/app.js b/static/app.js
index 15677a8..a4e96a1 100644
--- a/static/app.js
+++ b/static/app.js
@@ -644,10 +644,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 +679,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 +720,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 +803,7 @@
               method: 'PUT',
               headers: {'Content-Type': 'application/json'},
               body: JSON.stringify({quadrant: targetQuadrant})
-            });
+            }).catch(function(){ showToast('保存失败', 'error'); });
           }
           renderWishes();
           saveWishOrder();
@@ -822,7 +831,7 @@
             method: 'PUT',
             headers: {'Content-Type': 'application/json'},
             body: JSON.stringify({quadrant: q})
-          });
+          }).catch(function(){ showToast('保存失败', 'error'); });
           renderWishes();
         }
       });