github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-04 04:20:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

🐛 文档树自定义排序拖拽不稳定 https://github.com/siyuan-note/siyuan/issues/7726

Browse Source
This commit is contained in:
Liang Ding 2023-03-27 15:22:33 +08:00
parent 483b79bcf1
commit 1e7cf8917b
No known key found for this signature in database
GPG Key ID: 136F30F901A2231D
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/api/filetree.go
View File

@ -267,7 +267,9 @@ func moveDocs(c *gin.Context) {
return return
} }
err := model.MoveDocs(fromPaths, toNotebook, toPath) callback := arg["callback"]
err := model.MoveDocs(fromPaths, toNotebook, toPath, callback)
if nil != err { if nil != err {
ret.Code = -1 ret.Code = -1
ret.Msg = err.Error() ret.Msg = err.Error()

7
kernel/model/file.go
View File

@ -989,7 +989,7 @@ func GetFullHPathByID(id string) (hPath string, err error) {
return return
} }
func MoveDocs(fromPaths []string, toBoxID, toPath string) (err error) { func MoveDocs(fromPaths []string, toBoxID, toPath string, callback interface{}) (err error) {
toBox := Conf.Box(toBoxID) toBox := Conf.Box(toBoxID)
if nil == toBox { if nil == toBox {
err = errors.New(Conf.Language(0)) err = errors.New(Conf.Language(0))
@ -1020,7 +1020,7 @@ func MoveDocs(fromPaths []string, toBoxID, toPath string) (err error) {
WaitForWritingFiles() WaitForWritingFiles()
luteEngine := util.NewLute() luteEngine := util.NewLute()
for fromPath, fromBox := range pathsBoxes { for fromPath, fromBox := range pathsBoxes {
_, err = moveDoc(fromBox, fromPath, toBox, toPath, luteEngine) _, err = moveDoc(fromBox, fromPath, toBox, toPath, luteEngine, callback)
if nil != err { if nil != err {
return return
} }
@ -1036,7 +1036,7 @@ func MoveDocs(fromPaths []string, toBoxID, toPath string) (err error) {
return return
} }
func moveDoc(fromBox *Box, fromPath string, toBox *Box, toPath string, luteEngine *lute.Lute) (newPath string, err error) { func moveDoc(fromBox *Box, fromPath string, toBox *Box, toPath string, luteEngine *lute.Lute, callback interface{}) (newPath string, err error) {
isSameBox := fromBox.ID == toBox.ID isSameBox := fromBox.ID == toBox.ID
if isSameBox { if isSameBox {
@ -1150,6 +1150,7 @@ func moveDoc(fromBox *Box, fromPath string, toBox *Box, toPath string, luteEngin
"toPath": toPath, "toPath": toPath,
"newPath": newPath, "newPath": newPath,
} }
evt.Callback = callback
util.PushEvent(evt) util.PushEvent(evt)
return return
} }