From 685d47452d57b10b882483f3dec4dac4940ea8b3 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Wed, 22 Feb 2023 08:31:46 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20=E6=96=87=E6=A1=A3=E8=BD=AC=E6=8D=A2?= =?UTF-8?q?=E6=A0=87=E9=A2=98=E5=90=8E=E6=96=87=E6=A1=A3=E6=A0=91=E5=88=B7?= =?UTF-8?q?=E6=96=B0=E4=B8=8D=E6=AD=A3=E7=A1=AE=20https://github.com/siyua?= =?UTF-8?q?n-note/siyuan/issues/7435?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/protyle/util/editorCommonEvent.ts | 4 ---- kernel/model/heading.go | 7 +++++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/src/protyle/util/editorCommonEvent.ts b/app/src/protyle/util/editorCommonEvent.ts index 87b08103d..66780cce5 100644 --- a/app/src/protyle/util/editorCommonEvent.ts +++ b/app/src/protyle/util/editorCommonEvent.ts @@ -818,10 +818,6 @@ export const dropEvent = (protyle: IProtyle, editorElement: HTMLElement) => { after: targetElement.classList.contains("dragover__bottom"), targetID: targetElement.getAttribute("data-node-id"), }); - fetchPost("/api/filetree/removeDoc", { - notebook: response.data.srcTreeBox, - path: response.data.srcTreePath, - }); } } fetchPost("/api/filetree/getDoc", { diff --git a/kernel/model/heading.go b/kernel/model/heading.go index 9ca488212..2e6762b88 100644 --- a/kernel/model/heading.go +++ b/kernel/model/heading.go @@ -224,6 +224,13 @@ func Doc2Heading(srcID, targetID string, after bool) (srcTreeBox, srcTreePath st contentPivot.Unlink() } + // 推送给前端移除旧文档 + evt := util.NewCmdResult("removeDoc", 0, util.PushModeBroadcast) + evt.Data = map[string]interface{}{ + "ids": []string{srcTree.Root.ID}, + } + util.PushEvent(evt) + srcTreeBox, srcTreePath = srcTree.Box, srcTree.Path // 返回旧的文档块位置，前端后续会删除旧的文档块 targetTree.Root.SetIALAttr("updated", util.CurrentTimeSecondsStr()) err = indexWriteJSONQueue(targetTree)