From e58a869e0e976ee47868bb1fb845370d630a3f64 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Wed, 4 Dec 2024 17:40:16 +0800 Subject: [PATCH 1/2] :art: Support HarmonyOS NEXT system --- app/src/protyle/util/addScript.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/protyle/util/addScript.ts b/app/src/protyle/util/addScript.ts index 3396c9d3cba..f88263c215d 100644 --- a/app/src/protyle/util/addScript.ts +++ b/app/src/protyle/util/addScript.ts @@ -1,4 +1,4 @@ -export const addScriptSync = (path: string, id: string) => { +export const addScriptSync = async (path: string, id: string) => { if (document.getElementById(id)) { return false; } @@ -12,6 +12,10 @@ export const addScriptSync = (path: string, id: string) => { scriptElement.text = xhrObj.responseText; scriptElement.id = id; document.head.appendChild(scriptElement); + if (typeof Lute === "undefined") { + // 鸿蒙系统上第一次加载会出现 Lute 未定义的情况,重新载入一次就好了,暂时没找到原因,先这样处理 + window.location.reload(); + } }; export const addScript = (path: string, id: string) => { From f5b806927e8fc66b47666625607fbe69ebecdf05 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Wed, 4 Dec 2024 18:08:47 +0800 Subject: [PATCH 2/2] :bug: The sequence number of the ordered list exported to .docx is incorrect https://github.com/siyuan-note/siyuan/issues/13365 --- kernel/model/export.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/kernel/model/export.go b/kernel/model/export.go index cf444f4785e..83951123ba6 100644 --- a/kernel/model/export.go +++ b/kernel/model/export.go @@ -768,13 +768,22 @@ func ExportMarkdownHTML(id, savePath string, docx, merge bool) (name, dom string luteEngine := NewLute() luteEngine.SetFootnotes(true) - // 自定义表情图片地址去掉开头的 / ast.Walk(tree.Root, func(n *ast.Node, entering bool) ast.WalkStatus { if !entering { return ast.WalkContinue } if ast.NodeEmojiImg == n.Type { + // 自定义表情图片地址去掉开头的 / n.Tokens = bytes.ReplaceAll(n.Tokens, []byte("src=\"/emojis"), []byte("src=\"emojis")) + } else if ast.NodeList == n.Type { + if nil != n.ListData && 1 == n.ListData.Typ { + if 0 == n.ListData.Start { + n.ListData.Start = 1 + } + if li := n.ChildByType(ast.NodeListItem); nil != li && nil != li.ListData { + n.ListData.Start = li.ListData.Num + } + } } return ast.WalkContinue })