Merge pull request #44 from czfadmin:fix/sort

fix(sort): 修复分组中只有两个排序时,无法正常排序问题
czfadmin · Jul 9, 2024 · a7d0259 · a7d0259
2 parents e1c958f + dc50c9b
commit a7d0259
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/stores/bookmark-store.ts b/src/stores/bookmark-store.ts
@@ -647,9 +647,6 @@ export const BookmarksStore = types
         default:
           return;
       }
-      // if (!bookmarks) {
-      //   return;
-      // }
     }
 
     function addGroupInfo(

diff --git a/src/stores/bookmark.ts b/src/stores/bookmark.ts
@@ -240,7 +240,7 @@ export const Bookmark = types
   });
 
 /**
- * 增加hooks, 将bookmark数据转换
+ * 增加hooks, 将bookmark数据转换, PS: 暂时未使用到此hooks
  */
 export const BookmarkProcessorModel: ISnapshotProcessor<
   typeof Bookmark,

diff --git a/src/views/BaseTreeView.ts b/src/views/BaseTreeView.ts
@@ -172,9 +172,12 @@ export default class BaseTreeView<T extends BaseTreeItem, C extends IController>
             sourceContextValue === BookmarkTreeItemCtxValueEnum.BOOKMARK
           ) {
             if (sourceMeta.groupId === targetMeta.groupId) {
+              const targetIdx =
+                targetMeta.sortedInfo[self._controller.groupView];
+              self._controller.updateBookmarkSortedInfo(sourceMeta, targetIdx);
               self._controller.updateBookmarkSortedInfo(
-                sourceMeta,
-                targetMeta.sortedInfo[self._controller.groupView],
+                targetMeta,
+                targetIdx + 1,
               );
             }
           }