From f49ece2c825f76969d3859de7a17358bf05b643b Mon Sep 17 00:00:00 2001 From: Jarrett Ye Date: Tue, 22 Oct 2024 16:31:21 +0800 Subject: [PATCH 1/4] :memo: Support dark theme for Star History in README.md (#12876) --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 53b3d6d29..5eb2b3591 100644 --- a/README.md +++ b/README.md @@ -124,7 +124,13 @@ Some features are only available to paid members, for more details please refer ## 🌟 Star History -[![Star History Chart](https://api.star-history.com/svg?repos=siyuan-note/siyuan&type=Date)](https://star-history.com/#siyuan-note/siyuan&Date) + + + + + Star History Chart + + ## 🗺️ Roadmap From faa5f4decd77d9554e6b1ddbd6b859bb5f25d952 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Tue, 22 Oct 2024 16:33:49 +0800 Subject: [PATCH 2/4] :memo: Support dark theme for Star History in README.md https://github.com/siyuan-note/siyuan/pull/12876 --- README_ja_JP.md | 8 +++++++- README_zh_CN.md | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/README_ja_JP.md b/README_ja_JP.md index 1dd36c371..0a646ec8e 100644 --- a/README_ja_JP.md +++ b/README_ja_JP.md @@ -123,7 +123,13 @@ SiYuanは、プライバシーを最優先とする個人の知識管理シス ## 🌟 スター履歴 -[![Star History Chart](https://api.star-history.com/svg?repos=siyuan-note/siyuan&type=Date)](https://star-history.com/#siyuan-note/siyuan&Date) + + + + + Star History Chart + + ## 🗺️ ロードマップ diff --git a/README_zh_CN.md b/README_zh_CN.md index cae14a087..7d712fb37 100644 --- a/README_zh_CN.md +++ b/README_zh_CN.md @@ -124,7 +124,13 @@ ## 🌟 星标历史 -[![Star History Chart](https://api.star-history.com/svg?repos=siyuan-note/siyuan&type=Date)](https://star-history.com/#siyuan-note/siyuan&Date) + + + + + Star History Chart + + ## 🗺️ 路线图 From 6a3c2806395312f5439b561819e080703be2d996 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Tue, 22 Oct 2024 17:12:08 +0800 Subject: [PATCH 3/4] :art: Clean code --- kernel/sql/queue.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/kernel/sql/queue.go b/kernel/sql/queue.go index 460e88426..5cc078701 100644 --- a/kernel/sql/queue.go +++ b/kernel/sql/queue.go @@ -36,7 +36,6 @@ var ( operationQueue []*dbQueueOperation dbQueueLock = sync.Mutex{} txLock = sync.Mutex{} - isWriting = false ) type dbQueueOperation struct { @@ -72,11 +71,7 @@ func FlushQueue() { } txLock.Lock() - isWriting = true - defer func() { - isWriting = false - txLock.Unlock() - }() + defer txLock.Unlock() start := time.Now() From 507f4bfa77b92e175b16f1bbad7e782de6d3c66a Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Tue, 22 Oct 2024 17:41:57 +0800 Subject: [PATCH 4/4] :art: Improve render database relation and rollup field https://github.com/siyuan-note/siyuan/issues/12865 --- app/src/protyle/render/av/cell.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/protyle/render/av/cell.ts b/app/src/protyle/render/av/cell.ts index cc4a506fd..b005cb20d 100644 --- a/app/src/protyle/render/av/cell.ts +++ b/app/src/protyle/render/av/cell.ts @@ -811,7 +811,7 @@ export const renderCell = (cellValue: IAVCellValue, rowIndex = 0) => { cellValue?.rollup?.contents?.forEach((item) => { const rollupText = ["select", "mSelect", "mAsset", "checkbox", "relation"].includes(item.type) ? renderCell(item) : renderRollup(item); if (rollupText) { - text += rollupText + ", "; + text += rollupText + " "; } }); if (text && text.endsWith(", ")) { @@ -820,7 +820,7 @@ export const renderCell = (cellValue: IAVCellValue, rowIndex = 0) => { } else if (cellValue.type === "relation") { cellValue?.relation?.contents?.forEach((item) => { if (item && item.block) { - text += renderRollup(item) + ", "; + text += renderRollup(item) + " "; } }); if (text && text.endsWith(", ")) {