@qnote/q-ai-note 1.0.20 → 1.0.22

package/dist/web/app.js

@@ -1157,6 +1157,81 @@ function renderWorkTree() {
       });
       await loadSandbox(state.currentSandbox.id);
     },
+    onMoveSibling: treeReadonly ? undefined : async (nodeId, direction) => {
+      if (!state.currentSandbox) return;
+      const delta = direction === 'up' ? -1 : direction === 'down' ? 1 : 0;
+      if (!delta) return;
+      const byId = new Map((state.currentSandbox.items || []).map((item) => [item.id, item]));
+      const node = byId.get(nodeId);
+      if (!node) return;
+      if (!node.parent_id) {
+        if (state.laneReorderPending) return;
+        const roots = (state.currentSandbox.items || []).filter((item) => !item.parent_id);
+        const orderedRoots = [...roots].sort((a, b) => compareSiblingOrder(a, b, 'lane_order_key'));
+        const fromIdx = orderedRoots.findIndex((item) => item.id === nodeId);
+        if (fromIdx < 0) return;
+        const toIdx = fromIdx + delta;
+        if (toIdx < 0 || toIdx >= orderedRoots.length) return;
+        const [movedRoot] = orderedRoots.splice(fromIdx, 1);
+        orderedRoots.splice(toIdx, 0, movedRoot);
+        const rootIds = orderedRoots.map((item) => item.id);
+        const previousRootIds = roots
+          .sort((a, b) => compareSiblingOrder(a, b, 'lane_order_key'))
+          .map((item) => item.id);
+        if (JSON.stringify(rootIds) === JSON.stringify(previousRootIds)) return;
+        state.laneReorderPending = true;
+        renderWorkTree();
+        try {
+          const result = await apiRequest(`${API_BASE}/sandboxes/${state.currentSandbox.id}/items/reorder-roots`, {
+            method: 'POST',
+            body: JSON.stringify({ root_ids: rootIds }),
+          });
+          const hasChangedCount = Object.prototype.hasOwnProperty.call(result || {}, 'changed_count');
+          if (hasChangedCount && Number(result?.changed_count || 0) === 0) {
+            state.laneReorderPending = false;
+            renderWorkTree();
+            return;
+          }
+          await loadSandbox(state.currentSandbox.id);
+        } catch (error) {
+          alert(`泳道排序失败：${error?.message || error}`);
+        } finally {
+          state.laneReorderPending = false;
+          renderWorkTree();
+        }
+        return;
+      }
+      const parentId = node.parent_id || null;
+      const siblings = (state.currentSandbox.items || [])
+        .filter((item) => (item.parent_id || null) === parentId)
+        .sort((a, b) => compareSiblingOrder(a, b, 'order_key'));
+      const fromIdx = siblings.findIndex((item) => item.id === nodeId);
+      if (fromIdx < 0) return;
+      const toIdx = fromIdx + delta;
+      if (toIdx < 0 || toIdx >= siblings.length) return;
+      const reordered = [...siblings];
+      const [movedNode] = reordered.splice(fromIdx, 1);
+      reordered.splice(toIdx, 0, movedNode);
+      const left = reordered[toIdx - 1] || null;
+      const right = reordered[toIdx + 1] || null;
+      const nextOrderKey = rankBetween(getNodeOrderKey(left, 'order_key'), getNodeOrderKey(right, 'order_key'));
+      const canDirectUpdate = nextOrderKey !== getNodeOrderKey(node, 'order_key')
+        && isOrderKeyBetween(getNodeOrderKey(left, 'order_key'), getNodeOrderKey(right, 'order_key'), nextOrderKey);
+      if (canDirectUpdate) {
+        await apiRequest(`${API_BASE}/items/${nodeId}`, {
+          method: 'PUT',
+          body: JSON.stringify({
+            extra_data: {
+              ...(node.extra_data || {}),
+              order_key: nextOrderKey,
+            },
+          }),
+        });
+      } else {
+        await persistSiblingOrderByList(reordered, parentId);
+      }
+      await loadSandbox(state.currentSandbox.id);
+    },
     onReorderSiblings: treeReadonly ? undefined : async (dragNodeId, targetNodeId, position) => {
       if (!state.currentSandbox) return;
       if (!dragNodeId || !targetNodeId || dragNodeId === targetNodeId) return;
@@ -1175,19 +1250,30 @@ function renderWorkTree() {
       const targetIndex = siblings.findIndex((item) => item.id === targetNodeId);
       if (targetIndex < 0) return;
       const insertIndex = position === 'after' ? targetIndex + 1 : targetIndex;
-      const left = siblings[insertIndex - 1] || null;
-      const right = siblings[insertIndex] || null;
+      const reordered = [...siblings];
+      reordered.splice(insertIndex, 0, dragNode);
+      const left = reordered[insertIndex - 1] || null;
+      const right = reordered[insertIndex + 1] || null;
       const nextOrderKey = rankBetween(getNodeOrderKey(left, 'order_key'), getNodeOrderKey(right, 'order_key'));
-      await apiRequest(`${API_BASE}/items/${dragNodeId}`, {
-        method: 'PUT',
-        body: JSON.stringify({
-          parent_id: nextParentId,
-          extra_data: {
-            ...(dragNode.extra_data || {}),
-            order_key: nextOrderKey,
-          },
-        }),
-      });
+      const canDirectUpdate = isOrderKeyBetween(getNodeOrderKey(left, 'order_key'), getNodeOrderKey(right, 'order_key'), nextOrderKey)
+        && (
+          nextOrderKey !== getNodeOrderKey(dragNode, 'order_key')
+          || (dragNode.parent_id || null) !== nextParentId
+        );
+      if (canDirectUpdate) {
+        await apiRequest(`${API_BASE}/items/${dragNodeId}`, {
+          method: 'PUT',
+          body: JSON.stringify({
+            parent_id: nextParentId,
+            extra_data: {
+              ...(dragNode.extra_data || {}),
+              order_key: nextOrderKey,
+            },
+          }),
+        });
+      } else {
+        await persistSiblingOrderByList(reordered, nextParentId, dragNodeId);
+      }
       await loadSandbox(state.currentSandbox.id);
     },
     onReorderLanes: treeReadonly ? undefined : async (dragRootId, targetRootId, position = 'before') => {
@@ -1341,6 +1427,55 @@ function rankBetween(left, right) {
   return `${prefix}${ORDER_ALPHABET[Math.floor(ORDER_BASE / 2)]}`;
 }
 
+function encodeOrderIndex(index, width = 6) {
+  let value = Number.isFinite(index) ? Math.max(0, Math.floor(index)) : 0;
+  let encoded = '';
+  do {
+    const digit = value % ORDER_BASE;
+    encoded = `${ORDER_ALPHABET[digit]}${encoded}`;
+    value = Math.floor(value / ORDER_BASE);
+  } while (value > 0);
+  return encoded.padStart(width, ORDER_ALPHABET[0]);
+}
+
+function isOrderKeyBetween(leftKey, rightKey, candidateKey) {
+  const left = String(leftKey || '');
+  const right = String(rightKey || '');
+  const candidate = String(candidateKey || '');
+  if (!candidate) return false;
+  if (left && candidate <= left) return false;
+  if (right && candidate >= right) return false;
+  return true;
+}
+
+async function persistSiblingOrderByList(orderedItems, nextParentId = null, movedNodeId = '') {
+  const items = Array.isArray(orderedItems) ? orderedItems : [];
+  for (let index = 0; index < items.length; index += 1) {
+    const item = items[index];
+    if (!item?.id) continue;
+    const targetKey = encodeOrderIndex((index + 1) * 1024);
+    const currentKey = getNodeOrderKey(item, 'order_key');
+    const isMovedNode = Boolean(movedNodeId) && String(item.id) === String(movedNodeId);
+    const currentParentId = item.parent_id || null;
+    const needsParentUpdate = isMovedNode && currentParentId !== nextParentId;
+    const needsOrderUpdate = currentKey !== targetKey;
+    if (!needsParentUpdate && !needsOrderUpdate) continue;
+    const body = {
+      extra_data: {
+        ...(item.extra_data || {}),
+        order_key: targetKey,
+      },
+    };
+    if (needsParentUpdate) {
+      body.parent_id = nextParentId;
+    }
+    await apiRequest(`${API_BASE}/items/${item.id}`, {
+      method: 'PUT',
+      body: JSON.stringify(body),
+    });
+  }
+}
+
 function getNodeOrderKey(item, keyName = 'order_key') {
   return String(item?.extra_data?.[keyName] || '').trim();
 }

package/dist/web/styles.css

@@ -2487,6 +2487,11 @@ h2 {
   background: #dbe8ff;
 }
 
+.node-action-btn.move {
+  font-size: 11px;
+  font-weight: 700;
+}
+
 .node-status.pending { background: #9aa0a6; }
 .node-status.in_progress { background: var(--primary); }
 .node-status.done { background: var(--success); }

package/dist/web/vueRenderers.js

@@ -212,6 +212,13 @@ function renderEntityPreviewBoxes(nodeId, entityRowsByNodeId, mode) {
   `;
 }
 
+function renderSiblingMoveActions(node) {
+  return `
+    <button class="node-action-btn move" data-action="move-up" data-id="${esc(node.id)}" title="上移">↑</button>
+    <button class="node-action-btn move" data-action="move-down" data-id="${esc(node.id)}" title="下移">↓</button>
+  `;
+}
+
 function renderTreeNode(node, byParent, expandedIdSet, entitySummaryByNodeId, showAssignee = false, entityRowsByNodeId = {}, elementPreviewMode = 'none', readonly = false, selectedId = '') {
   const children = byParent.get(node.id) || [];
   const hasChildren = children.length > 0;
@@ -234,6 +241,7 @@ function renderTreeNode(node, byParent, expandedIdSet, entitySummaryByNodeId, sh
             <button class="node-action-btn add-child" data-action="add-child" data-id="${esc(node.id)}" title="添加子任务">+</button>
             <button class="node-action-btn" data-action="edit" data-id="${esc(node.id)}" title="编辑">✎</button>
             <button class="node-action-btn delete" data-action="delete" data-id="${esc(node.id)}" title="删除">✕</button>
+            ${renderSiblingMoveActions(node)}
           </div>
         `}
       </div>
@@ -266,6 +274,7 @@ function renderTreeNode(node, byParent, expandedIdSet, entitySummaryByNodeId, sh
             <button class="node-action-btn add-child" data-action="add-child" data-id="${esc(node.id)}" title="添加子任务">+</button>
             <button class="node-action-btn" data-action="edit" data-id="${esc(node.id)}" title="编辑">✎</button>
             <button class="node-action-btn delete" data-action="delete" data-id="${esc(node.id)}" title="删除">✕</button>
+            ${renderSiblingMoveActions(node)}
           </div>
         `}
       </div>
@@ -292,6 +301,7 @@ function renderTreeNode(node, byParent, expandedIdSet, entitySummaryByNodeId, sh
                           <button class="node-action-btn add-child" data-action="add-child" data-id="${esc(child.id)}" title="添加子任务">+</button>
                           <button class="node-action-btn" data-action="edit" data-id="${esc(child.id)}" title="编辑">✎</button>
                           <button class="node-action-btn delete" data-action="delete" data-id="${esc(child.id)}" title="删除">✕</button>
+                          ${renderSiblingMoveActions(child)}
                         </div>
                       `}
                     </div>
@@ -390,6 +400,7 @@ function renderDenseLaneNode(node, byParent, expandedIdSet, entitySummaryByNodeI
             <button class="node-action-btn add-child" data-action="add-child" data-id="${esc(node.id)}" title="添加子任务">+</button>
             <button class="node-action-btn" data-action="edit" data-id="${esc(node.id)}" title="编辑">✎</button>
             <button class="node-action-btn delete" data-action="delete" data-id="${esc(node.id)}" title="删除">✕</button>
+            ${renderSiblingMoveActions(node)}
           </div>
         `}
       </div>
@@ -469,6 +480,7 @@ export function mountWorkTree(targetId, options) {
     onSelect,
     onSelectEntity,
     onMoveNode,
+    onMoveSibling,
     onReorderSiblings,
     onReorderLanes,
     entitySummaryByNodeId = {},
@@ -499,7 +511,7 @@ export function mountWorkTree(targetId, options) {
       } else {
         const orderKeyA = keyOf(a, 'order_key');
         const orderKeyB = keyOf(b, 'order_key');
-        if (orderKeyA && orderKeyB && orderKeyA !== orderKeyB) return orderKeyA.localeCompare(orderKeyB);
+        if (orderKeyA && orderKeyB && orderKeyA !== orderKeyB) return orderKeyA < orderKeyB ? -1 : 1;
         if (orderKeyA && !orderKeyB) return -1;
         if (!orderKeyA && orderKeyB) return 1;
       }
@@ -547,6 +559,8 @@ export function mountWorkTree(targetId, options) {
       if (action === 'edit') onEdit?.(id);
       if (action === 'delete') onDelete?.(id);
       if (action === 'quick-chat') onQuickChat?.(id, el);
+      if (action === 'move-up') onMoveSibling?.(id, 'up');
+      if (action === 'move-down') onMoveSibling?.(id, 'down');
     });
   });
   container.querySelectorAll('[data-select-id]').forEach((el) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qnote/q-ai-note",
-  "version": "1.0.20",
+  "version": "1.0.22",
   "type": "module",
   "description": "AI-assisted personal work sandbox and diary system",
   "main": "dist/server/index.js",