From 205e04fba233b7a81c446735bb4810ebca68f8f3 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Wed, 27 Dec 2023 11:56:04 +0800
Subject: [PATCH 1/5] :sparkles: Support adding the watermark on export PDF
https://github.com/siyuan-note/siyuan/issues/9961
---
app/src/config/exportConfig.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/src/config/exportConfig.ts b/app/src/config/exportConfig.ts
index 39d21b5f2..0eacd4730 100644
--- a/app/src/config/exportConfig.ts
+++ b/app/src/config/exportConfig.ts
@@ -83,7 +83,7 @@ export const exportConfig = {
- ${window.siyuan.languages.export29}
+
From 50770e3156a5f9cbb9dd64fd058c8e54bda1d7a2 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Wed, 27 Dec 2023 20:58:21 +0800
Subject: [PATCH 2/5] :art: Database table view primary key column cell support
`[[` bind to a block https://github.com/siyuan-note/siyuan/issues/9983
---
app/src/protyle/render/av/cell.ts | 3 ---
1 file changed, 3 deletions(-)
diff --git a/app/src/protyle/render/av/cell.ts b/app/src/protyle/render/av/cell.ts
index 8a202d663..8ee26d1f9 100644
--- a/app/src/protyle/render/av/cell.ts
+++ b/app/src/protyle/render/av/cell.ts
@@ -321,9 +321,6 @@ export const popTextCell = (protyle: IProtyle, cellElements: HTMLElement[], type
}
if (type === "block") {
inputElement.addEventListener("input", (event: InputEvent) => {
- if (event.isComposing) {
- return;
- }
if (Constants.BLOCK_HINT_KEYS.includes(inputElement.value.substring(0, 2))) {
protyle.toolbar.range = document.createRange();
protyle.toolbar.range.selectNodeContents(cellElements[0].lastChild);
From 56128863aaae73b0f97ff5c8c16fefcc057602dd Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Wed, 27 Dec 2023 21:05:07 +0800
Subject: [PATCH 3/5] :art: Remove todo
---
kernel/model/box.go | 2 --
1 file changed, 2 deletions(-)
diff --git a/kernel/model/box.go b/kernel/model/box.go
index e3f8dc435..d914060fe 100644
--- a/kernel/model/box.go
+++ b/kernel/model/box.go
@@ -501,8 +501,6 @@ func FullReindex() {
task.AppendTask(task.DatabaseIndexFull, fullReindex)
task.AppendTask(task.DatabaseIndexRef, IndexRefs)
task.AppendTask(task.ReloadUI, util.ReloadUI)
-
- // TODO ReindexAssetContent()
}
func fullReindex() {
From 8c225d1f0cd14634203a67b5fcd7792e49d8b453 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Wed, 27 Dec 2023 21:05:21 +0800
Subject: [PATCH 4/5] :art: Update database table view
---
kernel/av/av.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/av/av.go b/kernel/av/av.go
index c2999ca16..93b5bb015 100644
--- a/kernel/av/av.go
+++ b/kernel/av/av.go
@@ -281,7 +281,7 @@ func SaveAttributeView(av *AttributeView) (err error) {
}
}
- data, err := gulu.JSON.MarshalIndentJSON(av, "", "\t") // TODO: single-line for production
+ data, err := gulu.JSON.MarshalJSON(av)
if nil != err {
logging.LogErrorf("marshal attribute view [%s] failed: %s", av.ID, err)
return
From eff537e2165968d35ab83a0d413c9317fa149cf0 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Wed, 27 Dec 2023 21:11:27 +0800
Subject: [PATCH 5/5] :art: Remove todo
---
kernel/server/serve.go | 5 -----
1 file changed, 5 deletions(-)
diff --git a/kernel/server/serve.go b/kernel/server/serve.go
index 3a3698201..89092040b 100644
--- a/kernel/server/serve.go
+++ b/kernel/server/serve.go
@@ -80,11 +80,6 @@ func Serve(fastMode bool) {
serveRepoDiff(ginServer)
api.ServeAPI(ginServer)
- // TODO 升级后结束旧内核进程
- //if !fastMode && "prod" == util.Mode && util.ContainerStd == util.Container {
- // killRunningKernel()
- //}
-
var host string
if model.Conf.System.NetworkServe || util.ContainerDocker == util.Container {
host = "0.0.0.0"