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

.github/workflows/dockerimage.yml

@@ -33,4 +33,4 @@ jobs:
 
       - name: Build the Docker image
         run: |
-          docker buildx build --push --platform linux/amd64,linux/arm64,linux/arm/v7 -t b3log/siyuan:latest -t b3log/siyuan:v2.0.23 .
+          docker buildx build --push --platform linux/amd64,linux/arm64,linux/arm/v7 -t b3log/siyuan:latest -t b3log/siyuan:v2.0.24 .

CHANGELOG.md

@@ -1,3 +1,39 @@
+## v2.0.24 / 2022-06-26
+
+### 改进功能
+
+* [支持设置页签打开最大数量](https://github.com/siyuan-note/siyuan/issues/2098)
+* [块内容较多时全局搜索定位到关键字命中位置](https://github.com/siyuan-note/siyuan/issues/3171)
+* [多次动态加载以后卡顿问题](https://github.com/siyuan-note/siyuan/issues/4620)
+* [改进复制 PDF 标注到笔记中时对换行的处理](https://github.com/siyuan-note/siyuan/issues/5213)
+* [列表项中包含多个块时 Ctrl+↑/↓ 功能等同于点击三角形](https://github.com/siyuan-note/siyuan/issues/5244)
+* [支持搜索超链接元素 URL](https://github.com/siyuan-note/siyuan/issues/5273)
+* [减少因向上动态加载的代码块渲染导致的偏差](https://github.com/siyuan-note/siyuan/issues/5280)
+* [标题和列表项以外的块标拖拽到文件树上不应有交互](https://github.com/siyuan-note/siyuan/issues/5282)
+* [桌面端加入底部状态栏](https://github.com/siyuan-note/siyuan/issues/5286)
+* [隐藏/显示停靠栏加入鼠标悬浮菜单](https://github.com/siyuan-note/siyuan/issues/5287)
+* [移除顶栏 `...` 菜单](https://github.com/siyuan-note/siyuan/issues/5288)
+
+### 文档相关
+
+* [用户指南 `引用内容块` 文档中加入 `锚文本` 和 `语法` 章节](https://github.com/siyuan-note/siyuan/issues/5276)
+
+### 开发重构
+
+* [内核中的 HTTP 客户端拆分项目](https://github.com/siyuan-note/siyuan/issues/5269)
+
+### 修复缺陷
+
+* [部分以 `\*` 开头的行级元素未被转义并在粘贴后撤销时触发状态异常](https://github.com/siyuan-note/siyuan/issues/5260)
+* [包含 `Enter` 的组合快捷键设置错误](https://github.com/siyuan-note/siyuan/issues/5264)
+* [粘贴代码块后点击菜单按钮会弹出复制提示](https://github.com/siyuan-note/siyuan/issues/5266)
+* [文档第一个块使用查询嵌入块触发状态异常](https://github.com/siyuan-note/siyuan/issues/5267)
+* [PlantUML 使用 Tab 键缩进内容时导致内容丢失且无法恢复](https://github.com/siyuan-note/siyuan/issues/5270)
+* [云端备份增量失效](https://github.com/siyuan-note/siyuan/issues/5274)
+* [关闭文档后大纲面板仍然有内容](https://github.com/siyuan-note/siyuan/issues/5275)
+* [搜索历史提示转义处理](https://github.com/siyuan-note/siyuan/issues/5279)
+* [严格校验思源块超链接地址](https://github.com/siyuan-note/siyuan/issues/5284)
+
 ## v2.0.23 / 2022-06-22
 
 ### 改进功能

app/appx/AppxManifest.xml

@@ -9,7 +9,7 @@
     <Identity Name="89C2A984.SiYuan"
               ProcessorArchitecture="x64"
               Publisher='CN=087C656E-C1D9-42D8-8807-CED45A74FC0F'
-              Version="2.0.23.0"/>
+              Version="2.0.24.0"/>
     <Properties>
         <DisplayName>SiYuan</DisplayName>
         <PublisherDisplayName>云南链滴科技有限公司</PublisherDisplayName>

app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "SiYuan",
-  "version": "2.0.23",
+  "version": "2.0.24",
   "description": "A local-first personal knowledge management system, supports fine-grained block-level reference, and Markdown WYSIWYG.",
   "homepage": "https://b3log.org/siyuan",
   "main": "./electron/main.js",

kernel/go.mod

@@ -40,7 +40,7 @@ require (
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/qiniu/go-sdk/v7 v7.13.0
 	github.com/radovskyb/watcher v1.0.7
-	github.com/siyuan-note/dejavu v0.0.0-20220625155717-0da3d8498e22
+	github.com/siyuan-note/dejavu v0.0.0-20220626025117-e5db5c782cbb
 	github.com/siyuan-note/encryption v0.0.0-20220612074546-f1dd94fe8676
 	github.com/siyuan-note/eventbus v0.0.0-20220624162334-ca7c06dc771f
 	github.com/siyuan-note/filelock v0.0.0-20220616063212-74cfba0754ee

kernel/go.sum

@@ -421,10 +421,10 @@ github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJ
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw=
 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
-github.com/siyuan-note/dejavu v0.0.0-20220625144051-1523833b73f8 h1:LMbbMd86LMCV5GsGqwDKHUcTTjRfGGbiuZ4ZDYsAD/0=
-github.com/siyuan-note/dejavu v0.0.0-20220625144051-1523833b73f8/go.mod h1:i7dnOgHM41EA7xIX2CYSxYe0WhksGZidQQsLvWryK7w=
-github.com/siyuan-note/dejavu v0.0.0-20220625155717-0da3d8498e22 h1:FFIWd0VDWxZlyGWWSxvmsXMsxtu5tjFE/KBBaUFEEK0=
-github.com/siyuan-note/dejavu v0.0.0-20220625155717-0da3d8498e22/go.mod h1:i7dnOgHM41EA7xIX2CYSxYe0WhksGZidQQsLvWryK7w=
+github.com/siyuan-note/dejavu v0.0.0-20220626024131-25831e573009 h1:w2GvjKF1xFn+Swo+e+eOL9l/KQ8FvtJbwshsBInuPKg=
+github.com/siyuan-note/dejavu v0.0.0-20220626024131-25831e573009/go.mod h1:i7dnOgHM41EA7xIX2CYSxYe0WhksGZidQQsLvWryK7w=
+github.com/siyuan-note/dejavu v0.0.0-20220626025117-e5db5c782cbb h1:7HmFGziI6a8JctJ9ouuZ4fHSsFH1GXhGfoN5pxIc2Ds=
+github.com/siyuan-note/dejavu v0.0.0-20220626025117-e5db5c782cbb/go.mod h1:i7dnOgHM41EA7xIX2CYSxYe0WhksGZidQQsLvWryK7w=
 github.com/siyuan-note/encryption v0.0.0-20220612074546-f1dd94fe8676 h1:QB9TjJQFhXhZ6dAtPpY02DlzHAQm1C+WqZq6OadG8mI=
 github.com/siyuan-note/encryption v0.0.0-20220612074546-f1dd94fe8676/go.mod h1:H8fyqqAbp9XreANjeSbc72zEdFfKTXYN34tc1TjZwtw=
 github.com/siyuan-note/eventbus v0.0.0-20220624162334-ca7c06dc771f h1:JMobMNZ7AqaKKyEK+WeWFhix/2TDQXgPZDajU00IybU=

kernel/model/sync.go

@@ -154,10 +154,10 @@ func SyncData(boot, exit, byHand bool) {
 	// 创建数据快照 https://github.com/siyuan-note/siyuan/issues/5161
 	indexRepoBeforeCloudSync()
 
-	// 同步数据仓库
-	if syncRepoErr := syncRepo(); nil != syncRepoErr {
-		util.LogErrorf("sync repo failed: %s", syncRepoErr)
-	}
+	// 同步数据仓库 https://github.com/siyuan-note/siyuan/issues/5142
+	//if syncRepoErr := syncRepo(); nil != syncRepoErr {
+	//	util.LogErrorf("sync repo failed: %s", syncRepoErr)
+	//}
 
 	// 获取工作空间数据配置（数据版本）
 	dataConf, err := getWorkspaceDataConf()

kernel/util/working.go

@@ -40,7 +40,7 @@ import (
 var Mode = "prod"
 
 const (
-	Ver       = "2.0.23"
+	Ver       = "2.0.24"
 	IsInsider = false
 )