From ad3652d219fe362b7a9708c1b266c64f1a5cc30f Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Tue, 20 Jan 2026 16:47:47 +0800
Subject: [PATCH 1/3] :art: Improve export to Word .docx format
 https://github.com/siyuan-note/siyuan/issues/14970

Signed-off-by: Daniel <845765@qq.com>
---
 kernel/model/conf.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/model/conf.go b/kernel/model/conf.go
index 0493e333e..8eb1a9bb2 100644
--- a/kernel/model/conf.go
+++ b/kernel/model/conf.go
@@ -1272,9 +1272,9 @@ func subscribeConfEvents() {
 			params += " \"" + util.PandocTemplatePath + "\""
 			Conf.Export.PandocParams = strings.TrimSpace(params)
 		}
-		
+
 		logging.LogInfof("pandoc params set to [%s]", Conf.Export.PandocParams)
-		logging.LogInfof("pandoc template [%s], color filter [%s]", util.PandocTemplatePath, util.PandocColorFilterPath)
+		logging.LogInfof("pandoc resources [%s, %s]", util.PandocTemplatePath, util.PandocColorFilterPath)
 		Conf.Save()
 	})
 }

From 77757dc33629286804fad83e102d8207662406cf Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Tue, 20 Jan 2026 16:55:01 +0800
Subject: [PATCH 2/3] :art: Supports setting Pandoc parameters for export docx
 https://github.com/siyuan-note/siyuan/issues/16845

Signed-off-by: Daniel <845765@qq.com>
---
 app/electron-builder-darwin-arm64.yml | 1 +
 app/electron-builder-darwin.yml       | 1 +
 app/electron-builder-linux-arm64.yml  | 1 +
 app/electron-builder-linux.yml        | 1 +
 app/electron-builder.yml              | 1 +
 5 files changed, 5 insertions(+)

diff --git a/app/electron-builder-darwin-arm64.yml b/app/electron-builder-darwin-arm64.yml
index f1fc7295c..43ef17b64 100644
--- a/app/electron-builder-darwin-arm64.yml
+++ b/app/electron-builder-darwin-arm64.yml
@@ -67,3 +67,4 @@ extraResources:
     to: "pandoc.zip"
   - from: "pandoc/pandoc-resources"
     to: "pandoc-resources"
+    filter: "!**/{.DS_Store}"
diff --git a/app/electron-builder-darwin.yml b/app/electron-builder-darwin.yml
index 55cdc229e..ad89038b9 100644
--- a/app/electron-builder-darwin.yml
+++ b/app/electron-builder-darwin.yml
@@ -67,3 +67,4 @@ extraResources:
     to: "pandoc.zip"
   - from: "pandoc/pandoc-resources"
     to: "pandoc-resources"
+    filter: "!**/{.DS_Store}"
diff --git a/app/electron-builder-linux-arm64.yml b/app/electron-builder-linux-arm64.yml
index 3fbc65b23..132f59ff7 100644
--- a/app/electron-builder-linux-arm64.yml
+++ b/app/electron-builder-linux-arm64.yml
@@ -71,3 +71,4 @@ extraResources:
     to: "pandoc.zip"
   - from: "pandoc/pandoc-resources"
     to: "pandoc-resources"
+    filter: "!**/{.DS_Store}"
diff --git a/app/electron-builder-linux.yml b/app/electron-builder-linux.yml
index b06a4dd11..4db771432 100644
--- a/app/electron-builder-linux.yml
+++ b/app/electron-builder-linux.yml
@@ -68,3 +68,4 @@ extraResources:
     to: "pandoc.zip"
   - from: "pandoc/pandoc-resources"
     to: "pandoc-resources"
+    filter: "!**/{.DS_Store}"
diff --git a/app/electron-builder.yml b/app/electron-builder.yml
index 484ae6be2..23f02784e 100644
--- a/app/electron-builder.yml
+++ b/app/electron-builder.yml
@@ -74,3 +74,4 @@ extraResources:
     to: "pandoc.zip"
   - from: "pandoc/pandoc-resources"
     to: "pandoc-resources"
+    filter: "!**/{.DS_Store}"

From a5d206db89d1f3a4d1c760a6f8c59d03a39972fe Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Tue, 20 Jan 2026 17:08:46 +0800
Subject: [PATCH 3/3] :art: Improve export to Word .docx format
 https://github.com/siyuan-note/siyuan/issues/14970

Signed-off-by: Daniel <845765@qq.com>
---
 kernel/api/export.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/api/export.go b/kernel/api/export.go
index c62cba92f..3f9d920fe 100644
--- a/kernel/api/export.go
+++ b/kernel/api/export.go
@@ -513,7 +513,7 @@ func exportDocx(c *gin.Context) {
 
 	fullPath, err := model.ExportDocx(id, savePath, removeAssets, merge)
 	if err != nil {
-		ret.Code = -1
+		ret.Code = 1
 		ret.Msg = err.Error()
 		ret.Data = map[string]interface{}{"closeTimeout": 7000}
 		return