0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🎨 Improve dragging of headings or list items to the doc tree https://github.com/siyuan-note/siyuan/issues/13170

Browse source
This commit is contained in:
Daniel 2024-11-29 09:07:17 +08:00
parent 6f7e106be4
commit 11640f777a
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
3 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
kernel/model/file.go
View file

@ -2175,7 +2175,7 @@ func (box *Box) addMinSort(parentPath, id string) {
}
}
func (box *Box) addSort(previousID, id string) {
func (box *Box) addSort(previousPath, id string) {
confDir := filepath.Join(util.DataDir, box.ID, ".siyuan")
if err := os.MkdirAll(confDir, 0755); err != nil {
logging.LogErrorf("create conf dir failed: %s", err)
@ -2196,17 +2196,25 @@ func (box *Box) addSort(previousID, id string) {
}
}
sortVal := 0
previousSortVal, ok := fullSortIDs[previousID]
if !ok {
sortVal++
} else {
sortVal = previousSortVal + 1
parentPath := path.Dir(previousPath)
docs, _, err := ListDocTree(box.ID, parentPath, util.SortModeUnassigned, false, false, Conf.FileTree.MaxListCount)
if err != nil {
logging.LogErrorf("list doc tree failed: %s", err)
return
}
fullSortIDs[id] = sortVal
previousID := util.GetTreeID(previousPath)
sortVal := 0
for _, doc := range docs {
fullSortIDs[doc.ID] = sortVal
if doc.ID == previousID {
sortVal++
fullSortIDs[id] = sortVal
}
sortVal++
}
data, err := gulu.JSON.MarshalJSON(fullSortIDs)
data, err = gulu.JSON.MarshalJSON(fullSortIDs)
if err != nil {
logging.LogErrorf("marshal sort conf failed: %s", err)
return

2
kernel/model/heading.go
View file

@ -394,7 +394,7 @@ func Heading2Doc(srcHeadingID, targetBoxID, targetPath, previousPath string) (sr
newTree.Root.SetIALAttr("updated", util.CurrentTimeSecondsStr())
newTree.Root.Spec = "1"
if "" != previousPath {
box.addSort(util.GetTreeID(previousPath), newTree.ID)
box.addSort(previousPath, newTree.ID)
} else {
box.addMinSort(path.Dir(newTargetPath), newTree.ID)
}

2
kernel/model/listitem.go
View file

@ -128,7 +128,7 @@ func ListItem2Doc(srcListItemID, targetBoxID, targetPath, previousPath string) (
newTree.Root.SetIALAttr("updated", util.CurrentTimeSecondsStr())
newTree.Root.Spec = "1"
if "" != previousPath {
box.addSort(util.GetTreeID(previousPath), newTree.ID)
box.addSort(previousPath, newTree.ID)
} else {
box.addMinSort(path.Dir(newTargetPath), newTree.ID)
}