github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-02 05:02:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
Vanessa 2024-10-22 18:13:37 +08:00
commit 72d1a059ac
5 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@ -124,7 +124,13 @@ Some features are only available to paid members, for more details please refer
## 🌟 Star History ## 🌟 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) <a href="https://star-history.com/#siyuan-note/siyuan&Date">
<picture>
<source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=siyuan-note/siyuan&type=Date&theme=dark" />
<source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=siyuan-note/siyuan&type=Date" />
<img alt="Star History Chart" src="https://api.star-history.com/svg?repos=siyuan-note/siyuan&type=Date" />
</picture>
</a>
## 🗺️ Roadmap ## 🗺️ Roadmap

8
README_ja_JP.md
View File

@ -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) <a href="https://star-history.com/#siyuan-note/siyuan&Date">
<picture>
<source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=siyuan-note/siyuan&type=Date&theme=dark" />
<source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=siyuan-note/siyuan&type=Date" />
<img alt="Star History Chart" src="https://api.star-history.com/svg?repos=siyuan-note/siyuan&type=Date" />
</picture>
</a>
## 🗺️ ロードマップ ## 🗺️ ロードマップ

8
README_zh_CN.md
View File

@ -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) <a href="https://star-history.com/#siyuan-note/siyuan&Date">
<picture>
<source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=siyuan-note/siyuan&type=Date&theme=dark" />
<source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=siyuan-note/siyuan&type=Date" />
<img alt="Star History Chart" src="https://api.star-history.com/svg?repos=siyuan-note/siyuan&type=Date" />
</picture>
</a>
## 🗺️ 路线图 ## 🗺️ 路线图

4
app/src/protyle/render/av/cell.ts
View File

@ -811,7 +811,7 @@ export const renderCell = (cellValue: IAVCellValue, rowIndex = 0) => {
cellValue?.rollup?.contents?.forEach((item) => { cellValue?.rollup?.contents?.forEach((item) => {
const rollupText = ["select", "mSelect", "mAsset", "checkbox", "relation"].includes(item.type) ? renderCell(item) : renderRollup(item); const rollupText = ["select", "mSelect", "mAsset", "checkbox", "relation"].includes(item.type) ? renderCell(item) : renderRollup(item);
if (rollupText) { if (rollupText) {
text += rollupText + ", "; text += rollupText + " ";
} }
}); });
if (text && text.endsWith(", ")) { if (text && text.endsWith(", ")) {
@ -820,7 +820,7 @@ export const renderCell = (cellValue: IAVCellValue, rowIndex = 0) => {
} else if (cellValue.type === "relation") { } else if (cellValue.type === "relation") {
cellValue?.relation?.contents?.forEach((item) => { cellValue?.relation?.contents?.forEach((item) => {
if (item && item.block) { if (item && item.block) {
text += renderRollup(item) + ", "; text += renderRollup(item) + " ";
} }
}); });
if (text && text.endsWith(", ")) { if (text && text.endsWith(", ")) {

7
kernel/sql/queue.go
View File

@ -36,7 +36,6 @@ var (
operationQueue []*dbQueueOperation operationQueue []*dbQueueOperation
dbQueueLock = sync.Mutex{} dbQueueLock = sync.Mutex{}
txLock = sync.Mutex{} txLock = sync.Mutex{}
isWriting = false
) )
type dbQueueOperation struct { type dbQueueOperation struct {
@ -72,11 +71,7 @@ func FlushQueue() {
} }
txLock.Lock() txLock.Lock()
isWriting = true defer txLock.Unlock()
defer func() {
isWriting = false
txLock.Unlock()
}()
start := time.Now() start := time.Now()