From 04800fdaf35fa0f4f4b075606702b370d2ff7222 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Sat, 26 Nov 2022 10:41:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?:art:=20=E6=8A=98=E5=8F=A0=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E9=A1=B9=E8=BD=AC=E6=8D=A2=E4=B8=BA=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E6=97=B6=E8=87=AA=E5=8A=A8=E5=B1=95=E5=BC=80=E5=AD=90=E5=9D=97?= =?UTF-8?q?=20Fix=20https://github.com/siyuan-note/siyuan/issues/6719?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/listitem.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/model/listitem.go b/kernel/model/listitem.go index 0407688ba..e89e12c38 100644 --- a/kernel/model/listitem.go +++ b/kernel/model/listitem.go @@ -87,6 +87,7 @@ func ListItem2Doc(srcListItemID, targetBoxID, targetPath string) (srcRootBlockID listItemNode.SetIALAttr("type", "doc") listItemNode.SetIALAttr("id", srcListItemID) listItemNode.SetIALAttr("title", listItemText) + listItemNode.RemoveIALAttr("fold") newTree.Root.KramdownIAL = listItemNode.KramdownIAL srcLiParent := listItemNode.Parent listItemNode.Unlink() @@ -103,6 +104,7 @@ func ListItem2Doc(srcListItemID, targetBoxID, targetPath string) (srcRootBlockID newTree.Box, newTree.Path = targetBoxID, newTargetPath newTree.Root.SetIALAttr("updated", util.CurrentTimeSecondsStr()) + newTree.Root.Spec = "1" if err = indexWriteJSONQueue(newTree); nil != err { return "", "", err } From 717f8f45b6f4c6fd64d980d95eabbd1f55b8f6c0 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Sat, 26 Nov 2022 10:48:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?:art:=20`=E8=99=9A=E6=8B=9F=E5=BC=95?= =?UTF-8?q?=E7=94=A8=E5=85=B3=E9=94=AE=E5=AD=97=E6=8E=92=E9=99=A4=E5=88=97?= =?UTF-8?q?=E8=A1=A8`=20=E6=94=AF=E6=8C=81=E6=AD=A3=E5=88=99=E8=A1=A8?= =?UTF-8?q?=E8=BE=BE=E5=BC=8F=20https://github.com/siyuan-note/siyuan/issu?= =?UTF-8?q?es/6696?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/virutalref.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/model/virutalref.go b/kernel/model/virutalref.go index 0e69a7273..155a31c98 100644 --- a/kernel/model/virutalref.go +++ b/kernel/model/virutalref.go @@ -111,8 +111,8 @@ func getVirtualRefKeywords(docName string) (ret []string) { ret = gulu.Str.ExcludeElem(ret, excludes) if 0 < len(regexps) { tmp = nil - for _, re := range regexps { - for _, str := range ret { + for _, str := range ret { + for _, re := range regexps { if ok, regErr := regexp.MatchString(re, str); !ok && nil == regErr { tmp = append(tmp, str) break