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

This commit is contained in:
Vanessa 2023-05-17 12:38:10 +08:00
commit bf19922990
4 changed files with 5 additions and 5 deletions

View file

@ -15,7 +15,7 @@ Build Your Eternal Digital Garden
## 💡 Introduction
SiYuan is a local-first personal knowledge management system, support fine-grained block-level reference and Markdown
SiYuan is a privacy-first personal knowledge management system, support fine-grained block-level reference and Markdown
WYSIWYG.
![feature0.png](https://b3logfile.com/file/2022/10/feature0-EHMFc7T.png)

View file

@ -15,7 +15,7 @@
## 💡 简介
思源笔记是一款本地优先的个人知识管理系统, 支持细粒度块级引用和 Markdown 所见即所得。
思源笔记是一款隐私优先的个人知识管理系统,支持细粒度块级引用和 Markdown 所见即所得。
![feature0.png](https://b3logfile.com/file/2022/10/feature0-EHMFc7T.png)

View file

@ -1,7 +1,7 @@
{
"name": "SiYuan",
"short_name": "siyuan",
"description": "SiYuan is a local-first personal knowledge management system, support fine-grained block-level reference and Markdown WYSIWYG.",
"description": "SiYuan is a privacy-first personal knowledge management system, support fine-grained block-level reference and Markdown WYSIWYG.",
"lang": "en",
"id": "/",
"start_url": "/",

View file

@ -655,8 +655,8 @@ func GetDoc(startID, endID, id string, index int, keyword string, mode int, size
// 引用计数浮窗请求,需要按照反链逻辑组装 https://github.com/siyuan-note/siyuan/issues/6853
nodes, isBacklinkExpand = getBacklinkRenderNodes(node)
} else {
// 如果同时存在 startID 和 endID则只加载 startID 和 endID 之间的块 [startID, endID]
if "" != startID && "" != endID {
// 如果同时存在 startID 和 endID并且是动态加载的情况,则只加载 startID 和 endID 之间的块 [startID, endID]
if "" != startID && "" != endID && scroll {
nodes, eof = loadNodesByStartEnd(tree, startID, endID)
if 1 > len(nodes) {
// 按 mode 加载兜底