Browse Source

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

Vanessa 2 years ago
parent
commit
bf19922990
4 changed files with 5 additions and 5 deletions
  1. 1 1
      README.md
  2. 1 1
      README_zh_CN.md
  3. 1 1
      app/stage/manifest.webmanifest
  4. 2 2
      kernel/model/file.go

+ 1 - 1
README.md

@@ -15,7 +15,7 @@ Build Your Eternal Digital Garden
 
 
 ## 💡 Introduction
 ## 💡 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.
 WYSIWYG.
 
 
 ![feature0.png](https://b3logfile.com/file/2022/10/feature0-EHMFc7T.png)
 ![feature0.png](https://b3logfile.com/file/2022/10/feature0-EHMFc7T.png)

+ 1 - 1
README_zh_CN.md

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

+ 1 - 1
app/stage/manifest.webmanifest

@@ -1,7 +1,7 @@
 {
 {
     "name": "SiYuan",
     "name": "SiYuan",
     "short_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",
     "lang": "en",
     "id": "/",
     "id": "/",
     "start_url": "/",
     "start_url": "/",

+ 2 - 2
kernel/model/file.go

@@ -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
 		// 引用计数浮窗请求,需要按照反链逻辑组装 https://github.com/siyuan-note/siyuan/issues/6853
 		nodes, isBacklinkExpand = getBacklinkRenderNodes(node)
 		nodes, isBacklinkExpand = getBacklinkRenderNodes(node)
 	} else {
 	} 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)
 			nodes, eof = loadNodesByStartEnd(tree, startID, endID)
 			if 1 > len(nodes) {
 			if 1 > len(nodes) {
 				// 按 mode 加载兜底
 				// 按 mode 加载兜底