Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
Vanessa
commit
13ba672d1b
8 changed files with 36 additions and 8 deletions
2
.github/workflows/dockerimage.yml
vendored
2
.github/workflows/dockerimage.yml
vendored
|
|
@ -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.1.2 .
|
||||
docker buildx build --push --platform linux/amd64,linux/arm64,linux/arm/v7 -t b3log/siyuan:latest -t b3log/siyuan:v2.1.3 .
|
||||
28
CHANGELOG.md
28
CHANGELOG.md
|
|
@ -1,3 +1,31 @@
|
|||
## v2.1.3 / 2022-07-27
|
||||
|
||||
### 改进功能
|
||||
|
||||
* [笔记本支持导出 `.sy.zip`](https://github.com/siyuan-note/siyuan/issues/5475)
|
||||
* [`清理未引用资源` 支持跟随 assets 文件夹符号链接](https://github.com/siyuan-note/siyuan/issues/5480)
|
||||
* [改进导入 Markdown 时 `<img>` 标签的处理](https://github.com/siyuan-note/siyuan/issues/5501)
|
||||
* [改进云端同步性能](https://github.com/siyuan-note/siyuan/issues/5511)
|
||||
* [发起互联网服务请求时绕过安全策略](https://github.com/siyuan-note/siyuan/issues/5516)
|
||||
* [支持代码块搜索定位](https://github.com/siyuan-note/siyuan/issues/5520)
|
||||
|
||||
### 修复缺陷
|
||||
|
||||
* [Android 端资源文件 `打开` - `在浏览器中查看` 卡住](https://github.com/siyuan-note/siyuan/issues/5495)
|
||||
* [云端同步 `syncignore` 未生效导致误删文件](https://github.com/siyuan-note/siyuan/issues/5497)
|
||||
* [代码块移动光标 ↑ 跳过问题](https://github.com/siyuan-note/siyuan/issues/5498)
|
||||
* [不启用同步时无法使用备份](https://github.com/siyuan-note/siyuan/issues/5502)
|
||||
* [脚注定义元素语法问题兼容](https://github.com/siyuan-note/siyuan/issues/5503)
|
||||
* [光标在图片后面显示异常](https://github.com/siyuan-note/siyuan/issues/5504)
|
||||
* [窗口状态无法保留](https://github.com/siyuan-note/siyuan/issues/5509)
|
||||
* [移动端右侧子菜单超出屏幕](https://github.com/siyuan-note/siyuan/issues/5510)
|
||||
* [安卓端文档树上的属性项内容无法保存](https://github.com/siyuan-note/siyuan/issues/5512)
|
||||
* [移动端输入文字后面包屑无法再次显示](https://github.com/siyuan-note/siyuan/issues/5513)
|
||||
* [优化排版功能导致文档部分内容丢失](https://github.com/siyuan-note/siyuan/issues/5515)
|
||||
* [引用和链接菜单重合](https://github.com/siyuan-note/siyuan/issues/5518)
|
||||
* [移动端浏览器打开空链接白屏且菜单超出屏幕](https://github.com/siyuan-note/siyuan/issues/5519)
|
||||
* [HTML 块选中部分内容无法复制](https://github.com/siyuan-note/siyuan/issues/5521)
|
||||
|
||||
## v2.1.2 / 2022-07-22
|
||||
|
||||
### 改进功能
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
<Identity Name="89C2A984.SiYuan"
|
||||
ProcessorArchitecture="x64"
|
||||
Publisher='CN=087C656E-C1D9-42D8-8807-CED45A74FC0F'
|
||||
Version="2.1.2.0"/>
|
||||
Version="2.1.3.0"/>
|
||||
<Properties>
|
||||
<DisplayName>SiYuan</DisplayName>
|
||||
<PublisherDisplayName>云南链滴科技有限公司</PublisherDisplayName>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "SiYuan",
|
||||
"version": "2.1.2",
|
||||
"version": "2.1.3",
|
||||
"description": "Build Your Eternal Digital Garden",
|
||||
"homepage": "https://b3log.org/siyuan",
|
||||
"main": "./electron/main.js",
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ require (
|
|||
github.com/88250/css v0.1.2
|
||||
github.com/88250/flock v0.8.2
|
||||
github.com/88250/gulu v1.2.3-0.20220720144315-065ef35ec583
|
||||
github.com/88250/lute v1.7.5-0.20220726162257-7b9da9eaea07
|
||||
github.com/88250/lute v1.7.5-0.20220726230457-76c3332f06c2
|
||||
github.com/88250/melody v0.0.0-20201115062536-c0b3394adcd1
|
||||
github.com/88250/pdfcpu v0.3.13
|
||||
github.com/88250/protyle v0.0.0-20220519012506-0a2c8dc24397
|
||||
|
|
|
|||
|
|
@ -58,8 +58,8 @@ github.com/88250/gulu v1.2.0/go.mod h1:ZhEJ98UjR2y7j2toGj4/b+1rRELcZFQAPq/Yjyin2
|
|||
github.com/88250/gulu v1.2.3-0.20220720144315-065ef35ec583 h1:FhA/zJemLrbOYJpdMIMBezO5rGigQSdPR1kv+aztHfA=
|
||||
github.com/88250/gulu v1.2.3-0.20220720144315-065ef35ec583/go.mod h1:I1qBzsksFL2ciGSuqDE7R3XW4BUMrfDgOvSXEk7FsAI=
|
||||
github.com/88250/lute v1.7.4-0.20220426011157-34c9bfa2e148/go.mod h1:Bdu9LRNjQhtL3TftbtpjIWTwDVAXoS7AD8QsZQPk7zo=
|
||||
github.com/88250/lute v1.7.5-0.20220726162257-7b9da9eaea07 h1:lP/RM3N3Hm+H6Jng/DfCzVwcrkPOrUkrjCC5///rtBg=
|
||||
github.com/88250/lute v1.7.5-0.20220726162257-7b9da9eaea07/go.mod h1:Bdu9LRNjQhtL3TftbtpjIWTwDVAXoS7AD8QsZQPk7zo=
|
||||
github.com/88250/lute v1.7.5-0.20220726230457-76c3332f06c2 h1:d8YDlsctGxWC/Bk2sUenJ2Gz5jKZA5bxfYa8vtskMgY=
|
||||
github.com/88250/lute v1.7.5-0.20220726230457-76c3332f06c2/go.mod h1:Bdu9LRNjQhtL3TftbtpjIWTwDVAXoS7AD8QsZQPk7zo=
|
||||
github.com/88250/melody v0.0.0-20201115062536-c0b3394adcd1 h1:9Cb+iN639vUI2OcIBc+4oGwml9/0J6bL6dWNb8Al+1s=
|
||||
github.com/88250/melody v0.0.0-20201115062536-c0b3394adcd1/go.mod h1:jH6MMPr8G7AMzaVmWHXZQiB1DKO3giWbcWZ7UoJ1teI=
|
||||
github.com/88250/pdfcpu v0.3.13 h1:touMWMZkCGalMIbEg9bxYp7rETM+zwb9hXjwhqi4I7Q=
|
||||
|
|
|
|||
|
|
@ -615,7 +615,7 @@ func GetDoc(id string, index int, keyword string, mode int, size int) (blockCoun
|
|||
return ast.WalkSkipChildren
|
||||
}
|
||||
|
||||
// TODO: 支持代码块搜索定位和高亮 https://github.com/siyuan-note/siyuan/issues/5520
|
||||
// 支持代码块搜索定位 https://github.com/siyuan-note/siyuan/issues/5520
|
||||
if ast.NodeCodeBlockCode == n.Type {
|
||||
// 搜索高亮
|
||||
text := string(n.Tokens)
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ import (
|
|||
var Mode = "prod"
|
||||
|
||||
const (
|
||||
Ver = "2.1.2"
|
||||
Ver = "2.1.3"
|
||||
IsInsider = false
|
||||
)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue